Ref #33664: log number of tests

Author: LEDfan

src/test/java/eu/openanalytics/containerproxy/test/helpers/TestExecutionListener.java

@@ -24,24 +24,37 @@
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.support.descriptor.MethodSource;
 import org.junit.platform.launcher.TestIdentifier;
+import org.junit.platform.launcher.TestPlan;
 import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
 
 import java.util.Arrays;
 import java.util.Objects;
 
 public class TestExecutionListener extends SummaryGeneratingListener {
 
+    private Long numTests = 0L;
+    private Long currentTest = 0L;
+
     public TestExecutionListener() {
 
     }
 
+    @Override
+    public void testPlanExecutionStarted(TestPlan testPlan) {
+        super.testPlanExecutionStarted(testPlan);
+
+        numTests = testPlan.countTestIdentifiers(it -> it.isTest() || (it.isContainer() && it.getUniqueIdObject().getLastSegment().getType().equals("test-template")));
+    }
+
     @Override
     public void executionSkipped(TestIdentifier testIdentifier, String reason) {
         super.executionSkipped(testIdentifier, reason);
         if (testIdentifier == null || reason == null || !testIdentifier.isTest()) return;
 
+        updateCount(testIdentifier);
+
         System.out.println();
-        System.out.printf("\t\t--> Skipping test \"%s\"%n", identifier(testIdentifier));
+        System.out.printf("\t\t--> Skipping test [%s/%s,] \"%s\"%n", currentTest, numTests, identifier(testIdentifier));
         System.out.println();
     }
 
@@ -50,8 +63,10 @@ public void executionStarted(TestIdentifier testIdentifier) {
         super.executionStarted(testIdentifier);
         if (testIdentifier == null || !testIdentifier.isTest()) return;
 
+        updateCount(testIdentifier);
+
         System.out.println();
-        System.out.printf("\t\t--> Started test \"%s\"%n", identifier(testIdentifier));
+        System.out.printf("\t\t--> Started test [%s/%s] \"%s\"%n", currentTest, numTests, identifier(testIdentifier));
         System.out.println();
     }
 
@@ -61,7 +76,7 @@ public void executionFinished(TestIdentifier testIdentifier, TestExecutionResult
         if (testIdentifier == null || testExecutionResult == null || !testIdentifier.isTest()) return;
 
         System.out.println();
-        System.out.printf("\t\t--> Finished test \"%s\": %s%n", identifier(testIdentifier), testExecutionResult);
+        System.out.printf("\t\t--> Finished test [%s/%s] \"%s\": %s%n", currentTest, numTests, identifier(testIdentifier), testExecutionResult);
         System.out.println();
     }
 
@@ -77,4 +92,17 @@ private String identifier(TestIdentifier testIdentifier) {
         }
         return String.format("%s %s", className, methodSource.getMethodName());
     }
+
+    private void updateCount(TestIdentifier testIdentifier) {
+        if (testIdentifier.getUniqueIdObject().getLastSegment().getType().equals("test-template-invocation")) {
+            int c = Integer.parseInt(testIdentifier.getUniqueIdObject().getLastSegment().getValue().replace("#", ""));
+            if (c > 1) {
+                // update total count if it's a template (instances of templates are not included in the initial total)
+                numTests++;
+            }
+        }
+
+        currentTest++;
+    }
+
 }