补充测试用例

miniyk2012 · miniyk2012 · commit be549f3b8b41 · 2017-02-25T13:09:30.000+08:00
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/BinaryTreeNodeTest.java b/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/BinaryTreeNodeTest.java
@@ -3,29 +3,68 @@
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
 import com.github.miniyk2012.coding2017.basic.BinaryTreeNode;
 
 public class BinaryTreeNodeTest {
 
 	private BinaryTreeNode<Integer> binaryTreeNode;
 
+	/**
+		//	    4
+		//	  1   5
+		//  2 	3
+	*/
 	@Before
 	public void setUpBinaryTreeNode() {
 		binaryTreeNode = new BinaryTreeNode<Integer>(4);
-	}
-
-	@Test
-	public void testBinaryTreeNodeFunctional() {
 		binaryTreeNode.insert(1);
 		binaryTreeNode.insert(3);
 		binaryTreeNode.insert(5);
 		binaryTreeNode.insert(2);
+	}
+
+	@Test
+	public void testBinaryTreeNodeFunctional1() {
 		assertEquals(new Integer(4), binaryTreeNode.getData());
 		assertEquals(new Integer(1), binaryTreeNode.getLeft().getData());
 		assertEquals(new Integer(5), binaryTreeNode.getRight().getData());
 		assertEquals(new Integer(3), binaryTreeNode.getLeft().getRight().getData());
 		assertEquals(new Integer(2), binaryTreeNode.getLeft().getRight().getLeft().getData());
 	}
-
+   
+	@Test
+	public void testBinaryTreeFunctional2() {
+		BinaryTreeNode<Integer> node1 = binaryTreeNode.getLeft();
+		assertEquals(new Integer(1), node1.getData());
+		assertEquals(new Integer(3), node1.getRight().getData());
+		assertEquals(new Integer(5), binaryTreeNode.getRight().getData());
+	}
+	
+	@Rule  
+	public ExpectedException expectedEx = ExpectedException.none(); 
+	
+	@Test
+	public void testBinaryTreeFunctional3()
+	{
+		BinaryTreeNode<Integer> treeNode = new BinaryTreeNode<Integer>(100);
+		treeNode.insert(10);
+		binaryTreeNode.setRight(treeNode);
+		//	      4
+		//	   1      100
+		//  2 	  3  10
+		assertEquals(new Integer(4), binaryTreeNode.getData());
+		assertEquals(new Integer(1), binaryTreeNode.getLeft().getData());
+		assertEquals(new Integer(3), binaryTreeNode.getLeft().getRight().getData());
+		assertEquals(new Integer(2), binaryTreeNode.getLeft().getRight().getLeft().getData());	
+		assertEquals(new Integer(100), binaryTreeNode.getRight().getData());
+		assertEquals(new Integer(10), binaryTreeNode.getRight().getLeft().getData());
+		
+		expectedEx.expect(Exception.class);
+		binaryTreeNode.getRight().getRight().getRight();  // null exception
+		binaryTreeNode.getRight().getRight().getLeft();  // null exception
+	}
 }
diff --git a/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/ListTest.java b/group02/812350401/src/com/github/miniyk2012/coding2017/basic/test/ListTest.java
@@ -85,7 +85,6 @@ public void testException() {
 		aList.remove(1);
 		aList.add(3);
 		aList.add(2, 5);
-		expectedEx.expect(Exception.class);
 	}
 	
 	@Test
@@ -110,6 +109,9 @@ public void testIterator() {
 		assertEquals(1, it.next());
 		assertEquals(3, it.next());
 		assertEquals(false, it.hasNext());	
+		
+		expectedEx.expect(Exception.class);
+		it.next();
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ public void testException() {`
`85`	`85`	`aList.remove(1);`
`86`	`86`	`aList.add(3);`
`87`	`87`	`aList.add(2, 5);`
`88`		`- expectedEx.expect(Exception.class);`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`@Test`
`@@ -110,6 +109,9 @@ public void testIterator() {`
`110`	`109`	`assertEquals(1, it.next());`
`111`	`110`	`assertEquals(3, it.next());`
`112`	`111`	`assertEquals(false, it.hasNext());`
	`112`	`+`
	`113`	`+ expectedEx.expect(Exception.class);`
	`114`	`+ it.next();`
`113`	`115`	`}`
`114`	`116`
`115`	`117`	`}`