Fix for test template retries. Also added test for parametrised tests

apache · Oct 3, 2024 · 8aaf0a6 · 8aaf0a6
1 parent 01faf7f
commit 8aaf0a6
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 23 deletions.
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/JUnitPlatformEnginesIT.java
@@ -298,31 +298,41 @@ public void testJupiterEngineWithFailureInTestTemplateProvider() {
 
     @Test
     public void testJupiterEngineWithTestTemplateNotClassifiedAsFlake() {
-        // Similar example, but using parameterized test (which is a test template under the hood)
-        //String testToRun = "ParamsContextTest";
-        String testToRun = "FieldSettingTest";
         unpack("junit5-testtemplate-bug", "-" + jupiter)
-            .setTestToRun(testToRun)
-            .sysProp("junit5.version", jupiter)
-            //.debugSurefireFork()
-            .maven()
-            .withFailure()
-            .executeTest()
-            .verifyTextInLog("AssertionFailedError")
-            .assertTestSuiteResults(2, 0, 1, 0, 0);
+                .setTestToRun("FieldSettingTest")
+                .sysProp("junit5.version", jupiter)
+                .maven()
+                .withFailure()
+                .executeTest()
+                .verifyTextInLog("AssertionFailedError")
+                .assertTestSuiteResults(2, 0, 1, 0, 0);
+
+        unpack("junit5-testtemplate-bug", "-" + jupiter)
+                .debugLogging()
+                .setTestToRun("FieldSettingTest")
+                .sysProp("junit5.version", jupiter)
+                // The tests are failing deterministically, so rerunning them should not change the result
+                .sysProp("surefire.rerunFailingTestsCount", "1")
+                .maven()
+                .withFailure()
+                .executeTest()
+                .verifyTextInLog("AssertionFailedError")
+                .assertTestSuiteResults(2, 0, 1, 0, 0);
+    }
 
+    @Test
+    public void testJupiterEngineWithParameterizedTestsNotClassifiedAsFlake() {
         unpack("junit5-testtemplate-bug", "-" + jupiter)
-            .debugLogging()
-            .setTestToRun(testToRun)
-            .sysProp("junit5.version", jupiter)
-            // The tests are failing deterministically, so rerunning them should not change the result
-            .sysProp("surefire.rerunFailingTestsCount", "1")
-            //.debugSurefireFork()
-            .maven()
-            .withFailure()
-            .executeTest()
-            .verifyTextInLog("AssertionFailedError")
-            .assertTestSuiteResults(2, 0, 1, 0, 0);
+                .debugLogging()
+                .setTestToRun("ParamsContextTest")
+                .sysProp("junit5.version", jupiter)
+                // The tests are failing deterministically, so rerunning them should not change the result
+                .sysProp("surefire.rerunFailingTestsCount", "1")
+                .maven()
+                .withFailure()
+                .executeTest()
+                .verifyTextInLog("AssertionFailedError")
+                .assertTestSuiteResults(2, 0, 1, 0, 0);
     }
 
     @Test

diff --git a/...it-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java b/...it-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java
@@ -317,12 +317,14 @@ private String[] toClassMethodName(TestIdentifier testIdentifier) {
             boolean needsSpaceSeparator = isNotBlank(parentDisplay) && !display.startsWith("[");
             String methodDisplay = parentDisplay + (needsSpaceSeparator ? " " : "") + display;
 
+            boolean isParameterized = isNotBlank(methodSource.getMethodParameterTypes());
             boolean hasParameterizedParent = collectAllTestIdentifiersInHierarchy(testIdentifier)
                     .filter(identifier -> !identifier.getSource().isPresent())
                     .map(TestIdentifier::getLegacyReportingName)
                     .anyMatch(legacyReportingName -> legacyReportingName.matches("^\\[.+]$"));
+            boolean isTestTemplate = testIdentifier.getLegacyReportingName().matches("^.*\\[\\d+]$");
 
-            boolean parameterized = isNotBlank(methodSource.getMethodParameterTypes()) || hasParameterizedParent;
+            boolean parameterized = isParameterized || hasParameterizedParent || isTestTemplate;
             String methodName = methodSource.getMethodName();
             String description = testIdentifier.getLegacyReportingName();
             boolean equalDescriptions = methodDisplay.equals(description);