diff --git a/src/main/java/cx/by/HappyTree/TreeNode.java b/src/main/java/cx/by/HappyTree/TreeNode.java index d4cae5a..f3865c3 100644 --- a/src/main/java/cx/by/HappyTree/TreeNode.java +++ b/src/main/java/cx/by/HappyTree/TreeNode.java @@ -43,7 +43,7 @@ public boolean setParent(Object node) { this.parent = node; Object tmp = node; while (null != ((TreeNode) tmp).parent()){ - tmp = root.parent(); + tmp = ((TreeNode) tmp).parent(); } if(tmp instanceof HappyTree) root = (HappyTree) tmp; @@ -80,8 +80,6 @@ public ArrayList getAllChild() { resList.add((TreeNode) node); } return resList; - }else { - } return null; } @@ -94,8 +92,6 @@ public ArrayList getAllChild(TreeNode current) { resList.add((TreeNode) node); } return resList; - }else { - } return null; } @@ -141,9 +137,16 @@ public boolean addChild(Object... node) { for (TreeNode tree:children) { if(maxLenlist = node1.getAllChild(node2); TestCase.assertEquals(list.size(),1); + TestCase.assertEquals(node1.findAll("node1_1").get(0),node1_1); } @Test public void H_clearTest(){ @@ -114,4 +121,10 @@ public void I_splitTest(){ TestCase.assertEquals(happyTree.split(node1),node1); TestCase.assertEquals(happyTree.children().size(),2); } + @Test + public void J_equalTest(){ + TreeNode node1 = new TreeNode(); + TreeNode node2 = new TreeNode(); + TestCase.assertEquals(true,node1.equals(node2)); + } }