Skip to content

Commit 98cdae6

Browse files
committed
Merge branch '6.2.x'
2 parents cdee5c5 + 44500cf commit 98cdae6

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

buildSrc/src/main/java/org/springframework/build/TestConventions.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
import org.gradle.api.Project;
2222
import org.gradle.api.plugins.JavaBasePlugin;
2323
import org.gradle.api.tasks.testing.Test;
24+
import org.gradle.api.tasks.testing.TestFrameworkOptions;
25+
import org.gradle.api.tasks.testing.junitplatform.JUnitPlatformOptions;
2426
import org.gradle.testretry.TestRetryPlugin;
2527
import org.gradle.testretry.TestRetryTaskExtension;
2628

@@ -34,6 +36,7 @@
3436
*
3537
* @author Brian Clozel
3638
* @author Andy Wilkinson
39+
* @author Sam Brannen
3740
*/
3841
class TestConventions {
3942

@@ -50,7 +53,12 @@ private void configureTestConventions(Project project) {
5053
}
5154

5255
private void configureTests(Project project, Test test) {
53-
test.useJUnitPlatform();
56+
TestFrameworkOptions existingOptions = test.getOptions();
57+
test.useJUnitPlatform(options -> {
58+
if (existingOptions instanceof JUnitPlatformOptions junitPlatformOptions) {
59+
options.copyFrom(junitPlatformOptions);
60+
}
61+
});
5462
test.include("**/*Tests.class", "**/*Test.class");
5563
test.setSystemProperties(Map.of(
5664
"java.awt.headless", "true",

spring-test/spring-test.gradle

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,10 @@ test {
104104
description = "Runs JUnit 4, JUnit Jupiter, and TestNG tests."
105105
useJUnitPlatform {
106106
includeEngines "junit-vintage", "junit-jupiter", "testng"
107-
excludeTags "failing-test-case"
108107
}
109-
// We use `include` instead of `filter.includeTestsMatching`, since
110-
// the latter results in some tests being executed/reported
111-
// multiple times.
112-
include(["**/*Tests.class", "**/*Test.class"])
108+
// `include` test filters and system properties are configured in
109+
// org.springframework.build.TestConventions in buildSrc.
113110
filter.excludeTestsMatching("*TestCase")
114-
systemProperty("testGroups", project.properties.get("testGroups"))
115-
// Java Util Logging for the JUnit Platform.
111+
// Optionally configure Java Util Logging for the JUnit Platform.
116112
// systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")
117113
}

0 commit comments

Comments
 (0)