diff --git a/buildSrc/src/main/java/org/springframework/build/TestConventions.java b/buildSrc/src/main/java/org/springframework/build/TestConventions.java index b9994988fa3..6e977938c78 100644 --- a/buildSrc/src/main/java/org/springframework/build/TestConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/TestConventions.java @@ -62,7 +62,8 @@ class TestConventions { test.include("**/*Tests.class", "**/*Test.class"); test.setSystemProperties(Map.of( "java.awt.headless", "true", - "io.netty.leakDetection.level", "paranoid" + "io.netty.leakDetection.level", "paranoid", + "junit.platform.discovery.issue.severity.critical", "INFO" )); if (project.hasProperty("testGroups")) { test.systemProperty("testGroups", project.getProperties().get("testGroups")); diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/AutowiredConfigurationErrorsIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/AutowiredConfigurationErrorsIntegrationTests.java index da86801a215..7eccabe27de 100644 --- a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/AutowiredConfigurationErrorsIntegrationTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/AutowiredConfigurationErrorsIntegrationTests.java @@ -65,11 +65,9 @@ class AutowiredConfigurationErrorsIntegrationTests { @ParameterizedTest @ValueSource(classes = { StaticAutowiredBeforeAllMethod.class, - StaticAutowiredPrivateBeforeAllMethod.class, StaticAutowiredAfterAllMethod.class, AutowiredBeforeEachMethod.class, AutowiredAfterEachMethod.class, - AutowiredPrivateAfterEachMethod.class, AutowiredTestMethod.class, AutowiredRepeatedTestMethod.class, AutowiredParameterizedTestMethod.class @@ -168,21 +166,6 @@ class AutowiredConfigurationErrorsIntegrationTests { } } - @SpringJUnitConfig(Config.class) - @FailingTestCase - static class StaticAutowiredPrivateBeforeAllMethod { - - @Autowired - @BeforeAll - private static void beforeAll(TestInfo testInfo) { - } - - @Test - @DisplayName(DISPLAY_NAME) - void test() { - } - } - @SpringJUnitConfig(Config.class) @TestInstance(PER_CLASS) @FailingTestCase @@ -260,22 +243,6 @@ class AutowiredConfigurationErrorsIntegrationTests { } } - @SpringJUnitConfig(Config.class) - @FailingTestCase - static class AutowiredPrivateAfterEachMethod { - - @Test - @DisplayName(DISPLAY_NAME) - void test() { - } - - @Autowired - @AfterEach - private void afterEach(TestInfo testInfo) { - } - } - - @SpringJUnitConfig(Config.class) @FailingTestCase static class AutowiredTestMethod {