From 4db83bd83e1b027e032282480a43ddf76dbb2b69 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 18 Jul 2025 09:45:44 +0100 Subject: [PATCH] Revert "Disable tests broken by removal of ObjectPostProcessor" This reverts commit 4b2861fa144ef87ac6dc4a871428bc0366e66f27. --- .../OAuth2AuthorizationServerAutoConfigurationTests.java | 3 --- ...OAuth2AuthorizationServerWebSecurityConfigurationTests.java | 3 --- .../SampleOAuth2AuthorizationServerApplicationTests.java | 2 -- 3 files changed, 8 deletions(-) diff --git a/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerAutoConfigurationTests.java b/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerAutoConfigurationTests.java index 70c32f461ab..4dfbe7749e9 100644 --- a/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerAutoConfigurationTests.java +++ b/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerAutoConfigurationTests.java @@ -16,7 +16,6 @@ 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; @@ -74,7 +73,6 @@ 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", @@ -98,7 +96,6 @@ 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/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java b/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java index 36b82d55f51..e18a97cbc60 100644 --- a/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java +++ b/module/spring-boot-security-oauth2-authorization-server/src/test/java/org/springframework/boot/security/oauth2/server/authorization/autoconfigure/servlet/OAuth2AuthorizationServerWebSecurityConfigurationTests.java @@ -19,7 +19,6 @@ 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; @@ -70,7 +69,6 @@ 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", @@ -99,7 +97,6 @@ class OAuth2AuthorizationServerWebSecurityConfigurationTests { } @Test - @Disabled("https://github.com/spring-projects/spring-security/commit/edb7a642c7747592c58d9013e178ab9595a392ed") void securityFilterChainsBackOffWhenSecurityFilterChainBeanPresent() { this.contextRunner .withUserConfiguration(TestSecurityFilterChainConfiguration.class, diff --git a/smoke-test/spring-boot-smoke-test-oauth2-authorization-server/src/test/java/smoketest/oauth2/server/SampleOAuth2AuthorizationServerApplicationTests.java b/smoke-test/spring-boot-smoke-test-oauth2-authorization-server/src/test/java/smoketest/oauth2/server/SampleOAuth2AuthorizationServerApplicationTests.java index b3b53acc73a..efe6f2caf6d 100644 --- a/smoke-test/spring-boot-smoke-test-oauth2-authorization-server/src/test/java/smoketest/oauth2/server/SampleOAuth2AuthorizationServerApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-oauth2-authorization-server/src/test/java/smoketest/oauth2/server/SampleOAuth2AuthorizationServerApplicationTests.java @@ -21,7 +21,6 @@ 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; @@ -47,7 +46,6 @@ 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<>() {