7903752: Include duration information in JUnit-based tests

Reviewed-by: mcimadamore
ikvmnet · Jun 14, 2024 · 8af904b · 8af904b
1 parent 2e57b47
commit 8af904b
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/share/classes/com/sun/javatest/regtest/agent/JUnitRunner.java b/src/share/classes/com/sun/javatest/regtest/agent/JUnitRunner.java
@@ -27,6 +27,7 @@
 
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
+import org.junit.platform.engine.UniqueId;
 import org.junit.platform.engine.discovery.DiscoverySelectors;
 import org.junit.platform.engine.reporting.ReportEntry;
 import org.junit.platform.engine.support.descriptor.MethodSource;
@@ -44,7 +45,10 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.reflect.Method;
+import java.time.Duration;
+import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
@@ -190,6 +194,7 @@ static class PrintingListener implements TestExecutionListener {
         final PrintWriter printer;
         final Lock lock;
         final AgentVerbose verbose;
+        final Map<UniqueId, Long> startNanosByUniqueId = new ConcurrentHashMap<>();
 
         PrintingListener(PrintStream stream, AgentVerbose verbose) {
             this(new PrintWriter(stream, true), verbose);
@@ -220,6 +225,7 @@ public void executionSkipped(TestIdentifier identifier, String reason) {
 
         @Override
         public void executionStarted(TestIdentifier identifier) {
+            startNanosByUniqueId.put(identifier.getUniqueIdObject(), System.nanoTime());
             if (verbose.passMode == AgentVerbose.Mode.NONE) return;
             if (identifier.isTest()) {
                 String status = "STARTED";
@@ -241,6 +247,10 @@ public void executionFinished(TestIdentifier identifier, TestExecutionResult res
             if (status == TestExecutionResult.Status.SUCCESSFUL) {
                 if (verbose.passMode == AgentVerbose.Mode.NONE) return;
             }
+            Long startNanos = startNanosByUniqueId.remove(identifier.getUniqueIdObject());
+            Duration duration = startNanos == null
+                    ? Duration.ZERO
+                    : Duration.ofNanos(System.nanoTime() - startNanos);
             lock.lock();
             try {
                 if (status == TestExecutionResult.Status.ABORTED) {
@@ -252,7 +262,8 @@ public void executionFinished(TestIdentifier identifier, TestExecutionResult res
                 if (identifier.isTest()) {
                     String source = toSourceString(identifier);
                     String name = identifier.getDisplayName();
-                    printer.printf("%-10s %s '%s'%n", status, source, name);
+                    long millis = duration.toMillis();
+                    printer.printf("%-10s %s '%s' [%dms]%n", status, source, name, millis);
                 }
             }
             finally {