diff --git a/README.md b/README.md index 0c4465796871..2fc4dd7334d1 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This repository is the home of _JUnit 5_. ## Latest Releases - General Availability (GA): [JUnit 5.12.1](https://github.com/junit-team/junit5/releases/tag/r5.12.1) (March 14, 2025) -- Preview (Milestone/Release Candidate): [JUnit 5.13.0-M1](https://github.com/junit-team/junit5/releases/tag/r5.13.0-M1) (March 21, 2025) +- Preview (Milestone/Release Candidate): [JUnit 5.13.0-M2](https://github.com/junit-team/junit5/releases/tag/r5.13.0-M2) (March 24, 2025) ## Documentation diff --git a/documentation/src/docs/asciidoc/release-notes/index.adoc b/documentation/src/docs/asciidoc/release-notes/index.adoc index db9492e11d39..bd88f8abbf76 100644 --- a/documentation/src/docs/asciidoc/release-notes/index.adoc +++ b/documentation/src/docs/asciidoc/release-notes/index.adoc @@ -17,6 +17,8 @@ authors as well as build tool and IDE vendors. include::{includedir}/link-attributes.adoc[] +include::{basedir}/release-notes-5.13.0-M2.adoc[] + include::{basedir}/release-notes-5.13.0-M1.adoc[] include::{basedir}/release-notes-5.12.1.adoc[] diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.13.0-M2.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.13.0-M2.adoc new file mode 100644 index 000000000000..725a3bba0c1a --- /dev/null +++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.13.0-M2.adoc @@ -0,0 +1,33 @@ +[[release-notes-5.13.0-M2]] +== 5.13.0-M2 + +*Date of Release:* March 24, 2025 + +*Scope:* Fix regression in 5.13.0-M1 + +For a complete list of all _closed_ issues and pull requests for this release, consult the +link:{junit5-repo}+/milestone/92?closed=1+[5.13.0-M2] milestone page in the JUnit +repository on GitHub. + + +[[release-notes-5.13.0-M2-junit-platform]] +=== JUnit Platform + +No changes. + + +[[release-notes-5.13.0-M2-junit-jupiter]] +=== JUnit Jupiter + +[[release-notes-5.13.0-M2-junit-jupiter-bug-fixes]] +==== Bug Fixes + +* Fix regression when executing `@Nested` classes compiled without `-parameters` in + versions of Java prior to 21. + + +[[release-notes-5.13.0-M2-junit-vintage]] +=== JUnit Vintage + + +No changes. diff --git a/gradle.properties b/gradle.properties index bcf2ff415df6..250d65d1ba46 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,13 @@ group = org.junit -version = 5.13.0-M1 +version = 5.13.0-M2 jupiterGroup = org.junit.jupiter platformGroup = org.junit.platform -platformVersion = 1.13.0-M1 +platformVersion = 1.13.0-M2 vintageGroup = org.junit.vintage -vintageVersion = 5.13.0-M1 +vintageVersion = 5.13.0-M2 # We need more metaspace due to apparent memory leak in Asciidoctor/JRuby org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError diff --git a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java index b2b846949637..65a4ddc0d38d 100644 --- a/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java +++ b/junit-jupiter-engine/src/main/java/org/junit/jupiter/engine/execution/ParameterResolutionUtils.java @@ -99,7 +99,6 @@ public static Object[] resolveParameters(Executable executable, Optional // Ensure that the outer instance is resolved as the first parameter if // the executable is a constructor for an inner class. if (outerInstance.isPresent()) { - Preconditions.condition(parameters[0].isImplicit(), "First parameter must be implicit"); values[0] = outerInstance.get(); start = 1; } @@ -115,9 +114,6 @@ public static Object[] resolveParameters(Executable executable, Optional private static Object resolveParameter(ParameterContext parameterContext, Executable executable, ExtensionContextSupplier extensionContext, ExtensionRegistry extensionRegistry) { - Preconditions.condition(!parameterContext.getParameter().isImplicit(), - () -> String.format("Parameter at index %d must not be implicit", parameterContext.getIndex())); - try { // @formatter:off List matchingResolvers = extensionRegistry.stream(ParameterResolver.class) diff --git a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ResolverFacade.java b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ResolverFacade.java index a2660bafdf6a..28eda4b8186a 100644 --- a/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ResolverFacade.java +++ b/junit-jupiter-params/src/main/java/org/junit/jupiter/params/ResolverFacade.java @@ -18,6 +18,7 @@ import static org.junit.platform.commons.support.AnnotationSupport.findAnnotation; import static org.junit.platform.commons.support.AnnotationSupport.isAnnotated; import static org.junit.platform.commons.support.ReflectionSupport.makeAccessible; +import static org.junit.platform.commons.util.ReflectionUtils.isInnerClass; import java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; @@ -100,9 +101,8 @@ static ResolverFacade create(Class clazz, List fields) { } static ResolverFacade create(Constructor constructor, ParameterizedClass annotation) { - java.lang.reflect.Parameter[] parameters = constructor.getParameters(); - // Inner classes get the outer instance as first parameter - int implicitParameters = parameters.length > 0 && parameters[0].isImplicit() ? 1 : 0; + // Inner classes get the outer instance as first (implicit) parameter + int implicitParameters = isInnerClass(constructor.getDeclaringClass()) ? 1 : 0; return create(constructor, annotation, implicitParameters); } diff --git a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts index 1b68a34e8616..25cd44f39522 100644 --- a/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts +++ b/platform-tooling-support-tests/platform-tooling-support-tests.gradle.kts @@ -223,6 +223,7 @@ val test by testing.suites.getting(JvmTestSuite::class) { } } jvmArgumentProviders += JavaHomeDir(project, 8, develocity.testDistribution.enabled) + jvmArgumentProviders += JavaHomeDir(project, 17, develocity.testDistribution.enabled) val gradleJavaVersion = JavaVersion.current().majorVersion.toInt() jvmArgumentProviders += JavaHomeDir(project, gradleJavaVersion, develocity.testDistribution.enabled) diff --git a/platform-tooling-support-tests/projects/jupiter-starter/build.gradle.kts b/platform-tooling-support-tests/projects/jupiter-starter/build.gradle.kts index 751889da23d0..74e76f07d3c1 100644 --- a/platform-tooling-support-tests/projects/jupiter-starter/build.gradle.kts +++ b/platform-tooling-support-tests/projects/jupiter-starter/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { java { toolchain { - languageVersion = JavaLanguageVersion.of(8) + languageVersion = JavaLanguageVersion.of(System.getProperty("java.toolchain.version")) } } @@ -26,6 +26,7 @@ tasks.test { testLogging { events("passed", "skipped", "failed", "standardOut") + exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL } reports { diff --git a/platform-tooling-support-tests/projects/jupiter-starter/gradle.properties b/platform-tooling-support-tests/projects/jupiter-starter/gradle.properties index 79b428ebc70c..35b90dc7fdf0 100644 --- a/platform-tooling-support-tests/projects/jupiter-starter/gradle.properties +++ b/platform-tooling-support-tests/projects/jupiter-starter/gradle.properties @@ -1 +1 @@ -org.gradle.java.installations.fromEnv=JDK8 +org.gradle.java.installations.fromEnv=JDK8,JDK17 diff --git a/platform-tooling-support-tests/projects/jupiter-starter/src/test/java/com/example/project/CalculatorParameterizedClassTests.java b/platform-tooling-support-tests/projects/jupiter-starter/src/test/java/com/example/project/CalculatorParameterizedClassTests.java index b726db1d9c24..1a99e7fef900 100644 --- a/platform-tooling-support-tests/projects/jupiter-starter/src/test/java/com/example/project/CalculatorParameterizedClassTests.java +++ b/platform-tooling-support-tests/projects/jupiter-starter/src/test/java/com/example/project/CalculatorParameterizedClassTests.java @@ -12,6 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.Parameter; import org.junit.jupiter.params.ParameterizedClass; @@ -25,16 +26,28 @@ class CalculatorParameterizedClassTests { @Parameter int i; - @Test - void regularTest() { - Calculator calculator = new Calculator(); - assertEquals(2 * i, calculator.add(i, i), () -> i + " + " + i + " should equal 2 * " + i); - } - @ParameterizedTest @ValueSource(ints = { 1, 2 }) void parameterizedTest(int j) { Calculator calculator = new Calculator(); assertEquals(i + j, calculator.add(i, j)); } + + @Nested + @ParameterizedClass + @ValueSource(ints = { 1, 2 }) + class Inner { + + final int j; + + Inner(int j) { + this.j = j; + } + + @Test + void regularTest() { + Calculator calculator = new Calculator(); + assertEquals(i + j, calculator.add(i, j)); + } + } } diff --git a/platform-tooling-support-tests/projects/jupiter-starter/src/test/resources/junit-platform.properties b/platform-tooling-support-tests/projects/jupiter-starter/src/test/resources/junit-platform.properties index daf7418ffd20..9f72f2c9cc50 100644 --- a/platform-tooling-support-tests/projects/jupiter-starter/src/test/resources/junit-platform.properties +++ b/platform-tooling-support-tests/projects/jupiter-starter/src/test/resources/junit-platform.properties @@ -1,2 +1,4 @@ junit.jupiter.testclass.order.default = \ org.junit.jupiter.api.ClassOrderer$ClassName + +junit.platform.stacktrace.pruning.enabled = false diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java index 95bcfa28a4ae..b7968fd135dd 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java +++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/AntStarterTests.java @@ -52,7 +52,7 @@ void ant_starter(@TempDir Path workspace, @FilePrefix("ant") OutputFiles outputF assertLinesMatch(List.of(">> HEAD >>", // "test.junit.launcher:", // ">>>>", // - "\\[junitlauncher\\] Tests run: 6, Failures: 0, Aborted: 0, Skipped: 0, Time elapsed: .+ sec", // + "\\[junitlauncher\\] Tests run: 8, Failures: 0, Aborted: 0, Skipped: 0, Time elapsed: .+ sec", // "\\[junitlauncher\\] Running com.example.project.CalculatorTests", // "\\[junitlauncher\\] Tests run: 5, Failures: 0, Aborted: 0, Skipped: 0, Time elapsed: .+ sec", // ">>>>", // @@ -60,7 +60,7 @@ void ant_starter(@TempDir Path workspace, @FilePrefix("ant") OutputFiles outputF ">>>>", // " \\[java\\] Test run finished after [\\d]+ ms", // ">>>>", // - " \\[java\\] \\[ 11 tests successful \\]", // + " \\[java\\] \\[ 13 tests successful \\]", // " \\[java\\] \\[ 0 tests failed \\]", // ">> TAIL >>"), // result.stdOutLines()); diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java index e60e667a358f..830ef794f125 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java +++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/GradleStarterTests.java @@ -24,6 +24,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.junit.platform.tests.process.OutputFiles; import org.junit.platform.tests.process.ProcessResult; import org.opentest4j.TestAbortedException; @@ -47,18 +49,22 @@ void prepareWorkspace() throws Exception { copyToWorkspace(Projects.JUPITER_STARTER, workspace); } - @Test - void buildJupiterStarterProject(@FilePrefix("gradle") OutputFiles outputFiles, Snapshot snapshot) throws Exception { + @ParameterizedTest(name = "Java {0}") + @ValueSource(ints = { 8, 17 }) + void buildJupiterStarterProject(int javaVersion, @FilePrefix("gradle") OutputFiles outputFiles, Snapshot snapshot) + throws Exception { - var result = runGradle(outputFiles, "build"); + var result = runGradle(outputFiles, javaVersion, "build"); assertThat(result.stdOut()) // .contains( // - "CalculatorParameterizedClassTests > [1] i=1 > regularTest() PASSED", // - "CalculatorParameterizedClassTests > [2] i=2 > regularTest() PASSED", // "CalculatorParameterizedClassTests > [1] i=1 > parameterizedTest(int)", // + "CalculatorParameterizedClassTests > [1] i=1 > Inner > [1] 1 > regularTest() PASSED", // + "CalculatorParameterizedClassTests > [1] i=1 > Inner > [2] 2 > regularTest() PASSED", // "CalculatorParameterizedClassTests > [2] i=2 > parameterizedTest(int)", // - "Using Java version: 1.8", // + "CalculatorParameterizedClassTests > [2] i=2 > Inner > [1] 1 > regularTest() PASSED", // + "CalculatorParameterizedClassTests > [2] i=2 > Inner > [2] 2 > regularTest() PASSED", // + "Using Java version: " + (javaVersion == 8 ? "1.8" : javaVersion), // "CalculatorTests > 1 + 1 = 2 PASSED", // "CalculatorTests > add(int, int, int) > 0 + 1 = 1 PASSED", // "CalculatorTests > add(int, int, int) > 1 + 2 = 3 PASSED", // @@ -73,16 +79,18 @@ void buildJupiterStarterProject(@FilePrefix("gradle") OutputFiles outputFiles, S @Test void runOnlyOneMethodInClassTemplate(@FilePrefix("gradle") OutputFiles outputFiles) throws Exception { - var result = runGradle(outputFiles, "test", "--tests", "CalculatorParameterized*.regular*"); + var result = runGradle(outputFiles, 8, "test", "--tests", "CalculatorParameterized*.regular*"); assertThat(result.stdOut()) // .contains( // - "CalculatorParameterizedClassTests > [1] i=1 > regularTest() PASSED", // - "CalculatorParameterizedClassTests > [2] i=2 > regularTest() PASSED" // + "CalculatorParameterizedClassTests > [1] i=1 > Inner > [1] 1 > regularTest() PASSED", // + "CalculatorParameterizedClassTests > [1] i=1 > Inner > [2] 2 > regularTest() PASSED", // + "CalculatorParameterizedClassTests > [2] i=2 > Inner > [1] 1 > regularTest() PASSED", // + "CalculatorParameterizedClassTests > [2] i=2 > Inner > [2] 2 > regularTest() PASSED" // ) // .doesNotContain("parameterizedTest(int)", "CalculatorTests"); - result = runGradle(outputFiles, "test", "--tests", "*ParameterizedClassTests.parameterized*"); + result = runGradle(outputFiles, 8, "test", "--tests", "*ParameterizedClassTests.parameterized*"); assertThat(result.stdOut()) // .contains( // @@ -92,13 +100,16 @@ void runOnlyOneMethodInClassTemplate(@FilePrefix("gradle") OutputFiles outputFil .doesNotContain("regularTest()", "CalculatorTests"); } - private ProcessResult runGradle(OutputFiles outputFiles, String... extraArgs) throws InterruptedException { + private ProcessResult runGradle(OutputFiles outputFiles, int javaVersion, String... extraArgs) + throws InterruptedException { var result = ProcessStarters.gradlew() // .workingDir(workspace) // .addArguments("-Dmaven.repo=" + MavenRepo.dir()) // + .addArguments("-Djava.toolchain.version=" + javaVersion) // .addArguments("--stacktrace", "--no-build-cache", "--warning-mode=fail") // - .addArguments(extraArgs).putEnvironment("JDK8", - Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) // + .addArguments(extraArgs) // + .putEnvironment("JDK8", Helper.getJavaHome("8").orElseThrow(TestAbortedException::new).toString()) // + .putEnvironment("JDK17", Helper.getJavaHome("17").orElseThrow(TestAbortedException::new).toString()) // .redirectOutput(outputFiles) // .startAndWait(); diff --git a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java index 0cf4eee24483..072d5c16730e 100644 --- a/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java +++ b/platform-tooling-support-tests/src/test/java/platform/tooling/support/tests/MavenStarterTests.java @@ -57,7 +57,7 @@ void verifyJupiterStarterProject(@FilePrefix("maven") OutputFiles outputFiles, S var result = runMaven(outputFiles, "verify"); - assertThat(result.stdOutLines()).contains("[INFO] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0"); + assertThat(result.stdOutLines()).contains("[INFO] Tests run: 13, Failures: 0, Errors: 0, Skipped: 0"); assertThat(result.stdOut()).contains("Using Java version: 1.8"); var testResultsDir = workspace.resolve("target/surefire-reports"); @@ -67,11 +67,11 @@ void verifyJupiterStarterProject(@FilePrefix("maven") OutputFiles outputFiles, S @Test void runOnlyOneMethodInClassTemplate(@FilePrefix("maven") OutputFiles outputFiles) throws Exception { - var result = runMaven(outputFiles, "test", "-Dtest=CalculatorParameterizedClassTests#regularTest"); + var result = runMaven(outputFiles, "test", "-Dtest=CalculatorParameterizedClassTests$Inner#regularTest"); assertThat(result.stdOutLines()) // .doesNotContain("CalculatorTests") // - .contains("[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0"); + .contains("[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0"); result = runMaven(outputFiles, "test", "-Dtest=CalculatorParameterizedClassTests#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 1c453c46976d..240a71ef3fd3 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 @@ -21,7 +21,7 @@ test-method: ant_starter - + [engine:junit-jupiter] JUnit Jupiter @@ -29,7 +29,7 @@ test-method: ant_starter - + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests] com.example.project.CalculatorParameterizedClassTests @@ -40,7 +40,7 @@ test-method: ant_starter - + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1] com.example.project.CalculatorParameterizedClassTests[1] @@ -51,22 +51,7 @@ test-method: ant_starter - - - [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[method:regularTest()] - regularTest() - TEST - - - - - - - - - - - + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)] parameterizedTest(int) @@ -77,7 +62,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] @@ -88,11 +73,11 @@ 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] @@ -103,45 +88,105 @@ 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 + CONTAINER + + + + + + + + + [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] + CONTAINER + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] + regularTest() + TEST + + + + + + + + + + + - + - [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2] - com.example.project.CalculatorParameterizedClassTests[2] + [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] CONTAINER - + - + - [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[method:regularTest()] + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] regularTest() TEST - + - + + + + + - + + + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2] + com.example.project.CalculatorParameterizedClassTests[2] + CONTAINER + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)] parameterizedTest(int) @@ -152,7 +197,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] @@ -163,11 +208,11 @@ 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] @@ -178,23 +223,98 @@ 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 + CONTAINER + + + + + + + + + [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] + CONTAINER + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] + regularTest() + TEST + + + + + + + + + + + + + + + + + [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] + CONTAINER + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] + regularTest() + TEST + + + + + + + + + + + - + - + - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests] com.example.project.CalculatorTests @@ -205,7 +325,7 @@ test-method: ant_starter - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[method:addsTwoNumbers()] addsTwoNumbers() @@ -216,11 +336,11 @@ test-method: ant_starter - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)] add(int, int, int) @@ -231,7 +351,7 @@ test-method: ant_starter - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#1] add(int, int, int)[1] @@ -242,11 +362,11 @@ test-method: ant_starter - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#2] add(int, int, int)[2] @@ -257,11 +377,11 @@ test-method: ant_starter - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#3] add(int, int, int)[3] @@ -272,11 +392,11 @@ test-method: ant_starter - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#4] add(int, int, int)[4] @@ -287,19 +407,19 @@ test-method: ant_starter - + - + - + - + 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 563fce54c260..ce4ce4f15535 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 @@ -16,12 +16,12 @@ test-method: buildJupiterStarterProject obfuscated Linux 16 - 1.8.0_442 + 17.0.14 UTF-8 - + - + [engine:junit-jupiter] JUnit Jupiter @@ -29,7 +29,7 @@ test-method: buildJupiterStarterProject - + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests] com.example.project.CalculatorParameterizedClassTests @@ -40,7 +40,7 @@ test-method: buildJupiterStarterProject - + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1] com.example.project.CalculatorParameterizedClassTests[1] @@ -51,22 +51,7 @@ test-method: buildJupiterStarterProject - - - [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[method:regularTest()] - regularTest() - TEST - - - - - - - - - - - + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)] parameterizedTest(int) @@ -77,7 +62,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] @@ -88,11 +73,11 @@ 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] @@ -103,45 +88,105 @@ 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 + CONTAINER + + + + + + + + + [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] + CONTAINER + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] + regularTest() + TEST + + + + + + + + + + + - + - [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2] - com.example.project.CalculatorParameterizedClassTests[2] + [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] CONTAINER - + - + - [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[method:regularTest()] + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] regularTest() TEST - + - + + + + + - + + + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2] + com.example.project.CalculatorParameterizedClassTests[2] + CONTAINER + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)] parameterizedTest(int) @@ -152,7 +197,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] @@ -163,11 +208,11 @@ 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] @@ -178,23 +223,98 @@ 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 + CONTAINER + + + + + + + + + [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] + CONTAINER + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] + regularTest() + TEST + + + + + + + + + + + + + + + + + [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] + CONTAINER + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] + regularTest() + TEST + + + + + + + + + + + - + - + - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests] com.example.project.CalculatorTests @@ -205,7 +325,7 @@ test-method: buildJupiterStarterProject - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[method:addsTwoNumbers()] addsTwoNumbers() @@ -216,11 +336,11 @@ test-method: buildJupiterStarterProject - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)] add(int, int, int) @@ -231,7 +351,7 @@ test-method: buildJupiterStarterProject - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#1] add(int, int, int)[1] @@ -242,11 +362,11 @@ test-method: buildJupiterStarterProject - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#2] add(int, int, int)[2] @@ -257,11 +377,11 @@ test-method: buildJupiterStarterProject - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#3] add(int, int, int)[3] @@ -272,11 +392,11 @@ test-method: buildJupiterStarterProject - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#4] add(int, int, int)[4] @@ -287,19 +407,19 @@ test-method: buildJupiterStarterProject - + - + - + - + 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 c6641484760a..52ad3af973c1 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 @@ -21,7 +21,7 @@ test-method: verifyJupiterStarterProject - + [engine:junit-jupiter] JUnit Jupiter @@ -29,7 +29,7 @@ test-method: verifyJupiterStarterProject - + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests] com.example.project.CalculatorParameterizedClassTests @@ -40,7 +40,7 @@ test-method: verifyJupiterStarterProject - + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1] com.example.project.CalculatorParameterizedClassTests[1] @@ -51,22 +51,7 @@ test-method: verifyJupiterStarterProject - - - [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[method:regularTest()] - regularTest() - TEST - - - - - - - - - - - + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[test-template:parameterizedTest(int)] parameterizedTest(int) @@ -77,7 +62,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] @@ -88,11 +73,11 @@ 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] @@ -103,45 +88,105 @@ 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 + CONTAINER + + + + + + + + + [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] + CONTAINER + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] + regularTest() + TEST + + + + + + + + + + + - + - [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2] - com.example.project.CalculatorParameterizedClassTests[2] + [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] CONTAINER - + - + - [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[method:regularTest()] + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#1]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] regularTest() TEST - + - + + + + + - + + + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2] + com.example.project.CalculatorParameterizedClassTests[2] + CONTAINER + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[test-template:parameterizedTest(int)] parameterizedTest(int) @@ -152,7 +197,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] @@ -163,11 +208,11 @@ 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] @@ -178,23 +223,98 @@ 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 + CONTAINER + + + + + + + + + [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] + CONTAINER + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#1]/[method:regularTest()] + regularTest() + TEST + + + + + + + + + + + + + + + + + [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] + CONTAINER + + + + + + + + + [engine:junit-jupiter]/[class-template:com.example.project.CalculatorParameterizedClassTests]/[class-template-invocation:#2]/[nested-class-template:Inner]/[class-template-invocation:#2]/[method:regularTest()] + regularTest() + TEST + + + + + + + + + + + - + - + - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests] com.example.project.CalculatorTests @@ -205,7 +325,7 @@ test-method: verifyJupiterStarterProject - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[method:addsTwoNumbers()] addsTwoNumbers() @@ -216,11 +336,11 @@ test-method: verifyJupiterStarterProject - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)] add(int, int, int) @@ -231,7 +351,7 @@ test-method: verifyJupiterStarterProject - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#1] add(int, int, int)[1] @@ -242,11 +362,11 @@ test-method: verifyJupiterStarterProject - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#2] add(int, int, int)[2] @@ -257,11 +377,11 @@ test-method: verifyJupiterStarterProject - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#3] add(int, int, int)[3] @@ -272,11 +392,11 @@ test-method: verifyJupiterStarterProject - + - + [engine:junit-jupiter]/[class:com.example.project.CalculatorTests]/[test-template:add(int, int, int)]/[test-template-invocation:#4] add(int, int, int)[4] @@ -287,19 +407,19 @@ test-method: verifyJupiterStarterProject - + - + - + - +