Polish "Restore proxying of @bean methods in @TestConfiguration"

See gh-18675

Author: snicoll

spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -6840,7 +6840,7 @@ The following example shows a `RestDocumentationResultHandler` being defined:
 
 [source,java,indent=0]
 ----
-	@TestConfiguration
+	@TestConfiguration(proxyBeanMethods = false)
 	static class ResultHandlerConfiguration {
 
 		@Bean

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/test/autoconfigure/restdocs/restassured/AdvancedConfigurationExample.java

@@ -24,7 +24,7 @@
 public class AdvancedConfigurationExample {
 
 	// tag::configuration[]
-	@TestConfiguration
+	@TestConfiguration(proxyBeanMethods = false)
 	public static class CustomizationConfiguration implements RestDocsRestAssuredConfigurationCustomizer {
 
 		@Override

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/test/autoconfigure/restdocs/webclient/AdvancedConfigurationExample.java

@@ -23,7 +23,7 @@
 public class AdvancedConfigurationExample {
 
 	// tag::configuration[]
-	@TestConfiguration
+	@TestConfiguration(proxyBeanMethods = false)
 	public static class CustomizationConfiguration implements RestDocsWebTestClientConfigurationCustomizer {
 
 		@Override

spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/web/client/SampleWebClientTests.java

@@ -49,7 +49,7 @@ void testRequest() {
 		assertThat(headers.getLocation()).hasHost("other.example.com");
 	}
 
-	@TestConfiguration
+	@TestConfiguration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/ExampleTestConfig.java

@@ -25,7 +25,7 @@
  *
  * @author Phillip Webb
  */
-@TestConfiguration
+@TestConfiguration(proxyBeanMethods = false)
 @EntityScan("some.other.package")
 public class ExampleTestConfig {
 

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/AutoConfigureTestDatabaseWithNoDatabaseIntegrationTests.java

@@ -48,7 +48,7 @@ void testContextLoads() {
 		assertThat(this.context.getBeanNamesForType(DataSource.class)).isNotEmpty();
 	}
 
-	@TestConfiguration
+	@TestConfiguration(proxyBeanMethods = false)
 	static class Config {
 
 	}

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/MockMvcRestDocsAutoConfigurationAdvancedConfigurationIntegrationTests.java

@@ -78,7 +78,7 @@ void snippetGeneration() throws Exception {
 		assertThat(new File(defaultSnippetsDir, "response-fields.md")).isFile();
 	}
 
-	@TestConfiguration
+	@TestConfiguration(proxyBeanMethods = false)
 	static class CustomizationConfiguration {
 
 		@Bean

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/RestAssuredRestDocsAutoConfigurationAdvancedConfigurationIntegrationTests.java

@@ -82,7 +82,7 @@ void snippetGeneration() {
 		assertThat(new File(defaultSnippetsDir, "response-fields.md")).isFile();
 	}
 
-	@TestConfiguration
+	@TestConfiguration(proxyBeanMethods = false)
 	static class CustomizationConfiguration {
 
 		@Bean

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/restdocs/WebTestClientRestDocsAutoConfigurationAdvancedConfigurationIntegrationTests.java

@@ -72,7 +72,7 @@ void defaultSnippetsAreWritten() throws Exception {
 		assertThat(new File(defaultSnippetsDir, "response-fields.md")).isFile();
 	}
 
-	@TestConfiguration
+	@TestConfiguration(proxyBeanMethods = false)
 	static class CustomizationConfiguration {
 
 		@Bean

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/servlet/mockmvc/WebMvcTestServletFilterRegistrationDisabledIntegrationTests.java

@@ -44,7 +44,7 @@ void shouldNotApplyFilter() throws Exception {
 		this.mvc.perform(get("/one")).andExpect(header().string("x-test", (String) null));
 	}
 
-	@TestConfiguration
+	@TestConfiguration(proxyBeanMethods = false)
 	static class DisabledRegistrationConfiguration {
 
 		@Bean

spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/context/TestConfiguration.java

@@ -40,7 +40,7 @@
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
-@Configuration(proxyBeanMethods = false)
+@Configuration
 @TestComponent
 public @interface TestConfiguration {
 
@@ -71,8 +71,8 @@
 	 * individually like when declared on non-{@code @Configuration} classes, a.k.a.
 	 * "@Bean Lite Mode" (see {@link Bean @Bean's javadoc}). It is therefore behaviorally
 	 * equivalent to removing the {@code @Configuration} stereotype.
-	 * @since 2.2.1
 	 * @return whether to proxy {@code @Bean} methods
+	 * @since 2.2.1
 	 */
 	@AliasFor(annotation = Configuration.class)
 	boolean proxyBeanMethods() default true;

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/TestConfigurationTests.java

@@ -16,39 +16,42 @@
 
 package org.springframework.boot.test.context;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.test.context.runner.ApplicationContextRunner;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.core.annotation.AnnotationAttributes;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link TestConfiguration}.
+ * Tests for {@link TestConfiguration @TestConfiguration}.
  *
- * @author Dmytro Nosan
+ * @author Stephane Nicoll
  */
 class TestConfigurationTests {
 
-	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner();
-
 	@Test
-	void shouldProxyBeanMethods() {
-		this.contextRunner.withUserConfiguration(ProxyBeanMethodsConfiguration.class)
-				.run((context) -> Assertions.assertThat(context).hasFailed());
+	void proxyBeanMethodsIsEnabledByDefault() {
+		AnnotationAttributes attributes = AnnotatedElementUtils
+				.getMergedAnnotationAttributes(DefaultTestConfiguration.class, Configuration.class);
+		assertThat(attributes.get("proxyBeanMethods")).isEqualTo(true);
 	}
 
 	@Test
-	void shouldNotProxyBeanMethods() {
-		this.contextRunner.withUserConfiguration(ProxyBeanMethodsDisableConfiguration.class)
-				.run((context) -> Assertions.assertThat(context).hasNotFailed());
+	void proxyBeanMethodsCanBeDisabled() {
+		AnnotationAttributes attributes = AnnotatedElementUtils
+				.getMergedAnnotationAttributes(NoBeanMethodProxyingTestConfiguration.class, Configuration.class);
+		assertThat(attributes.get("proxyBeanMethods")).isEqualTo(false);
 	}
 
 	@TestConfiguration
-	final static class ProxyBeanMethodsConfiguration {
+	static class DefaultTestConfiguration {
 
 	}
 
 	@TestConfiguration(proxyBeanMethods = false)
-	final static class ProxyBeanMethodsDisableConfiguration {
+	static class NoBeanMethodProxyingTestConfiguration {
 
 	}
 

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/context/bootstrap/SpringBootTestContextBootstrapperIntegrationTests.java

@@ -67,7 +67,7 @@ void defaultTestExecutionListenersPostProcessorShouldBeCalled() {
 		assertThat(this.defaultTestExecutionListenersPostProcessorCalled).isTrue();
 	}
 
-	@TestConfiguration
+	@TestConfiguration(proxyBeanMethods = false)
 	static class TestConfig {
 
 		@Bean