kemitix/node
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[BREAKING] NodeItem: require instantiation using Nodes

Browse source 
This breaks the existing API where NodeItem<T> could be instantiated directly.
This commit is contained in:
Paul Campbell 2016-08-21 12:04:24 +01:00
parent 51e8194db7
commit e9b43cb73c
2 changed files with 117 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/net/kemitix/node/NodeItem.java
View file

@ -32,7 +32,7 @@ public class NodeItem<T> implements Node<T> {
* @param data the data or null * @param data the data or null
* @param name the name * @param name the name
*/ */
public NodeItem(final T data, final String name) { NodeItem(final T data, final String name) {
this(data); this(data);
this.name = name; this.name = name;
} }
@ -42,7 +42,7 @@ public class NodeItem<T> implements Node<T> {
* *
* @param data the data or null * @param data the data or null
*/ */
public NodeItem(final T data) { NodeItem(final T data) {
this.data = data; this.data = data;
this.nameSupplier = (n) -> null; this.nameSupplier = (n) -> null;
} }
@ -68,7 +68,7 @@ public class NodeItem<T> implements Node<T> {
* @param data the data or null * @param data the data or null
* @param parent the parent node * @param parent the parent node
*/ */
public NodeItem(final T data, final Node<T> parent) { NodeItem(final T data, final Node<T> parent) {
this.data = data; this.data = data;
setParent(parent); setParent(parent);
} }
@ -80,7 +80,7 @@ public class NodeItem<T> implements Node<T> {
* @param name the name * @param name the name
* @param parent the parent node * @param parent the parent node
*/ */
public NodeItem(final T data, final String name, final Node<T> parent) { NodeItem(final T data, final String name, final Node<T> parent) {
this.data = data; this.data = data;
this.name = name; this.name = name;
setParent(parent); setParent(parent);

225
src/test/java/net/kemitix/node/NodeItemTest.java
View file

@ -33,7 +33,7 @@ public class NodeItemTest {
//given //given
val data = "this node data"; val data = "this node data";
//when //when
node = new NodeItem<>(data); node = Nodes.unnamedRoot(data);
//then //then
assertThat(node.getData()).as("can get the data from a node"). assertThat(node.getData()).as("can get the data from a node").
contains(data); contains(data);
@ -42,7 +42,7 @@ public class NodeItemTest {
@Test @Test
public void canCreateAnEmptyAndUnnamedNode() { public void canCreateAnEmptyAndUnnamedNode() {
//when //when
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
//then //then
SoftAssertions softly = new SoftAssertions(); SoftAssertions softly = new SoftAssertions();
softly.assertThat(node.isEmpty()).as("node is empty").isTrue(); softly.assertThat(node.isEmpty()).as("node is empty").isTrue();
@ -64,7 +64,7 @@ public class NodeItemTest {
@Test @Test
public void canSetName() { public void canSetName() {
//given //given
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
//when //when
node.setName("named"); node.setName("named");
//then //then
@ -77,7 +77,7 @@ public class NodeItemTest {
@Test @Test
public void shouldHaveNullForDefaultParent() { public void shouldHaveNullForDefaultParent() {
//given //given
node = new NodeItem<>("data"); node = Nodes.unnamedRoot("data");
//then //then
assertThat(node.getParent()).as( assertThat(node.getParent()).as(
"node created without a parent has no parent").isEmpty(); "node created without a parent has no parent").isEmpty();
@ -89,9 +89,9 @@ public class NodeItemTest {
@Test @Test
public void shouldReturnNodeParent() { public void shouldReturnNodeParent() {
//given //given
val parent = new NodeItem<String>("parent"); val parent = Nodes.unnamedRoot("parent");
//when //when
node = new NodeItem<>("subject", parent); node = Nodes.unnamedChild("subject", parent);
//then //then
assertThat(node.getParent()).as( assertThat(node.getParent()).as(
"node created with a parent can return the parent") "node created with a parent can return the parent")
@ -105,8 +105,8 @@ public class NodeItemTest {
@Test @Test
public void setParentShouldThrowNodeExceptionWhenParentIsAChild() { public void setParentShouldThrowNodeExceptionWhenParentIsAChild() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val child = new NodeItem<String>("child", node); val child = Nodes.unnamedChild("child", node);
exception.expect(NodeException.class); exception.expect(NodeException.class);
exception.expectMessage("Parent is a descendant"); exception.expectMessage("Parent is a descendant");
//when //when
@ -121,9 +121,9 @@ public class NodeItemTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void shouldAddNewNodeAsChildToParent() { public void shouldAddNewNodeAsChildToParent() {
//given //given
val parent = new NodeItem<String>("parent"); val parent = Nodes.unnamedRoot("parent");
//when //when
node = new NodeItem<>("subject", parent); node = Nodes.unnamedChild("subject", parent);
//then //then
assertThat(parent.getChildren()).as( assertThat(parent.getChildren()).as(
"when a node is created with a parent, the parent has the new" "when a node is created with a parent, the parent has the new"
@ -136,8 +136,8 @@ public class NodeItemTest {
@Test @Test
public void shouldReturnSetParent() { public void shouldReturnSetParent() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val parent = new NodeItem<String>("parent"); val parent = Nodes.unnamedRoot("parent");
//when //when
node.setParent(parent); node.setParent(parent);
//then //then
@ -152,7 +152,7 @@ public class NodeItemTest {
@Test @Test
public void shouldThrowNPEWhenSetParentNull() { public void shouldThrowNPEWhenSetParentNull() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
exception.expect(NullPointerException.class); exception.expect(NullPointerException.class);
exception.expectMessage("parent"); exception.expectMessage("parent");
//when //when
@ -166,7 +166,7 @@ public class NodeItemTest {
@Test @Test
public void setParentShouldThrowNodeExceptionWhenParentIsSelf() { public void setParentShouldThrowNodeExceptionWhenParentIsSelf() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
exception.expect(NodeException.class); exception.expect(NodeException.class);
exception.expectMessage("Parent is a descendant"); exception.expectMessage("Parent is a descendant");
//when //when
@ -180,9 +180,9 @@ public class NodeItemTest {
@Test @Test
public void shouldUpdateOldParentWhenNodeSetToNewParent() { public void shouldUpdateOldParentWhenNodeSetToNewParent() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val child = node.createChild("child"); val child = node.createChild("child");
val newParent = new NodeItem<String>("newParent"); val newParent = Nodes.unnamedRoot("newParent");
//when //when
child.setParent(newParent); child.setParent(newParent);
//then //then
@ -201,9 +201,9 @@ public class NodeItemTest {
@Test @Test
public void shouldRemoveNodeFromOldParentWhenAddedAsChildToNewParent() { public void shouldRemoveNodeFromOldParentWhenAddedAsChildToNewParent() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val child = node.createChild("child"); val child = node.createChild("child");
val newParent = new NodeItem<String>("newParent"); val newParent = Nodes.unnamedRoot("newParent");
//when //when
newParent.addChild(child); newParent.addChild(child);
//then //then
@ -223,7 +223,7 @@ public class NodeItemTest {
@Test @Test
public void shouldThrowNPEWhenAddingNullAsChild() { public void shouldThrowNPEWhenAddingNullAsChild() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
exception.expect(NullPointerException.class); exception.expect(NullPointerException.class);
exception.expectMessage("child"); exception.expectMessage("child");
//when //when
@ -237,8 +237,8 @@ public class NodeItemTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void shouldReturnAddedChild() { public void shouldReturnAddedChild() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val child = new NodeItem<String>("child"); val child = Nodes.unnamedRoot("child");
//when //when
node.addChild(child); node.addChild(child);
//then //then
@ -253,7 +253,7 @@ public class NodeItemTest {
@Test @Test
public void addChildShouldThrowNodeExceptionWhenAddingANodeAsOwnChild() { public void addChildShouldThrowNodeExceptionWhenAddingANodeAsOwnChild() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
exception.expect(NodeException.class); exception.expect(NodeException.class);
exception.expectMessage("Child is an ancestor"); exception.expectMessage("Child is an ancestor");
//then //then
@ -266,7 +266,7 @@ public class NodeItemTest {
@Test @Test
public void addChildShouldThrowNodeExceptionWhenAddingSelfAsChild() { public void addChildShouldThrowNodeExceptionWhenAddingSelfAsChild() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
exception.expect(NodeException.class); exception.expect(NodeException.class);
exception.expectMessage("Child is an ancestor"); exception.expectMessage("Child is an ancestor");
//when //when
@ -280,8 +280,8 @@ public class NodeItemTest {
@Test @Test
public void addChildShouldThrowNodeExceptionWhenChildIsParent() { public void addChildShouldThrowNodeExceptionWhenChildIsParent() {
//given //given
val parent = new NodeItem<String>("parent"); val parent = Nodes.unnamedRoot("parent");
node = new NodeItem<>("subject", parent); node = Nodes.unnamedChild("subject", parent);
exception.expect(NodeException.class); exception.expect(NodeException.class);
exception.expectMessage("Child is an ancestor"); exception.expectMessage("Child is an ancestor");
//when //when
@ -295,9 +295,9 @@ public class NodeItemTest {
@Test @Test
public void addChildShouldThrowNodeExceptionWhenAddingGrandParentAsChild() { public void addChildShouldThrowNodeExceptionWhenAddingGrandParentAsChild() {
//given //given
val grandParent = new NodeItem<String>("grandparent"); val grandParent = Nodes.unnamedRoot("grandparent");
val parent = new NodeItem<String>("parent", grandParent); val parent = Nodes.unnamedChild("parent", grandParent);
node = new NodeItem<>("subject", parent); node = Nodes.unnamedChild("subject", parent);
exception.expect(NodeException.class); exception.expect(NodeException.class);
exception.expectMessage("Child is an ancestor"); exception.expectMessage("Child is an ancestor");
//when //when
@ -310,8 +310,8 @@ public class NodeItemTest {
@Test @Test
public void shouldSetParentOnChildWhenAddedAsChild() { public void shouldSetParentOnChildWhenAddedAsChild() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val child = new NodeItem<String>("child"); val child = Nodes.unnamedRoot("child");
//when //when
node.addChild(child); node.addChild(child);
//then //then
@ -327,11 +327,11 @@ public class NodeItemTest {
public void shouldWalkTreeToNode() { public void shouldWalkTreeToNode() {
//given //given
val grandparent = "grandparent"; val grandparent = "grandparent";
val grandParentNode = new NodeItem<String>(grandparent); val grandParentNode = Nodes.unnamedRoot(grandparent);
val parent = "parent"; val parent = "parent";
val parentNode = new NodeItem<String>(parent, grandParentNode); val parentNode = Nodes.unnamedChild(parent, grandParentNode);
val subject = "subject"; val subject = "subject";
node = new NodeItem<>(subject, parentNode); node = Nodes.unnamedChild(subject, parentNode);
//when //when
val result = grandParentNode.findInPath(Arrays.asList(parent, subject)); val result = grandParentNode.findInPath(Arrays.asList(parent, subject));
//then //then
@ -352,9 +352,9 @@ public class NodeItemTest {
public void shouldNotFindNonExistentChildNode() { public void shouldNotFindNonExistentChildNode() {
//given //given
val parent = "parent"; val parent = "parent";
val parentNode = new NodeItem<String>(parent); val parentNode = Nodes.unnamedRoot(parent);
val subject = "subject"; val subject = "subject";
node = new NodeItem<>(subject, parentNode); node = Nodes.unnamedChild(subject, parentNode);
//when //when
val result = parentNode.findInPath(Arrays.asList(subject, "no child")); val result = parentNode.findInPath(Arrays.asList(subject, "no child"));
//then //then
@ -369,7 +369,7 @@ public class NodeItemTest {
@Test @Test
public void shouldThrowNEWhenWalkTreeNull() { public void shouldThrowNEWhenWalkTreeNull() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
exception.expect(NullPointerException.class); exception.expect(NullPointerException.class);
exception.expectMessage("path"); exception.expectMessage("path");
//when //when
@ -383,7 +383,7 @@ public class NodeItemTest {
@Test @Test
public void shouldReturnEmptyForEmptyWalkTreePath() { public void shouldReturnEmptyForEmptyWalkTreePath() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
//when //when
val result = node.findInPath(Collections.emptyList()); val result = node.findInPath(Collections.emptyList());
//then //then
@ -396,7 +396,7 @@ public class NodeItemTest {
@Test @Test
public void shouldCreateDescendantNodes() { public void shouldCreateDescendantNodes() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val alphaData = "alpha"; val alphaData = "alpha";
val betaData = "beta"; val betaData = "beta";
val gammaData = "gamma"; val gammaData = "gamma";
@ -445,7 +445,7 @@ public class NodeItemTest {
@Test @Test
public void createDescendantLineShouldThrowNPEWhenDescendantsAreNull() { public void createDescendantLineShouldThrowNPEWhenDescendantsAreNull() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
exception.expect(NullPointerException.class); exception.expect(NullPointerException.class);
exception.expectMessage("descendants"); exception.expectMessage("descendants");
//when //when
@ -458,7 +458,7 @@ public class NodeItemTest {
@Test @Test
public void shouldChangeNothingWhenCreateDescendantEmpty() { public void shouldChangeNothingWhenCreateDescendantEmpty() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
//when //when
node.createDescendantLine(Collections.emptyList()); node.createDescendantLine(Collections.emptyList());
//then //then
@ -473,9 +473,9 @@ public class NodeItemTest {
@Test @Test
public void shouldFindExistingChildNode() { public void shouldFindExistingChildNode() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val childData = "child"; val childData = "child";
val child = new NodeItem<String>(childData, node); val child = Nodes.unnamedChild(childData, node);
//when //when
val found = node.findOrCreateChild(childData); val found = node.findOrCreateChild(childData);
//then //then
@ -490,7 +490,7 @@ public class NodeItemTest {
@Test @Test
public void shouldFindCreateNewChildNode() { public void shouldFindCreateNewChildNode() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val childData = "child"; val childData = "child";
//when //when
val found = node.findOrCreateChild(childData); val found = node.findOrCreateChild(childData);
@ -506,7 +506,7 @@ public class NodeItemTest {
@Test @Test
public void findOrCreateChildShouldThrowNPEFWhenChildIsNull() { public void findOrCreateChildShouldThrowNPEFWhenChildIsNull() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
exception.expect(NullPointerException.class); exception.expect(NullPointerException.class);
exception.expectMessage("child"); exception.expectMessage("child");
//when //when
@ -519,9 +519,9 @@ public class NodeItemTest {
@Test @Test
public void shouldGetChild() { public void shouldGetChild() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val childData = "child"; val childData = "child";
val child = new NodeItem<String>(childData); val child = Nodes.unnamedRoot(childData);
node.addChild(child); node.addChild(child);
//when //when
val found = node.findChild(childData); val found = node.findChild(childData);
@ -541,7 +541,7 @@ public class NodeItemTest {
@Test @Test
public void getChildShouldThrowNPEWhenThereIsNoChild() { public void getChildShouldThrowNPEWhenThereIsNoChild() {
//given //given
node = new NodeItem<>("data"); node = Nodes.unnamedRoot("data");
exception.expect(NullPointerException.class); exception.expect(NullPointerException.class);
exception.expectMessage("child"); exception.expectMessage("child");
//when //when
@ -555,7 +555,7 @@ public class NodeItemTest {
@Test @Test
public void shouldCreateChild() { public void shouldCreateChild() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
val childData = "child"; val childData = "child";
//when //when
val child = node.createChild(childData); val child = node.createChild(childData);
@ -580,7 +580,7 @@ public class NodeItemTest {
@Test @Test
public void createChildShouldThrowNPEWhenChildIsNull() { public void createChildShouldThrowNPEWhenChildIsNull() {
//given //given
node = new NodeItem<>("subject"); node = Nodes.unnamedRoot("subject");
exception.expect(NullPointerException.class); exception.expect(NullPointerException.class);
exception.expectMessage("child"); exception.expectMessage("child");
//when //when
@ -599,7 +599,7 @@ public class NodeItemTest {
public void getNameShouldUseParentNameSupplier() { public void getNameShouldUseParentNameSupplier() {
//given //given
val root = new NodeItem<String>("root", n -> n.getData().get()); val root = new NodeItem<String>("root", n -> n.getData().get());
node = new NodeItem<>("child", root); node = Nodes.unnamedChild("child", root);
//then //then
assertThat(node.getName()).isEqualTo("child"); assertThat(node.getName()).isEqualTo("child");
} }
@ -622,7 +622,7 @@ public class NodeItemTest {
node = new NodeItem<>("root", n -> n.getData().get()); node = new NodeItem<>("root", n -> n.getData().get());
val child = new NodeItem<String>("child", Object::toString); val child = new NodeItem<String>("child", Object::toString);
node.addChild(child); node.addChild(child);
val grandChild = new NodeItem<>("grandchild", child); val grandChild = Nodes.unnamedChild("grandchild", child);
//then //then
assertThat(node.getName()).isEqualTo("root"); assertThat(node.getName()).isEqualTo("root");
assertThat(child.getName()).isNotEqualTo("child"); assertThat(child.getName()).isNotEqualTo("child");
@ -631,8 +631,8 @@ public class NodeItemTest {
@Test @Test
public void getNameShouldWorkWithoutNameSupplier() { public void getNameShouldWorkWithoutNameSupplier() {
node = new NodeItem<>(null, "root"); node = Nodes.namedRoot(null, "root");
val namedchild = new NodeItem<>("named", "Alice", node); val namedchild = Nodes.namedChild("named", "Alice", node);
//then //then
assertThat(node.getName()).isEqualTo("root"); assertThat(node.getName()).isEqualTo("root");
assertThat(namedchild.getName()).isEqualTo("Alice"); assertThat(namedchild.getName()).isEqualTo("Alice");
@ -640,22 +640,22 @@ public class NodeItemTest {
@Test @Test
public void canCreateRootNodeWithoutData() { public void canCreateRootNodeWithoutData() {
node = new NodeItem<>(null, "empty"); node = Nodes.namedRoot(null, "empty");
assertThat(node.getData()).isEmpty(); assertThat(node.getData()).isEmpty();
} }
@Test @Test
public void canCreateRootNodeWithoutDataButWithNameSupplier() { public void canCreateRootNodeWithoutDataButWithNameSupplier() {
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
assertThat(node.getData()).isEmpty(); assertThat(node.getData()).isEmpty();
} }
@Test @Test
public void getChildNamedFindsChild() { public void getChildNamedFindsChild() {
//given //given
node = new NodeItem<>(null, "root"); node = Nodes.namedRoot("root data", "root");
val alpha = new NodeItem<String>(null, "alpha"); val alpha = Nodes.namedRoot("alpha data", "alpha");
val beta = new NodeItem<String>(null, "beta"); val beta = Nodes.namedRoot("beta data", "beta");
node.addChild(alpha); node.addChild(alpha);
node.addChild(beta); node.addChild(beta);
//when //when
@ -667,9 +667,9 @@ public class NodeItemTest {
@Test @Test
public void getChildNamedFindsNothing() { public void getChildNamedFindsNothing() {
//given //given
node = new NodeItem<>(null, "root"); node = Nodes.namedRoot("root data", "root");
val alpha = new NodeItem<String>(null, "alpha"); val alpha = Nodes.namedRoot("alpha data", "alpha");
val beta = new NodeItem<String>(null, "beta"); val beta = Nodes.namedRoot("beta data", "beta");
node.addChild(alpha); node.addChild(alpha);
node.addChild(beta); node.addChild(beta);
exception.expect(NodeException.class); exception.expect(NodeException.class);
@ -681,10 +681,10 @@ public class NodeItemTest {
@Test @Test
public void nodeNamesAreUniqueWithinAParent() { public void nodeNamesAreUniqueWithinAParent() {
//given //given
node = new NodeItem<>(null, "root"); node = Nodes.namedRoot("root data", "root");
val alpha = new NodeItem<String>(null, "alpha"); val alpha = Nodes.namedRoot("alpha data", "alpha");
node.addChild(alpha); node.addChild(alpha);
val beta = new NodeItem<String>(null, "alpha"); val beta = Nodes.namedRoot("beta data", "alpha");
exception.expect(NodeException.class); exception.expect(NodeException.class);
exception.expectMessage("Node with that name already exists here"); exception.expectMessage("Node with that name already exists here");
//when //when
@ -694,8 +694,8 @@ public class NodeItemTest {
@Test @Test
public void canPlaceNodeInTreeByPathNames() { public void canPlaceNodeInTreeByPathNames() {
//given //given
node = new NodeItem<>(null, "root"); // create a root node = Nodes.namedRoot("root data", "root"); // create a root
val four = new NodeItem<String>("data", "four"); val four = Nodes.namedRoot("data", "four");
//when //when
node.insertInPath(four, "one", "two", "three"); node.insertInPath(four, "one", "two", "three");
//then //then
@ -717,9 +717,9 @@ public class NodeItemTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void canPlaceInTreeUnderExistingNode() { public void canPlaceInTreeUnderExistingNode() {
//given //given
node = new NodeItem<>(null, "root"); node = Nodes.namedRoot(null, "root");
val child = new NodeItem<String>("child data", "child"); val child = Nodes.namedRoot("child data", "child");
val grandchild = new NodeItem<String>("grandchild data", "grandchild"); val grandchild = Nodes.namedRoot("grandchild data", "grandchild");
//when //when
node.insertInPath(child); // as root/child node.insertInPath(child); // as root/child
node.insertInPath(grandchild, "child"); // as root/child/grandchild node.insertInPath(grandchild, "child"); // as root/child/grandchild
@ -734,9 +734,9 @@ public class NodeItemTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void canPlaceInTreeAboveExistingNode() { public void canPlaceInTreeAboveExistingNode() {
//given //given
node = new NodeItem<>(null, "root"); node = Nodes.namedRoot(null, "root");
val child = new NodeItem<String>("child data", "child"); val child = Nodes.namedRoot("child data", "child");
val grandchild = new NodeItem<String>("grandchild data", "grandchild"); val grandchild = Nodes.namedRoot("grandchild data", "grandchild");
//when //when
node.insertInPath(grandchild, "child"); node.insertInPath(grandchild, "child");
node.insertInPath(child); node.insertInPath(child);
@ -752,7 +752,7 @@ public class NodeItemTest {
@Test @Test
public void removingParentFromNodeWithNoParentIsNoop() { public void removingParentFromNodeWithNoParentIsNoop() {
//given //given
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
//when //when
node.removeParent(); node.removeParent();
} }
@ -760,8 +760,8 @@ public class NodeItemTest {
@Test @Test
public void removingParentFromNodeWithParentRemovesParent() { public void removingParentFromNodeWithParentRemovesParent() {
//given //given
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
val child = new NodeItem<String>(null, node); val child = Nodes.unnamedChild("child data", node);
//when //when
child.removeParent(); child.removeParent();
//then //then
@ -775,22 +775,22 @@ public class NodeItemTest {
exception.expect(NodeException.class); exception.expect(NodeException.class);
exception.expectMessage( exception.expectMessage(
"A non-empty node named 'grandchild' already exists here"); "A non-empty node named 'grandchild' already exists here");
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
val child = new NodeItem<String>(null, "child", node); val child = Nodes.namedChild("child data", "child", node);
new NodeItem<>("data", "grandchild", child); Nodes.namedChild("data", "grandchild", child);
// root -> child -> grandchild // root -> child -> grandchild
// only grandchild has data // only grandchild has data
//when //when
// attempt to add another node called 'grandchild' to 'child' // attempt to add another node called 'grandchild' to 'child'
node.insertInPath(new NodeItem<>("cuckoo", "grandchild"), "child"); node.insertInPath(Nodes.namedRoot("cuckoo", "grandchild"), "child");
} }
@Test @Test
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void placeNodeInTreeWhenAddedNodeIsUnnamed() { public void placeNodeInTreeWhenAddedNodeIsUnnamed() {
//given //given
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
final Node<String> newNode = new NodeItem<>(null); final Node<String> newNode = Nodes.unnamedRoot(null);
//when //when
node.insertInPath(newNode); node.insertInPath(newNode);
//then //then
@ -801,12 +801,12 @@ public class NodeItemTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void placeNodeInTreeWhenEmptyChildWithTargetNameExists() { public void placeNodeInTreeWhenEmptyChildWithTargetNameExists() {
//given //given
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
final NodeItem<String> child = new NodeItem<>(null, "child"); final Node<String> child = Nodes.namedRoot(null, "child");
final NodeItem<String> target = new NodeItem<>(null, "target"); final Node<String> target = Nodes.namedRoot(null, "target");
node.addChild(child); node.addChild(child);
child.addChild(target); child.addChild(target);
final NodeItem<String> addMe = new NodeItem<>("I'm new", "target"); val addMe = Nodes.namedRoot("I'm new", "target");
assertThat(addMe.getParent()).isEmpty(); assertThat(addMe.getParent()).isEmpty();
assertThat(child.getChildByName("target").isEmpty()).as( assertThat(child.getChildByName("target").isEmpty()).as(
"target starts empty").isTrue(); "target starts empty").isTrue();
@ -823,7 +823,7 @@ public class NodeItemTest {
//given //given
exception.expect(NullPointerException.class); exception.expect(NullPointerException.class);
exception.expectMessage("name"); exception.expectMessage("name");
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
//when //when
node.findChildByName(null); node.findChildByName(null);
} }
@ -831,7 +831,7 @@ public class NodeItemTest {
@Test @Test
public void isNamedNull() { public void isNamedNull() {
//given //given
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
//then //then
assertThat(node.isNamed()).isFalse(); assertThat(node.isNamed()).isFalse();
} }
@ -839,7 +839,7 @@ public class NodeItemTest {
@Test @Test
public void isNamedEmpty() { public void isNamedEmpty() {
//given //given
node = new NodeItem<>(null, ""); node = Nodes.namedRoot(null, "");
//then //then
assertThat(node.isNamed()).isFalse(); assertThat(node.isNamed()).isFalse();
} }
@ -847,7 +847,7 @@ public class NodeItemTest {
@Test @Test
public void isNamedNamed() { public void isNamedNamed() {
//given //given
node = new NodeItem<>(null, "named"); node = Nodes.namedRoot(null, "named");
//then //then
assertThat(node.isNamed()).isTrue(); assertThat(node.isNamed()).isTrue();
} }
@ -858,7 +858,7 @@ public class NodeItemTest {
// provider // provider
//given //given
node = new NodeItem<>("data", n -> n.getData().get()); node = new NodeItem<>("data", n -> n.getData().get());
final NodeItem<String> child = new NodeItem<>("other", node); val child = Nodes.unnamedChild("other", node);
assertThat(node.getName()).as("initial root name").isEqualTo("data"); assertThat(node.getName()).as("initial root name").isEqualTo("data");
assertThat(child.getName()).as("initial child name").isEqualTo("other"); assertThat(child.getName()).as("initial child name").isEqualTo("other");
//when //when
@ -872,7 +872,7 @@ public class NodeItemTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void removeChildRemovesTheChild() { public void removeChildRemovesTheChild() {
//given //given
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
Node<String> child = node.createChild("child"); Node<String> child = node.createChild("child");
assertThat(node.getChildren()).containsExactly(child); assertThat(node.getChildren()).containsExactly(child);
//then //then
@ -885,13 +885,14 @@ public class NodeItemTest {
@Test @Test
public void drawTreeIsCorrect() { public void drawTreeIsCorrect() {
//given //given
node = new NodeItem<>(null, "root"); node = Nodes.namedRoot(null, "root");
val bob = new NodeItem<String>(null, "bob", node); val bob = Nodes.namedChild("bob data", "bob", node);
val alice = new NodeItem<String>(null, "alice", node); val alice = Nodes.namedChild("alice data", "alice", node);
new NodeItem<>(null, "dave", alice); Nodes.namedChild("dave data", "dave", alice);
new NodeItem<>(null, bob); // has no name and no children so no included Nodes.unnamedChild("bob's child's data",
val kim = new NodeItem<String>(null, node); // nameless mother bob); // has no name and no children so no included
new NodeItem<>(null, "lucy", kim); val kim = Nodes.unnamedChild("kim data", node); // nameless mother
Nodes.namedChild("lucy data", "lucy", kim);
//when //when
val tree = node.drawTree(0); val tree = node.drawTree(0);
//then //then
@ -907,7 +908,7 @@ public class NodeItemTest {
@Test @Test
public void canChangeNodeData() { public void canChangeNodeData() {
//given //given
node = new NodeItem<>("initial"); node = Nodes.unnamedRoot("initial");
//when //when
node.setData("updated"); node.setData("updated");
//then //then
@ -918,7 +919,7 @@ public class NodeItemTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void canCreateNamedChild() { public void canCreateNamedChild() {
//given //given
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
//when //when
Node<String> child = node.createChild("child data", "child name"); Node<String> child = node.createChild("child data", "child name");
//then //then
@ -930,10 +931,10 @@ public class NodeItemTest {
@Test @Test
public void canGetChildWhenFound() { public void canGetChildWhenFound() {
//given //given
node = new NodeItem<>("data"); node = Nodes.unnamedRoot("data");
Node<String> child = new NodeItem<>("child data", "child name", node); val child = Nodes.namedChild("child data", "child name", node);
//when //when
Node<String> found = node.getChild("child data"); val found = node.getChild("child data");
//then //then
assertThat(found).isSameAs(child); assertThat(found).isSameAs(child);
} }
@ -943,7 +944,7 @@ public class NodeItemTest {
//given //given
exception.expect(NodeException.class); exception.expect(NodeException.class);
exception.expectMessage("Child not found"); exception.expectMessage("Child not found");
node = new NodeItem<>("data"); node = Nodes.unnamedRoot("data");
//when //when
node.getChild("child data"); node.getChild("child data");
} }
@ -952,9 +953,9 @@ public class NodeItemTest {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void constructorWithNameSupplierAndParentBeChildOfParent() { public void constructorWithNameSupplierAndParentBeChildOfParent() {
//given //given
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
//when //when
NodeItem<String> child = new NodeItem<>(null, node); val child = Nodes.unnamedChild("child data", node);
//then //then
assertThat(child.getParent()).contains(node); assertThat(child.getParent()).contains(node);
assertThat(node.getChildren()).containsExactly(child); assertThat(node.getChildren()).containsExactly(child);
@ -965,7 +966,7 @@ public class NodeItemTest {
public void removeParentCopiesRootNameSupplier() { public void removeParentCopiesRootNameSupplier() {
//given //given
node = new NodeItem<>("root data", n -> "root supplier"); node = new NodeItem<>("root data", n -> "root supplier");
val child = new NodeItem<>("child data", node); val child = Nodes.unnamedChild("child data", node);
assertThat(child.getName()).isEqualTo("root supplier"); assertThat(child.getName()).isEqualTo("root supplier");
//when //when
child.removeParent(); child.removeParent();
@ -990,7 +991,7 @@ public class NodeItemTest {
public void setNameToNullRevertsToParentNameSupplier() { public void setNameToNullRevertsToParentNameSupplier() {
//given //given
node = new NodeItem<>(null, n -> "root supplier"); node = new NodeItem<>(null, n -> "root supplier");
val child = new NodeItem<String>(null, "child name", node); val child = Nodes.namedChild("child data", "child name", node);
assertThat(child.getName()).isEqualTo("child name"); assertThat(child.getName()).isEqualTo("child name");
//when //when
child.setName(null); child.setName(null);
@ -1034,8 +1035,8 @@ public class NodeItemTest {
return ""; return "";
}; };
node = new NodeItem<>(null, pathNameSupplier); node = new NodeItem<>(null, pathNameSupplier);
val child = new NodeItem<String>("child", node); val child = Nodes.unnamedChild("child", node);
val grandchild = new NodeItem<String>("grandchild", child); val grandchild = Nodes.unnamedChild("grandchild", child);
//then //then
assertThat(grandchild.getName()).isEqualTo("/child/grandchild"); assertThat(grandchild.getName()).isEqualTo("/child/grandchild");
} }
@ -1043,8 +1044,8 @@ public class NodeItemTest {
@Test @Test
public void canSafelyHandleFindChildWhenAChildHasNoData() { public void canSafelyHandleFindChildWhenAChildHasNoData() {
//given //given
node = new NodeItem<>(null); node = Nodes.unnamedRoot(null);
new NodeItem<>(null, node); Nodes.unnamedChild(null, node);
//when //when
node.findChild("data"); node.findChild("data");
} }