From 4b2861fa144ef87ac6dc4a871428bc0366e66f27 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 4 Jul 2025 14:58:18 +0100 Subject: [PATCH] Disable tests broken by removal of ObjectPostProcessor This can be reverted once a compatible Authorization Server snapshot is available. See gh-45492 --- .../OAuth2AuthorizationServerAutoConfigurationTests.java | 3 +++ ...OAuth2AuthorizationServerWebSecurityConfigurationTests.java | 3 +++ .../SampleOAuth2AuthorizationServerApplicationTests.java | 2 ++ 3 files changed, 8 insertions(+) diff --git a/spring-boot-project/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerAutoConfigurationTests.java b/spring-boot-project/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerAutoConfigurationTests.java index 4dfbe7749e9..70c32f461ab 100644 --- a/spring-boot-project/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerAutoConfigurationTests.java @@ -16,6 +16,7 @@ package org.springframework.boot.security.oauth2.server.authorization.autoconfigure.servlet; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.autoconfigure.AutoConfigurations; @@ -73,6 +74,7 @@ class OAuth2AuthorizationServerAutoConfigurationTests { } @Test + @Disabled("https://github.com/spring-projects/spring-security/commit/edb7a642c7747592c58d9013e178ab9595a392ed") void registeredClientRepositoryBeanShouldBeCreatedWhenPropertiesPresent() { this.contextRunner .withPropertyValues(CLIENT_PREFIX + ".foo.registration.client-id=abcd", @@ -96,6 +98,7 @@ class OAuth2AuthorizationServerAutoConfigurationTests { } @Test + @Disabled("https://github.com/spring-projects/spring-security/commit/edb7a642c7747592c58d9013e178ab9595a392ed") void registeredClientRepositoryBacksOffWhenRegisteredClientRepositoryBeanPresent() { this.contextRunner.withUserConfiguration(TestRegisteredClientRepositoryConfiguration.class) .withPropertyValues(CLIENT_PREFIX + ".foo.registration.client-id=abcd", diff --git a/spring-boot-project/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java b/spring-boot-project/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java index e18a97cbc60..36b82d55f51 100644 --- a/spring-boot-project/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java +++ b/spring-boot-project/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.security.oauth2.server.authorization.autoconfig import java.util.List; import jakarta.servlet.Filter; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.assertj.AssertableWebApplicationContext; @@ -69,6 +70,7 @@ class OAuth2AuthorizationServerWebSecurityConfigurationTests { private final WebApplicationContextRunner contextRunner = new WebApplicationContextRunner(); @Test + @Disabled("https://github.com/spring-projects/spring-security/commit/edb7a642c7747592c58d9013e178ab9595a392ed") void webSecurityConfigurationConfiguresAuthorizationServerWithFormLogin() { this.contextRunner.withUserConfiguration(TestOAuth2AuthorizationServerConfiguration.class) .withPropertyValues(CLIENT_PREFIX + ".foo.registration.client-id=abcd", @@ -97,6 +99,7 @@ class OAuth2AuthorizationServerWebSecurityConfigurationTests { } @Test + @Disabled("https://github.com/spring-projects/spring-security/commit/edb7a642c7747592c58d9013e178ab9595a392ed") void securityFilterChainsBackOffWhenSecurityFilterChainBeanPresent() { this.contextRunner .withUserConfiguration(TestSecurityFilterChainConfiguration.class, diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-authorization-server/src/test/java/smoketest/oauth2/server/SampleOAuth2AuthorizationServerApplicationTests.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-authorization-server/src/test/java/smoketest/oauth2/server/SampleOAuth2AuthorizationServerApplicationTests.java index efe6f2caf6d..b3b53acc73a 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-authorization-server/src/test/java/smoketest/oauth2/server/SampleOAuth2AuthorizationServerApplicationTests.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-oauth2-authorization-server/src/test/java/smoketest/oauth2/server/SampleOAuth2AuthorizationServerApplicationTests.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -46,6 +47,7 @@ import org.springframework.util.MultiValueMap; import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@Disabled("https://github.com/spring-projects/spring-security/commit/edb7a642c7747592c58d9013e178ab9595a392ed") class SampleOAuth2AuthorizationServerApplicationTests { private static final ParameterizedTypeReference> MAP_TYPE_REFERENCE = new ParameterizedTypeReference<>() {