Merge from master

WHATSNEW

@@ -1,6 +1,15 @@
 Changes from Ant 1.9.11 TO Ant 1.9.12
 =====================================
 
+Fixed bugs:
+-----------
+
+ * Delay the class initialization of the test classes untill they are
+   passed to JUnit. This way we can avoid that failing static initializers
+   from non-test classes are reported as error when the 'skipNonTests' option
+   is 'true'.
+   Bugzilla Report 60062
+
 Changes from Ant 1.9.10 TO Ant 1.9.11
 =====================================
 

src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java

@@ -383,9 +383,10 @@ public class JUnitTestRunner implements TestListener, JUnitTaskMirror.JUnitTestR
             try {
                 Class testClass = null;
                 if (loader == null) {
-                    testClass = Class.forName(junitTest.getName());
+                    testClass = Class.forName(junitTest.getName(), false,
+                                              getClass().getClassLoader());
                 } else {
-                    testClass = Class.forName(junitTest.getName(), true,
+                    testClass = Class.forName(junitTest.getName(), false,
                                               loader);
                 }
 

src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunnerTest.java

@@ -25,6 +25,7 @@ import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import javafx.scene.control.Control;
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
@@ -99,6 +100,35 @@ public class JUnitTestRunnerTest {
         //assertEquals(runner.getFormatter().getError(), JUnitTestRunner.FAILURES, runner.getRetCode());
     }
 
+    // check that something which is not a testcase doesn't generate an error
+    // when skipping non-test classes
+    @Test
+    public void testSkipNonTestsNoTestCase() {
+        TestRunner runner = createRunner(NoTestCase.class, true);
+        runner.run();
+        assertEquals(runner.getFormatter().getError(), JUnitTestRunner.SUCCESS, runner.getRetCode());
+    }
+
+    // check that something which is not a testcase with a failing static init doesn't generate an error
+    // when skipping non-test classes
+    @Test
+    public void testSkipNonTestsNoTestCaseFailingStaticInit() {
+        TestRunner runner = createRunner(NoTestCaseStaticInitializerError.class, true);
+        runner.run();
+        assertEquals(runner.getFormatter().getError(), JUnitTestRunner.SUCCESS, runner.getRetCode());
+    }
+
+    @Test
+    public void testStaticInitializerErrorTestCase() {
+        TestRunner runner = createRunner(StaticInitializerErrorTestCase.class);
+        runner.run();
+        // On junit3 this is a FAILURE, on junit4 this is an ERROR
+        int ret = runner.getRetCode();
+        if (ret != JUnitTestRunner.FAILURES && ret != JUnitTestRunner.ERRORS) {
+            fail("Unexpected result " + ret + " from junit runner");
+        }
+    }
+
     // check that an exception in the constructor is noticed
     @Test
     public void testInvalidTestCase() {
@@ -134,6 +164,12 @@ public class JUnitTestRunnerTest {
                                             true, true, true);
     }
 
+    protected TestRunner createRunner(Class<?> clazz, boolean skipNonTests) {
+        JUnitTest test = new JUnitTest(clazz.getName());
+        test.setSkipNonTests(skipNonTests);
+        return new TestRunner(test, null, true, true, true);
+    }
+
     protected TestRunner createRunnerForTestMethod(Class<?> clazz, String method) {
         return new TestRunner(new JUnitTest(clazz.getName()), new String[] {method},
                                             true, true, true);
@@ -196,6 +232,15 @@ public class JUnitTestRunnerTest {
     public static class NoTestCase {
     }
 
+    public static class NoTestCaseStaticInitializerError {
+        static {
+            error();
+        }
+        private static void error() {
+            throw new NullPointerException("thrown on purpose");
+        }
+    }
+
     public static class InvalidMethodTestCase extends TestCase {
         public InvalidMethodTestCase(String name) {
             super(name);
@@ -251,6 +296,17 @@ public class JUnitTestRunnerTest {
         }
     }
 
+    public static class StaticInitializerErrorTestCase extends TestCase {
+        static {
+            error();
+        }
+        private static void error() {
+            throw new NullPointerException("thrown on purpose");
+        }
+        public void testA() {
+        }
+    }
+
     public static class AssertionErrorTest {
         @Test
         public void throwsAssertionError() {