spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-27 09:39:04 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade to JUnit 6.0 RC3

Browse Source 
See gh-35124
This commit is contained in:
Sam Brannen
2025-09-23 16:19:54 +02:00
parent 7edb0b3397
commit d84bf18408
13 changed files with 39 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/test/java/org/springframework/test/context/aot/AotIntegrationTests.java
+5 -5
View File
@@ -56,7 +56,7 @@ import org.springframework.test.context.aot.samples.basic.DisabledInAotRuntimeMe
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.platform.engine.discovery.ClassNameFilter.includeClassNamePatterns;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasses;
import static org.junit.platform.launcher.TagFilter.excludeTags;
/**
@@ -205,11 +205,11 @@ class AotIntegrationTests extends AbstractAotTests {
try {
System.setProperty(AotDetector.AOT_ENABLED, "true");
LauncherDiscoveryRequestBuilder builder = LauncherDiscoveryRequestBuilder.request()
LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
.selectors(selectClasses(testClasses))
.filters(includeClassNamePatterns(".*Tests?$"))
.filters(excludeTags("failing-test-case"));
testClasses.forEach(testClass -> builder.selectors(selectClass(testClass)));
LauncherDiscoveryRequest request = builder.build();
.filters(excludeTags("failing-test-case"))
.build();
SummaryGeneratingListener listener = new SummaryGeneratingListener();
LauncherFactory.create().execute(request, listener);
TestExecutionSummary summary = listener.getSummary();
spring-test/src/test/java/org/springframework/test/context/cache/ContextFailureThresholdTests.java
Vendored
+9 -9
View File
@@ -31,7 +31,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import org.springframework.test.context.support.DependencyInjectionTestExecutionListener;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasses;
import static org.springframework.test.context.CacheAwareContextLoaderDelegate.CONTEXT_FAILURE_THRESHOLD_PROPERTY_NAME;
import static org.springframework.test.context.CacheAwareContextLoaderDelegate.DEFAULT_CONTEXT_FAILURE_THRESHOLD;
import static org.springframework.test.context.cache.ContextCacheTestUtils.assertContextCacheStatistics;
@@ -85,14 +85,14 @@ class ContextFailureThresholdTests {
}
private static void runTests() {
EngineTestKit.engine("junit-jupiter")//
.selectors(//
selectClass(PassingTestCase.class), // 3 passing
selectClass(FailingConfigTestCase.class), // 3 failing
selectClass(SharedFailingConfigTestCase.class) // 3 failing
)//
.execute()//
.testEvents()//
EngineTestKit.engine("junit-jupiter")
.selectors(selectClasses(
PassingTestCase.class, // 3 passing
FailingConfigTestCase.class, // 3 failing
SharedFailingConfigTestCase.class // 3 failing
))
.execute()
.testEvents()
.assertStatistics(stats -> stats.started(9).succeeded(3).failed(6));
assertContextCacheStatistics(1, 2, (1 + 3 + 3));
}
spring-test/src/test/java/org/springframework/test/context/cache/UnusedContextsIntegrationTests.java
Vendored
+1 -8
View File
@@ -16,8 +16,6 @@
package org.springframework.test.context.cache;
import java.util.Arrays;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.ClassOrderer;
@@ -25,8 +23,6 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestClassOrder;
import org.junit.platform.engine.discovery.ClassSelector;
import org.junit.platform.engine.discovery.DiscoverySelectors;
import org.junit.platform.testkit.engine.EngineTestKit;
import org.springframework.beans.factory.annotation.Value;
@@ -38,6 +34,7 @@ import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasses;
import static org.springframework.test.context.NestedTestConfiguration.EnclosingConfiguration.INHERIT;
import static org.springframework.test.context.NestedTestConfiguration.EnclosingConfiguration.OVERRIDE;
@@ -209,10 +206,6 @@ class UnusedContextsIntegrationTests {
.assertStatistics(stats -> stats.started(expectedTestCount).succeeded(expectedTestCount));
}
private static ClassSelector[] selectClasses(Class<?>... classes) {
return Arrays.stream(classes).map(DiscoverySelectors::selectClass).toArray(ClassSelector[]::new);
}
@SpringJUnitConfig(EventTracker.class)
@ContextCustomizerFactories(DisplayNameCustomizerFactory.class)
spring-test/src/test/java/org/springframework/test/context/event/EagerTestExecutionEventPublishingTests.java
+3 -3
View File
@@ -40,7 +40,7 @@ import org.springframework.test.context.event.annotation.PrepareTestInstance;
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasses;
/**
* Tests for the {@link EventPublishingTestExecutionListener} which verify that
@@ -65,7 +65,7 @@ class EagerTestExecutionEventPublishingTests {
@Test
void beforeTestClassEventIsNotPublishedByDefaultForFirstTestClass() {
EngineTestKit.engine("junit-jupiter")//
.selectors(selectClass(LazyTestCase1.class), selectClass(LazyTestCase2.class))//
.selectors(selectClasses(LazyTestCase1.class, LazyTestCase2.class))//
.execute()//
.testEvents()//
.assertStatistics(stats -> stats.started(2).succeeded(2).failed(0));
@@ -93,7 +93,7 @@ class EagerTestExecutionEventPublishingTests {
@Test
void beforeTestClassEventIsPublishedForAllTestClassesIfCustomListenerEagerlyLoadsContext() {
EngineTestKit.engine("junit-jupiter")//
.selectors(selectClass(EagerTestCase1.class), selectClass(EagerTestCase2.class))//
.selectors(selectClasses(EagerTestCase1.class, EagerTestCase2.class))//
.execute()//
.testEvents()//
.assertStatistics(stats -> stats.started(2).succeeded(2).failed(0));
spring-test/src/test/java/org/springframework/test/context/jdbc/GeneratedDatabaseNamesTests.java
+2 -7
View File
@@ -29,7 +29,7 @@ import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass;
import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClasses;
/**
* Test suite to investigate claims raised in
@@ -66,12 +66,7 @@ class GeneratedDatabaseNamesTests {
@Test
void runTestsWithGeneratedDatabaseNames() {
EngineTestKit.engine("junit-jupiter")
.selectors(
selectClass(TestClass1A.class),
selectClass(TestClass1B.class),
selectClass(TestClass2A.class),
selectClass(TestClass2B.class)
)
.selectors(selectClasses(TestClass1A.class, TestClass1B.class, TestClass2A.class, TestClass2B.class))
.execute()
.testEvents()
.assertStatistics(stats -> stats.started(4).succeeded(4).failed(0));
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfConditionTests.java
+1 -1
View File
@@ -112,7 +112,7 @@ class DisabledIfConditionTests {
Class<?> testClass = SpringTestCase.class;
Method method = ReflectionUtils.findMethod(getClass(), methodName);
Store store = mock();
given(store.getOrComputeIfAbsent(any(), any(), any())).willReturn(new TestContextManager(testClass));
given(store.computeIfAbsent(any(), any(), any())).willReturn(new TestContextManager(testClass));
ExtensionContext extensionContext = mock();
given(extensionContext.getTestClass()).willReturn(Optional.of(testClass));