minor formatting and debug output fixes

Author: sandybrownlee

src/main/java/gin/test/ExternalTestRunner.java

@@ -183,11 +183,6 @@ private List<UnitTestResult> runTests(int reps) throws IOException, InterruptedE
             if (launcher.isPresent()) {
                 childCp = childCp + File.pathSeparator + launcher.get().toAbsolutePath();
             }
-//            Logger.warn("ETR: embedded launcher bucket=" + bucket +
-//                    " present=" + launcher.isPresent() +
-//                    " resource=" + ExternalTestRunner.class.getResource("/embedded-libs/" + bucket + "/launcher.jar"));
-//            Logger.warn("ETR: child cp contains extracted launcher? " + childCp.contains("gin-junit-launcher-"));
-//            Logger.debug("ETR: child cp = " + childCp);
         }
         String rawClasspath = this.getTemporaryDirectory() + File.pathSeparator +
                 childCp + File.pathSeparator +
@@ -243,8 +238,6 @@ private List<UnitTestResult> runTests(int reps) throws IOException, InterruptedE
                 cmd.add(moduleClasspath);
                 cmd.add(HARNESS_CLASS);
 
-//                Logger.debug("ETR: launching harness: " + String.join(" ", cmd));
-
                 ProcessBuilder builder = new ProcessBuilder(cmd);
                 builder.directory(moduleDir);
 
@@ -510,7 +503,7 @@ private static boolean isJUnit4OrVintageLibPath(String path) {
         String name = new java.io.File(path).getName().toLowerCase(java.util.Locale.ROOT);
         // Exclude JUnit 4 and the Vintage engine
         if (name.startsWith("junit-vintage-")) return true;          // Vintage engine
-        //if (name.matches("^junit-\\d+.*\\.jar$")) return true;       // junit-4.x.jar - actually, keep this. needed for legacy builds!
+        //if (name.matches("^junit-\\d+.*\\.jar$")) return true;       // junit-4.x.jar - later decided to comment this out. the library is needed for legacy builds!
 
         // Also exclude obvious Vintage directories on classpath
         String p = path.replace('\\', '/');

src/main/java/gin/test/JUnitBridge.java

@@ -159,7 +159,6 @@ private LauncherDiscoveryRequest buildRequest(UnitTest test)
         if (m == null) throw new NoSuchMethodException(className + "#" + method);
 
         return org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request()
-//                .filters(org.junit.platform.launcher.EngineFilter.includeEngines("junit-jupiter","junit-vintage"))
                 .configurationParameter("junit.jupiter.execution.timeout.test.method.default",
                         test.getTimeoutMS() + " ms")
                 .selectors(

src/main/java/gin/test/TestHarness.java

@@ -203,10 +203,6 @@ private UnitTestResult runTest(UnitTest test, int rep) {
                 if (!hasTests) {
                     var classOnlyBuilder = LauncherDiscoveryRequestBuilder.request()
                             .selectors(selectClass(clazz));
-//                            .filters(EngineFilter.includeEngines(
-//                                    jupiterish ? new String[]{"junit-jupiter"}
-//                                            : new String[]{"junit-jupiter", "junit-vintage"}))
-//                            .build();
                     if (jupiterish) {
                         if (hasJupiter) classOnlyBuilder.filters(EngineFilter.includeEngines("junit-jupiter"));
                     } else {
@@ -363,25 +359,9 @@ private LauncherDiscoveryRequest buildRequest(UnitTest test, boolean jupiterish)
         String method = normalizeMethodName(test.getMethodName());
 
         var builder = LauncherDiscoveryRequestBuilder.request()
-//                .filters(EngineFilter.includeEngines(
-//                        jupiterish ? new String[]{"junit-jupiter"}
-//                                : new String[]{"junit-jupiter", "junit-vintage"}))
                 // Jupiter timeout only; harmless for Vintage
                 .configurationParameter("junit.jupiter.execution.timeout.test.method.default",
                         test.getTimeoutMS() + " ms");
-//
-//
-//        // Optionally narrow to Jupiter only when we know it's there:
-////        if (jupiterish && hasEngine("junit-jupiter")) {
-////            builder.filters(EngineFilter.includeEngines("junit-jupiter"));
-////        }
-//        if (jupiterish) {
-//            builder.filters(EngineFilter.includeEngines("junit-jupiter"));
-//        } else {
-//            // Allow both: many legacy tests are JUnit 4 but some projects mix in Jupiter
-//            builder.filters(EngineFilter.includeEngines("junit-jupiter", "junit-vintage"));
-//        }
-//
 
         // Change C: only filter to engines that actually exist on this classpath
         boolean hasJupiter = hasEngine("junit-jupiter");

src/main/java/gin/test/TestRunListener.java

@@ -4,8 +4,6 @@
 import org.junit.platform.engine.support.descriptor.MethodSource;
 import org.junit.platform.launcher.TestExecutionListener;
 import org.junit.platform.launcher.TestIdentifier;
-//import org.junit.runner.Description;
-//import org.junit.runner.notification.Failure;
 import org.pmw.tinylog.Logger;
 
 import java.io.Serial;
@@ -14,7 +12,6 @@
 import java.lang.management.ThreadMXBean;
 import java.util.concurrent.TimeoutException;
 import org.opentest4j.TestAbortedException;
-//import org.junit.AssumptionViolatedException;
 
 
 /**

src/main/java/gin/util/Trace.java

@@ -213,8 +213,6 @@ private static Map<String, Integer> parseJFRMethodCounts(File jfrF, Project proj
 
                         if (s != null) {
 
-//                            Logger.info("Attempting parsing. List of main classes [" + mainClasses +"]");
-
                             //traverse the call stack, if a frame is part of the main program,
                             //return it
                             Logger.info("Parsing trace...");
@@ -226,8 +224,6 @@ private static Map<String, Integer> parseJFRMethodCounts(File jfrF, Project proj
                                 String methodName = method.getType().getName();
                                 String className = StringUtils.substringBeforeLast(methodName, ".");
 
-//                                Logger.info("c:" + className + ",m:" + methodName);
-
                                 if (mainClasses.contains(methodName) || mainClasses.contains(className)) {
                                     methodName += "." + method.getName() + ":" + topFrame.getLineNumber();
                                     samples.merge(methodName, 1, Integer::sum);
@@ -247,7 +243,6 @@ private static Map<String, Integer> parseJFRMethodCounts(File jfrF, Project proj
                     Logger.warn("IOEx. reading JFR. " +
                             "Probably this is because of something causing multiple writes to the JFR log files." +
                             "If you get lots of these it will likely impact on the reliability of the profiling results.");
-                    //Logger.warn(e);
                     return samples;
                 }
             }