[Feature] add testSuite and let it run

miniyk2012 · miniyk2012 · commit 8a17419b14fb · 2017-09-17T21:26:11.000+08:00
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/liuxinv2/TestListener.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/liuxinv2/TestListener.java
@@ -1,7 +1,7 @@
 package com.coderising.myood.litejunit.liuxinv2;
 
 /**
- * A Listener for test progress
+ * A TestListener for test progress
  */
 public interface TestListener {
 	
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/CalculatorTest.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/CalculatorTest.java
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/ClientToTest.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/ClientToTest.java
@@ -1,26 +1,17 @@
 package com.coderising.myood.litejunit.v2;
 
 
+import com.coderising.myood.litejunit.v2.example_test.AllTest;
+
 /**
  * Created by thomas_young on 21/8/2017.
  */
 public class ClientToTest {
 
     public static void main(String[] args) {
         TestResult tr = new TestResult();
-
-//        Test cs1 = new CalculatorTest("testAdd");
-//        tryTest(cs1, tr);
-//        Test cs2 = new CalculatorTest("testSubtract");
-//        tryTest(cs2, tr);
-
-        System.out.println("---------------------------------");
-        tr.clearResult();
-        Test ts = new TestSuite("AllTest");
-//        ((TestSuite)ts).addTest(new CalculatorTest("haha"));
-        ((TestSuite)ts).addTest(new TestSuite(CalculatorTest.class));
-        tryTest(ts, tr);
-
+        Test testAll = AllTest.suite();
+        tryTest(testAll, tr);
     }
 
     private static void tryTest(Test test, TestResult tr) {
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/TestListener.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/TestListener.java
@@ -0,0 +1,11 @@
+package com.coderising.myood.litejunit.v2;
+
+/**
+ * Created by thomas_young on 17/9/2017.
+ */
+public interface TestListener {
+    void addError(Test test, Throwable t);
+    void addFailure(Test test, Throwable t);
+    void startTest(Test test);
+    void endTest(Test test);
+}
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/TestSuite.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/TestSuite.java
@@ -24,6 +24,8 @@ public int countTestCases() {
         return totalCount;
     }
 
+    public TestSuite(){
+    }
     public TestSuite(String name) {
         this.name = name;
     }
@@ -125,4 +127,7 @@ private String exceptionToString(Throwable t) {
 
     }
 
+    public void addTestSuite(Class testClass) {
+        addTest(new TestSuite(testClass));
+    }
 }
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example/a/Calculator.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example/a/Calculator.java
@@ -0,0 +1,23 @@
+package com.coderising.myood.litejunit.v2.example.a;
+
+/**
+ * Created by thomas_young on 17/9/2017.
+ */
+public class Calculator {
+    public int add(int a,int b){
+        return a + b;
+    }
+    public int minus(int a,int b){
+        return a - b;
+    }
+    public int multiply(int a, int b ){
+        return a * b;
+    }
+    public int divide(int a , int b )throws Exception
+    {
+        if(b == 0){
+            throw new Exception("除数不能为零");
+        }
+        return a / b;
+    }
+}
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example/b/Byebye.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example/b/Byebye.java
@@ -0,0 +1,10 @@
+package com.coderising.myood.litejunit.v2.example.b;
+
+/**
+ * Created by thomas_young on 17/9/2017.
+ */
+public class Byebye {
+    public String Say(){
+        return "Byebye!";
+    }
+}
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example/b/HelloWorld.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example/b/HelloWorld.java
@@ -0,0 +1,10 @@
+package com.coderising.myood.litejunit.v2.example.b;
+
+/**
+ * Created by thomas_young on 17/9/2017.
+ */
+public class HelloWorld {
+    public String Say(){
+        return "Hello,World!";
+    }
+}
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/AllTest.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/AllTest.java
@@ -0,0 +1,18 @@
+package com.coderising.myood.litejunit.v2.example_test;
+
+import com.coderising.myood.litejunit.v2.Test;
+import com.coderising.myood.litejunit.v2.TestSuite;
+import com.coderising.myood.litejunit.v2.example_test.a.AAllTest;
+import com.coderising.myood.litejunit.v2.example_test.b.BAllTest;
+
+/**
+ * Created by thomas_young on 17/9/2017.
+ */
+public class AllTest {
+    public static Test suite() {
+        TestSuite suite = new TestSuite();
+        suite.addTest(AAllTest.suite());
+        suite.addTest(BAllTest.suite());
+        return suite;
+    }
+}
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/a/AAllTest.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/a/AAllTest.java
@@ -0,0 +1,16 @@
+package com.coderising.myood.litejunit.v2.example_test.a;
+
+
+import com.coderising.myood.litejunit.v2.Test;
+import com.coderising.myood.litejunit.v2.TestSuite;
+
+/**
+ * Created by thomas_young on 17/9/2017.
+ */
+public class AAllTest {
+    public static Test suite() {
+        TestSuite suite = new TestSuite();
+        suite.addTestSuite(CalculatorTest.class);
+        return suite;
+    }
+}
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/a/CalculatorTest.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/a/CalculatorTest.java
@@ -0,0 +1,88 @@
+package com.coderising.myood.litejunit.v2.example_test.a;
+
+import com.coderising.myood.litejunit.v2.Assert;
+import com.coderising.myood.litejunit.v2.TestCase;
+import com.coderising.myood.litejunit.v2.example.a.Calculator;
+
+/**
+ * Created by thomas_young on 17/9/2017.
+ */
+public class CalculatorTest extends TestCase {
+    public CalculatorTest(String name) {
+        super(name);
+    }
+
+    /** *//**
+     * 在Junit3.8中，测试方法满足如下原则
+     * 1)public
+     * 2)void
+     * 3)无方法参数
+     * 4）最重要的方法名称必须以test开头
+     */
+    private Calculator cal;
+
+    //在执行每个test之前，都执行setUp；
+    public void setUp(){
+        cal = new Calculator();
+    }
+
+    //在执行每个test之后，都要执行tearDown
+    public void tearDown(){
+    }
+
+    public void testAdd()
+    {
+        Calculator cal = new Calculator();
+        int result = cal.add(1, 2);
+        //断言assert
+        Assert.assertEquals(3, result);
+    }
+
+    public void testMinus()
+    {
+        Calculator cal = new Calculator();
+        int result = cal.minus(5, 2);
+        Assert.assertEquals(3, result);
+    }
+
+    public void testMultiply()
+    {
+        Calculator cal = new Calculator();
+        int result = cal.multiply(4, 2);
+        Assert.assertEquals(8,result);
+    }
+
+    public void testDivide()
+    {
+        Calculator cal = new Calculator();
+        int result = 0;
+        try {
+            result = cal.divide(10,5);
+        } catch (Exception e) {
+            e.printStackTrace();
+            //我们期望result = cal.divide(10,5);正常执行；如果进入到catch中说明失败；
+            //所以我们加上fail。
+            Assert.fail();//如果这行没有执行。说明这部分正确。
+        }
+        Assert.assertEquals(2,result);
+    }
+
+    public void testDivide2()
+    {
+        Throwable tx = null;
+        try
+        {
+            // Calculator cal = new Calculator();
+            cal.divide(10,0);
+            //正常来讲cal.divide(10,0);已经抛出异常，之后的代码不会被执行。
+            //我们也期望是这样的。所以说如果下面的Assert.fail();执行了。
+            //我的的测试就失败了。
+            Assert.fail();//当执行到这里测试失败，后面的代码将不被执行。
+        } catch (Exception e) {
+            tx = e;
+        }
+        Assert.assertNotNull(tx);      //断言tx不为空。也就是说肯定有异常。
+        Assert.assertEquals(Exception.class,tx.getClass());//断言tx的类型为Exception类型
+        Assert.assertEquals("除数不能为零", tx.getMessage());
+    }
+}
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/b/BAllTest.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/b/BAllTest.java
@@ -0,0 +1,16 @@
+package com.coderising.myood.litejunit.v2.example_test.b;
+
+import com.coderising.myood.litejunit.v2.Test;
+import com.coderising.myood.litejunit.v2.TestSuite;
+
+/**
+ * Created by thomas_young on 17/9/2017.
+ */
+public class BAllTest {
+    public static Test suite() {
+        TestSuite suite = new TestSuite();
+        suite.addTestSuite(HelloWorldTest.class);
+        suite.addTestSuite(ByebyeTest.class);
+        return suite;
+    }
+}
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/b/ByebyeTest.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/b/ByebyeTest.java
@@ -0,0 +1,17 @@
+package com.coderising.myood.litejunit.v2.example_test.b;
+
+import com.coderising.myood.litejunit.v2.TestCase;
+import com.coderising.myood.litejunit.v2.example.b.Byebye;
+
+/**
+ * Created by thomas_young on 17/9/2017.
+ */
+public class ByebyeTest extends TestCase {
+    public ByebyeTest(String name) {
+        super(name);
+    }
+    public void testSay(){
+        Byebye bye = new Byebye();
+        assertEquals("Byebye!", bye.Say());
+    }
+}
diff --git a/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/b/HelloWorldTest.java b/students/812350401/src/main/java/com/coderising/myood/litejunit/v2/example_test/b/HelloWorldTest.java
@@ -0,0 +1,19 @@
+package com.coderising.myood.litejunit.v2.example_test.b;
+
+import com.coderising.myood.litejunit.v2.TestCase;
+import com.coderising.myood.litejunit.v2.example.b.HelloWorld;
+
+/**
+ * Created by thomas_young on 17/9/2017.
+ */
+public class HelloWorldTest extends TestCase {
+
+    public HelloWorldTest(String name) {
+        super(name);
+    }
+
+    public void testSay(){
+        HelloWorld hi = new HelloWorld();
+        assertEquals("Hello,World!", hi.Say());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@ public int countTestCases() {`
`24`	`24`	`return totalCount;`
`25`	`25`	`}`
`26`	`26`
	`27`	`+ public TestSuite(){`
	`28`	`+ }`
`27`	`29`	`public TestSuite(String name) {`
`28`	`30`	`this.name = name;`
`29`	`31`	`}`
`@@ -125,4 +127,7 @@ private String exceptionToString(Throwable t) {`
`125`	`127`
`126`	`128`	`}`
`127`	`129`
	`130`	`+ public void addTestSuite(Class testClass) {`
	`131`	`+ addTest(new TestSuite(testClass));`
	`132`	`+ }`
`128`	`133`	`}`