ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r644321 - /ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
Date Thu, 03 Apr 2008 14:04:14 GMT
Author: bodewig
Date: Thu Apr  3 07:04:13 2008
New Revision: 644321

URL: http://svn.apache.org/viewvc?rev=644321&view=rev
Log:
whitespace changes only

Modified:
    ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java

Modified: ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java?rev=644321&r1=644320&r2=644321&view=diff
==============================================================================
--- ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
(original)
+++ ant/core/trunk/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
Thu Apr  3 07:04:13 2008
@@ -101,82 +101,100 @@
     //     But running the JUnit testcase fails in 4th run.
     public void testFailureRecorder() {
         try {
-        File testDir = new File(getProjectDir(), "out");
-        File collectorFile = new File(getProjectDir(), "out/FailedTests.java");
-        
-        // ensure that there is a clean test environment
-        assertFalse("Test directory '" + testDir.getAbsolutePath() + "' must not exist before
the test preparation.", 
-                testDir.exists());
-        assertFalse("The collector file '" + collectorFile.getAbsolutePath() + "'must not
exist before the test preparation.", 
-                collectorFile.exists());
+            File testDir = new File(getProjectDir(), "out");
+            File collectorFile = new File(getProjectDir(),
+                                          "out/FailedTests.java");
+        
+            // ensure that there is a clean test environment
+            assertFalse("Test directory '" + testDir.getAbsolutePath()
+                        + "' must not exist before the test preparation.", 
+                        testDir.exists());
+            assertFalse("The collector file '"
+                        + collectorFile.getAbsolutePath()
+                        + "'must not exist before the test preparation.", 
+                        collectorFile.exists());
 
         
-        // prepare the test environment
-        executeTarget("failureRecorder.prepare");
-        assertTrue("Test directory '" + testDir.getAbsolutePath() + "' was not created.",
testDir.exists());
-        assertTrue("There should be one class.", (new File(testDir, "A.class")).exists());
-        assertFalse("The collector file '" + collectorFile.getAbsolutePath() 
-                + "' should not exist before the 1st run.", collectorFile.exists());
-        
-        
-        // 1st junit run: should do all tests - failing and not failing tests
-        executeTarget("failureRecorder.runtest");
-        assertTrue("The collector file '" + collectorFile.getAbsolutePath() 
-                + "' should exist after the 1st run.", collectorFile.exists());
-        // the passing test cases
-        assertOutputContaining("1st run: should run A.test01", "A.test01");
-        assertOutputContaining("1st run: should run B.test05", "B.test05");
-        assertOutputContaining("1st run: should run B.test06", "B.test06");
-        assertOutputContaining("1st run: should run C.test07", "C.test07");
-        assertOutputContaining("1st run: should run C.test08", "C.test08");
-        assertOutputContaining("1st run: should run C.test09", "C.test09");
-        // the failing test cases
-        assertOutputContaining("1st run: should run A.test02", "A.test02");
-        assertOutputContaining("1st run: should run A.test03", "A.test03");
-        assertOutputContaining("1st run: should run B.test04", "B.test04");
-        assertOutputContaining("1st run: should run D.test10", "D.test10");
+            // prepare the test environment
+            executeTarget("failureRecorder.prepare");
+            assertTrue("Test directory '" + testDir.getAbsolutePath()
+                       + "' was not created.", testDir.exists());
+            assertTrue("There should be one class.",
+                       (new File(testDir, "A.class")).exists());
+            assertFalse("The collector file '"
+                        + collectorFile.getAbsolutePath() 
+                        + "' should not exist before the 1st run.",
+                        collectorFile.exists());
+        
+        
+            // 1st junit run: should do all tests - failing and not failing tests
+            executeTarget("failureRecorder.runtest");
+            assertTrue("The collector file '" + collectorFile.getAbsolutePath() 
+                       + "' should exist after the 1st run.",
+                       collectorFile.exists());
+            // the passing test cases
+            assertOutputContaining("1st run: should run A.test01", "A.test01");
+            assertOutputContaining("1st run: should run B.test05", "B.test05");
+            assertOutputContaining("1st run: should run B.test06", "B.test06");
+            assertOutputContaining("1st run: should run C.test07", "C.test07");
+            assertOutputContaining("1st run: should run C.test08", "C.test08");
+            assertOutputContaining("1st run: should run C.test09", "C.test09");
+            // the failing test cases
+            assertOutputContaining("1st run: should run A.test02", "A.test02");
+            assertOutputContaining("1st run: should run A.test03", "A.test03");
+            assertOutputContaining("1st run: should run B.test04", "B.test04");
+            assertOutputContaining("1st run: should run D.test10", "D.test10");
 
         
-        // 2nd junit run: should do only failing tests
-        executeTarget("failureRecorder.runtest");
-        assertTrue("The collector file '" + collectorFile.getAbsolutePath() 
-                + "' should exist after the 2nd run.", collectorFile.exists());
-        // the passing test cases
-        assertOutputNotContaining("2nd run: should not run A.test01", "A.test01");
-        assertOutputNotContaining("2nd run: should not run A.test05", "B.test05");
-        assertOutputNotContaining("2nd run: should not run B.test06", "B.test06");
-        assertOutputNotContaining("2nd run: should not run C.test07", "C.test07");
-        assertOutputNotContaining("2nd run: should not run C.test08", "C.test08");
-        assertOutputNotContaining("2nd run: should not run C.test09", "C.test09");
-        // the failing test cases
-        assertOutputContaining("2nd run: should run A.test02", "A.test02");
-        assertOutputContaining("2nd run: should run A.test03", "A.test03");
-        assertOutputContaining("2nd run: should run B.test04", "B.test04");
-        assertOutputContaining("2nd run: should run D.test10", "D.test10");
-        
-        
-        // "fix" errors in class A
-        executeTarget("failureRecorder.fixing");
-        
-        // 3rd run: four running tests with two errors
-        executeTarget("failureRecorder.runtest");
-        assertTrue("The collector file '" + collectorFile.getAbsolutePath() 
-                + "' should exist after the 3rd run.", collectorFile.exists());
-        assertOutputContaining("3rd run: should run A.test02", "A.test02");
-        assertOutputContaining("3rd run: should run A.test03", "A.test03");
-        assertOutputContaining("3rd run: should run B.test04", "B.test04");
-        assertOutputContaining("3rd run: should run D.test10", "D.test10");
-        
-        
-        // 4rd run: two running tests with errors
-        executeTarget("failureRecorder.runtest");
-        assertTrue("The collector file '" + collectorFile.getAbsolutePath() 
-                + "' should exist after the 4th run.", collectorFile.exists());
-        //TODO: these two statements fail
-        //assertOutputNotContaining("4th run: should not run A.test02", "A.test02");
-        //assertOutputNotContaining("4th run: should not run A.test03", "A.test03");
-        assertOutputContaining("4th run: should run B.test04", "B.test04");
-        assertOutputContaining("4th run: should run D.test10", "D.test10");
+            // 2nd junit run: should do only failing tests
+            executeTarget("failureRecorder.runtest");
+            assertTrue("The collector file '" + collectorFile.getAbsolutePath() 
+                       + "' should exist after the 2nd run.",
+                       collectorFile.exists());
+            // the passing test cases
+            assertOutputNotContaining("2nd run: should not run A.test01",
+                                      "A.test01");
+            assertOutputNotContaining("2nd run: should not run A.test05",
+                                      "B.test05");
+            assertOutputNotContaining("2nd run: should not run B.test06",
+                                      "B.test06");
+            assertOutputNotContaining("2nd run: should not run C.test07",
+                                      "C.test07");
+            assertOutputNotContaining("2nd run: should not run C.test08",
+                                      "C.test08");
+            assertOutputNotContaining("2nd run: should not run C.test09",
+                                      "C.test09");
+            // the failing test cases
+            assertOutputContaining("2nd run: should run A.test02", "A.test02");
+            assertOutputContaining("2nd run: should run A.test03", "A.test03");
+            assertOutputContaining("2nd run: should run B.test04", "B.test04");
+            assertOutputContaining("2nd run: should run D.test10", "D.test10");
+        
+        
+            // "fix" errors in class A
+            executeTarget("failureRecorder.fixing");
+        
+            // 3rd run: four running tests with two errors
+            executeTarget("failureRecorder.runtest");
+            assertTrue("The collector file '" + collectorFile.getAbsolutePath() 
+                       + "' should exist after the 3rd run.",
+                       collectorFile.exists());
+            assertOutputContaining("3rd run: should run A.test02", "A.test02");
+            assertOutputContaining("3rd run: should run A.test03", "A.test03");
+            assertOutputContaining("3rd run: should run B.test04", "B.test04");
+            assertOutputContaining("3rd run: should run D.test10", "D.test10");
+        
+        
+            // 4rd run: two running tests with errors
+            executeTarget("failureRecorder.runtest");
+            assertTrue("The collector file '" + collectorFile.getAbsolutePath() 
+                       + "' should exist after the 4th run.",
+                       collectorFile.exists());
+            //TODO: these two statements fail
+            //assertOutputNotContaining("4th run: should not run A.test02", "A.test02");
+            //assertOutputNotContaining("4th run: should not run A.test03", "A.test03");
+            assertOutputContaining("4th run: should run B.test04", "B.test04");
+            assertOutputContaining("4th run: should run D.test10", "D.test10");
         } catch (BuildException be) {
             be.printStackTrace();
             System.err.println("nested build's log: " + getLog());



Mime
View raw message