test: Do not use JUnitCore.main()

Use JUnitCore.runClasses() instead, per JUnit docs.
JMRI · Mar 4, 2019 · e7d516d · e7d516d
1 parent 96ce34f
commit e7d516d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/java/test/apps/tests/AllTest.java b/java/test/apps/tests/AllTest.java
@@ -36,7 +36,7 @@ public static void initLogging() {
 
    static public void main(String[] args) {
         // launch this class via JUnit4
-       org.junit.runner.JUnitCore.main("apps.tests.AllTest");
+       org.junit.runner.JUnitCore.runClasses(AllTest.class);
    }
 
 }
diff --git a/java/test/jmri/HeadLessTest.java b/java/test/jmri/HeadLessTest.java
@@ -34,7 +34,6 @@ static public void main(String[] args) {
         System.setProperty("java.awt.headless", "true");
 
         // start tests
-        String[] testCaseName = {"-noloading", HeadLessTest.class.getName()};
-        junit.textui.TestRunner.main(testCaseName);
+        org.junit.runner.JUnitCore.runClasses(HeadLessTest.class);
     }
 }
diff --git a/java/test/jmri/util/junit/TestClassMainMethod.java b/java/test/jmri/util/junit/TestClassMainMethod.java
@@ -2,6 +2,8 @@
 
 import java.lang.reflect.*;
 
+import org.junit.runner.JUnitCore;
+
 /**
  * Main method to launch a JUnit test class
  *
@@ -25,16 +27,21 @@ static public void main(String[] args) {
         className = className.replace("..",".");    
 
         try {
-            // first try to find a main in the class
             Class<?> cl = Class.forName(className);
-            Method method = cl.getMethod("main", String[].class);
-            method.invoke(null, new Object[] {new String[] { /* put args here */ }});
-        } catch (InvocationTargetException e) {
-            // main threw an exception, report
-            System.err.println(e);
-        } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException e) {
-            // failed, now invoke manually
-            org.junit.runner.JUnitCore.main(className);
+            // first try to find a main in the class
+            try {
+                Method method = cl.getMethod("main", String[].class);
+                method.invoke(null, new Object[] {new String[] { /* put args here */ }});
+            } catch (InvocationTargetException e) {
+                // main threw an exception, report
+                System.err.println(e);
+            } catch (NoSuchMethodException | IllegalAccessException e) {
+                // failed, now invoke manually
+                JUnitCore.runClasses(cl);
+            }
+        } catch (ClassNotFoundException e) {
+            // log error
+            System.err.println("Unable to locate class " + className);
         }
     }
 }