diff --git a/documentation/modules/ROOT/pages/release-notes.adoc b/documentation/modules/ROOT/pages/release-notes.adoc index 13222d4d9d61..9c9eed7372b9 100644 --- a/documentation/modules/ROOT/pages/release-notes.adoc +++ b/documentation/modules/ROOT/pages/release-notes.adoc @@ -9,6 +9,8 @@ Please refer to the xref:overview.adoc[User Guide] for comprehensive reference documentation for programmers writing tests, extension authors, and engine authors as well as build tool and IDE vendors. +include::partial$release-notes/release-notes-5.14.4.adoc[] + include::partial$release-notes/release-notes-5.14.3.adoc[] include::partial$release-notes/release-notes-5.14.2.adoc[] diff --git a/documentation/modules/ROOT/partials/release-notes/release-notes-5.14.4.adoc b/documentation/modules/ROOT/partials/release-notes/release-notes-5.14.4.adoc new file mode 100644 index 000000000000..b3b4591316b8 --- /dev/null +++ b/documentation/modules/ROOT/partials/release-notes/release-notes-5.14.4.adoc @@ -0,0 +1,32 @@ +[[v5.14.4]] +== 5.14.4 + +*Date of Release:* ❓ + +*Scope:* Bug fix for legacy XML reporting of `@ClassTemplate`/`@ParameterizedClass` tests + +For a complete list of all _closed_ issues and pull requests for this release, consult the +link:{junit-framework-repo}+/milestone/MILESTONE_NUMBER?closed=1+[5.14.4] milestone page in the JUnit +repository on GitHub. + + +[[v5.14.4-junit-platform]] +=== JUnit Platform + +No changes. + + +[[v5.14.4-junit-jupiter]] +=== JUnit Jupiter + +[[v5.14.4-junit-jupiter-bug-fixes]] +==== Bug Fixes + +* Include index of `@ClassTemplate`/`@ParameterizedClass` invocations in test names in + legacy XML reports to make them unique. + + +[[v5.14.4-junit-vintage]] +=== JUnit Vintage + +No changes. diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java index ce3f8d303218..bb99ab9004cb 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassBasedTestDescriptor.java @@ -126,7 +126,7 @@ public final Type getType() { } @Override - public final String getLegacyReportingName() { + protected final String getLegacyReportingBaseName() { return getTestClass().getName(); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTemplateInvocationTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTemplateInvocationTestDescriptor.java index 700e6c42e033..c3358f5cb35c 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTemplateInvocationTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/ClassTemplateInvocationTestDescriptor.java @@ -18,6 +18,7 @@ import static org.junit.jupiter.engine.support.JupiterThrowableCollectorFactory.createThrowableCollector; import java.util.List; +import java.util.OptionalInt; import java.util.Set; import java.util.function.Function; import java.util.function.UnaryOperator; @@ -80,8 +81,13 @@ public Type getType() { } @Override - public String getLegacyReportingName() { - return getTestClass().getName() + "[" + index + "]"; + protected String getLegacyReportingBaseName() { + return getTestClass().getName(); + } + + @Override + protected OptionalInt getLegacyReportingIndex() { + return OptionalInt.of(index); } // --- TestClassAware ------------------------------------------------------ diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java index da41df7cbc94..efc12b212956 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/DynamicNodeTestDescriptor.java @@ -10,6 +10,8 @@ package org.junit.jupiter.engine.descriptor; +import java.util.OptionalInt; + import org.junit.jupiter.api.DynamicNode; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.engine.config.JupiterConfiguration; @@ -34,15 +36,24 @@ abstract class DynamicNodeTestDescriptor extends JupiterTestDescriptor { } @Override - public String getLegacyReportingName() { + protected final String getLegacyReportingBaseName() { // @formatter:off return getParent() - .map(TestDescriptor::getLegacyReportingName) - .orElseGet(this::getDisplayName) - + "[" + index + "]"; + .map(parent -> { + if (parent instanceof JupiterTestDescriptor) { + return ((JupiterTestDescriptor) parent).getLegacyReportingBaseName(); + } + return parent.getLegacyReportingName(); + }) + .orElseGet(this::getDisplayName); // @formatter:on } + @Override + protected OptionalInt getLegacyReportingIndex() { + return OptionalInt.of(index); + } + @Override public JupiterEngineExecutionContext prepare(JupiterEngineExecutionContext context) { ExtensionContext extensionContext = new DynamicExtensionContext(context.getExtensionContext(), diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java index 4defd7f3bb80..3a5d3685ff7c 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/JupiterTestDescriptor.java @@ -12,6 +12,7 @@ import static java.util.Collections.emptySet; import static java.util.stream.Collectors.collectingAndThen; +import static java.util.stream.Collectors.joining; import static java.util.stream.Collectors.toCollection; import static java.util.stream.Collectors.toSet; import static org.apiguardian.api.API.Status.INTERNAL; @@ -24,11 +25,13 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Optional; +import java.util.OptionalInt; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import java.util.function.Supplier; import java.util.function.UnaryOperator; +import java.util.stream.IntStream; import org.apiguardian.api.API; import org.junit.jupiter.api.Tag; @@ -77,6 +80,35 @@ public abstract class JupiterTestDescriptor extends AbstractTestDescriptor // --- TestDescriptor ------------------------------------------------------ + @Override + public final String getLegacyReportingName() { + return getLegacyReportingBaseName() + + getLegacyReportingIndexes().mapToObj(i -> "[" + i + "]").collect(joining()); + } + + protected String getLegacyReportingBaseName() { + return getDisplayName(); + } + + private IntStream getLegacyReportingIndexes() { + OptionalInt ownIndex = getLegacyReportingIndex(); + return getParent() // + .map(it -> it instanceof JupiterTestDescriptor // + ? ((JupiterTestDescriptor) it).getLegacyReportingIndexes() // + : null) // + .map(parentIndexes -> IntStream.concat(parentIndexes, asStream(ownIndex))) // + .orElse(asStream(ownIndex)); + } + + private IntStream asStream(final OptionalInt optInt) { + return optInt.isPresent() ? IntStream.of(optInt.getAsInt()) : IntStream.empty(); + + } + + protected OptionalInt getLegacyReportingIndex() { + return OptionalInt.empty(); + } + static Set getTags(AnnotatedElement element, Supplier elementDescription, Supplier sourceProvider, Consumer issueCollector) { AtomicReference source = new AtomicReference<>(); diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java index 645ae8bbbd5f..f1aedfaa8acf 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/MethodBasedTestDescriptor.java @@ -87,7 +87,7 @@ public final Set getTags() { } @Override - public String getLegacyReportingName() { + protected final String getLegacyReportingBaseName() { return String.format("%s(%s)", getTestMethod().getName(), ClassUtils.nullSafeToString(Class::getSimpleName, getTestMethod().getParameterTypes())); } diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java index 7c72579f1504..7dc6496abc3a 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/descriptor/TestTemplateInvocationTestDescriptor.java @@ -14,6 +14,7 @@ import static org.apiguardian.api.API.Status.INTERNAL; import java.lang.reflect.Method; +import java.util.OptionalInt; import java.util.Set; import java.util.function.UnaryOperator; @@ -70,8 +71,8 @@ public Set getExclusiveResources() { } @Override - public String getLegacyReportingName() { - return super.getLegacyReportingName() + "[" + index + "]"; + protected OptionalInt getLegacyReportingIndex() { + return OptionalInt.of(index); } @Override diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedClassIntegrationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedClassIntegrationTests.java index 8630292d8fb8..e46c92a43859 100644 --- a/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedClassIntegrationTests.java +++ b/jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedClassIntegrationTests.java @@ -37,6 +37,7 @@ import static org.junit.platform.testkit.engine.EventConditions.event; import static org.junit.platform.testkit.engine.EventConditions.finishedSuccessfully; import static org.junit.platform.testkit.engine.EventConditions.finishedWithFailure; +import static org.junit.platform.testkit.engine.EventConditions.legacyReportingName; import static org.junit.platform.testkit.engine.EventConditions.started; import static org.junit.platform.testkit.engine.EventConditions.test; import static org.junit.platform.testkit.engine.EventConditions.uniqueId; @@ -106,6 +107,7 @@ import org.junit.platform.engine.reporting.ReportEntry; import org.junit.platform.testkit.engine.EngineExecutionResults; import org.junit.platform.testkit.engine.Event; +import org.junit.platform.testkit.engine.EventType; import org.junit.platform.testkit.engine.Events; @SuppressWarnings("JUnitMalformedDeclaration") @@ -132,9 +134,9 @@ void injectsParametersIntoClass(Class classTemplateClass) { event(container("#1"), started()), // event(dynamicTestRegistered("test1")), // event(dynamicTestRegistered("test2")), // - event(test("test1"), started()), // + event(test("test1"), legacyReportingName("test1()[1]"), started()), // event(test("test1"), finishedSuccessfully()), // - event(test("test2"), started()), // + event(test("test2"), legacyReportingName("test2()[1]"), started()), // event(test("test2"), finishedSuccessfully()), // event(container("#1"), finishedSuccessfully()), // @@ -142,9 +144,9 @@ void injectsParametersIntoClass(Class classTemplateClass) { event(container("#2"), started()), // event(dynamicTestRegistered("test1")), // event(dynamicTestRegistered("test2")), // - event(test("test1"), started()), // + event(test("test1"), legacyReportingName("test1()[2]"), started()), // event(test("test1"), finishedWithFailure(message(it -> it.contains("negative")))), // - event(test("test2"), started()), // + event(test("test2"), legacyReportingName("test2()[2]"), started()), // event(test("test2"), finishedWithFailure(message(it -> it.contains("negative")))), // event(container("#2"), finishedSuccessfully()), // @@ -461,6 +463,18 @@ void supportsNestedParameterizedClass(Class classTemplateClass) { "afterAll: %s".formatted(classTemplateClass.getSimpleName()) // @formatter:on ); + var legacyReportingNames = results.testEvents() // + .filter(it -> it.getType() == EventType.STARTED) // + .map(e -> e.getTestDescriptor().getLegacyReportingName()); + assertThat(legacyReportingNames).containsExactly( // + "test(boolean, TestReporter)[1][1][1]", // + "test(boolean, TestReporter)[1][1][2]", // + "test(boolean, TestReporter)[1][2][1]", // + "test(boolean, TestReporter)[1][2][2]", // + "test(boolean, TestReporter)[2][1][1]", // + "test(boolean, TestReporter)[2][1][2]", // + "test(boolean, TestReporter)[2][2][1]", // + "test(boolean, TestReporter)[2][2][2]"); } @ParameterizedTest diff --git a/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/AntStarterTests_snapshots/open-test-report.xml.snapshot b/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/AntStarterTests_snapshots/open-test-report.xml.snapshot index b6193859beec..61a6aad380ae 100644 --- a/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/AntStarterTests_snapshots/open-test-report.xml.snapshot +++ b/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/AntStarterTests_snapshots/open-test-report.xml.snapshot @@ -54,7 +54,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)] - parameterizedTest(int) + parameterizedTest(int)[1] CONTAINER @@ -65,7 +65,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)]/[test-template-invocation:#1] - parameterizedTest(int)[1] + parameterizedTest(int)[1][1] TEST @@ -80,7 +80,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)]/[test-template-invocation:#2] - parameterizedTest(int)[2] + parameterizedTest(int)[1][2] TEST @@ -99,7 +99,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner] - com.example.project.CalculatorParameterizedClassTests$Inner + com.example.project.CalculatorParameterizedClassTests$Inner[1] CONTAINER @@ -110,7 +110,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#1] - com.example.project.CalculatorParameterizedClassTests$Inner[1] + com.example.project.CalculatorParameterizedClassTests$Inner[1][1] CONTAINER @@ -121,7 +121,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] - regularTest() + regularTest()[1][1] TEST @@ -140,7 +140,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#2] - com.example.project.CalculatorParameterizedClassTests$Inner[2] + com.example.project.CalculatorParameterizedClassTests$Inner[1][2] CONTAINER @@ -151,7 +151,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] - regularTest() + regularTest()[1][2] TEST @@ -189,7 +189,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)] - parameterizedTest(int) + parameterizedTest(int)[2] CONTAINER @@ -200,7 +200,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)]/[test-template-invocation:#1] - parameterizedTest(int)[1] + parameterizedTest(int)[2][1] TEST @@ -215,7 +215,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)]/[test-template-invocation:#2] - parameterizedTest(int)[2] + parameterizedTest(int)[2][2] TEST @@ -234,7 +234,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner] - com.example.project.CalculatorParameterizedClassTests$Inner + com.example.project.CalculatorParameterizedClassTests$Inner[2] CONTAINER @@ -245,7 +245,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#1] - com.example.project.CalculatorParameterizedClassTests$Inner[1] + com.example.project.CalculatorParameterizedClassTests$Inner[2][1] CONTAINER @@ -256,7 +256,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] - regularTest() + regularTest()[2][1] TEST @@ -275,7 +275,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#2] - com.example.project.CalculatorParameterizedClassTests$Inner[2] + com.example.project.CalculatorParameterizedClassTests$Inner[2][2] CONTAINER @@ -286,7 +286,7 @@ test-method: ant_starter [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] - regularTest() + regularTest()[2][2] TEST diff --git a/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/GradleStarterTests_snapshots/open-test-report.xml.snapshot b/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/GradleStarterTests_snapshots/open-test-report.xml.snapshot index 09377aa77dd2..9cb6c12ab48c 100644 --- a/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/GradleStarterTests_snapshots/open-test-report.xml.snapshot +++ b/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/GradleStarterTests_snapshots/open-test-report.xml.snapshot @@ -54,7 +54,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)] - parameterizedTest(int) + parameterizedTest(int)[1] CONTAINER @@ -65,7 +65,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)]/[test-template-invocation:#1] - parameterizedTest(int)[1] + parameterizedTest(int)[1][1] TEST @@ -80,7 +80,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)]/[test-template-invocation:#2] - parameterizedTest(int)[2] + parameterizedTest(int)[1][2] TEST @@ -99,7 +99,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner] - com.example.project.CalculatorParameterizedClassTests$Inner + com.example.project.CalculatorParameterizedClassTests$Inner[1] CONTAINER @@ -110,7 +110,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#1] - com.example.project.CalculatorParameterizedClassTests$Inner[1] + com.example.project.CalculatorParameterizedClassTests$Inner[1][1] CONTAINER @@ -121,7 +121,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] - regularTest() + regularTest()[1][1] TEST @@ -140,7 +140,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#2] - com.example.project.CalculatorParameterizedClassTests$Inner[2] + com.example.project.CalculatorParameterizedClassTests$Inner[1][2] CONTAINER @@ -151,7 +151,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] - regularTest() + regularTest()[1][2] TEST @@ -189,7 +189,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)] - parameterizedTest(int) + parameterizedTest(int)[2] CONTAINER @@ -200,7 +200,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)]/[test-template-invocation:#1] - parameterizedTest(int)[1] + parameterizedTest(int)[2][1] TEST @@ -215,7 +215,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)]/[test-template-invocation:#2] - parameterizedTest(int)[2] + parameterizedTest(int)[2][2] TEST @@ -234,7 +234,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner] - com.example.project.CalculatorParameterizedClassTests$Inner + com.example.project.CalculatorParameterizedClassTests$Inner[2] CONTAINER @@ -245,7 +245,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#1] - com.example.project.CalculatorParameterizedClassTests$Inner[1] + com.example.project.CalculatorParameterizedClassTests$Inner[2][1] CONTAINER @@ -256,7 +256,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] - regularTest() + regularTest()[2][1] TEST @@ -275,7 +275,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#2] - com.example.project.CalculatorParameterizedClassTests$Inner[2] + com.example.project.CalculatorParameterizedClassTests$Inner[2][2] CONTAINER @@ -286,7 +286,7 @@ test-method: buildJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] - regularTest() + regularTest()[2][2] TEST diff --git a/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/MavenStarterTests_snapshots/open-test-report.xml.snapshot b/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/MavenStarterTests_snapshots/open-test-report.xml.snapshot index ee2d20a63f1c..6a3e81d147f3 100644 --- a/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/MavenStarterTests_snapshots/open-test-report.xml.snapshot +++ b/platform-tooling-support-tests/src/test/resources/platform/tooling/support/tests/MavenStarterTests_snapshots/open-test-report.xml.snapshot @@ -54,7 +54,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)] - parameterizedTest(int) + parameterizedTest(int)[1] CONTAINER @@ -65,7 +65,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)]/[test-template-invocation:#1] - parameterizedTest(int)[1] + parameterizedTest(int)[1][1] TEST @@ -80,7 +80,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)]/[test-template-invocation:#2] - parameterizedTest(int)[2] + parameterizedTest(int)[1][2] TEST @@ -99,7 +99,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner] - com.example.project.CalculatorParameterizedClassTests$Inner + com.example.project.CalculatorParameterizedClassTests$Inner[1] CONTAINER @@ -110,7 +110,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#1] - com.example.project.CalculatorParameterizedClassTests$Inner[1] + com.example.project.CalculatorParameterizedClassTests$Inner[1][1] CONTAINER @@ -121,7 +121,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] - regularTest() + regularTest()[1][1] TEST @@ -140,7 +140,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#2] - com.example.project.CalculatorParameterizedClassTests$Inner[2] + com.example.project.CalculatorParameterizedClassTests$Inner[1][2] CONTAINER @@ -151,7 +151,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] - regularTest() + regularTest()[1][2] TEST @@ -189,7 +189,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)] - parameterizedTest(int) + parameterizedTest(int)[2] CONTAINER @@ -200,7 +200,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)]/[test-template-invocation:#1] - parameterizedTest(int)[1] + parameterizedTest(int)[2][1] TEST @@ -215,7 +215,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)]/[test-template-invocation:#2] - parameterizedTest(int)[2] + parameterizedTest(int)[2][2] TEST @@ -234,7 +234,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner] - com.example.project.CalculatorParameterizedClassTests$Inner + com.example.project.CalculatorParameterizedClassTests$Inner[2] CONTAINER @@ -245,7 +245,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#1] - com.example.project.CalculatorParameterizedClassTests$Inner[1] + com.example.project.CalculatorParameterizedClassTests$Inner[2][1] CONTAINER @@ -256,7 +256,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] - regularTest() + regularTest()[2][1] TEST @@ -275,7 +275,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#2] - com.example.project.CalculatorParameterizedClassTests$Inner[2] + com.example.project.CalculatorParameterizedClassTests$Inner[2][2] CONTAINER @@ -286,7 +286,7 @@ test-method: verifyJupiterStarterProject [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] - regularTest() + regularTest()[2][2] TEST