Polish test @⁠Configuration classes

sbrannen · sbrannen · commit b60bb44256c1 · 2024-09-16T15:45:32.000+02:00
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByNameLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByNameLookupIntegrationTests.java
@@ -157,7 +157,7 @@ void fieldHasOverride(ApplicationContext ctx) {
 	}
 
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean("field")
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForByTypeLookupIntegrationTests.java
@@ -88,7 +88,7 @@ void overrideIsFoundByTypeWithQualifierDisambiguation(ApplicationContext ctx) {
 	}
 
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean("example")
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForExternalFactoryMethodIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForExternalFactoryMethodIntegrationTests.java
@@ -44,7 +44,7 @@ void test() {
 	}
 
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForInheritanceIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForInheritanceIntegrationTests.java
@@ -97,7 +97,7 @@ public String toString() {
 			}
 		}
 
-		@Configuration
+		@Configuration(proxyBeanMethods = false)
 		static class Config {
 
 			@Bean
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForInterfaceIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForInterfaceIntegrationTests.java
@@ -45,7 +45,7 @@ void test() {
 	}
 
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForMultipleNestingLevelsIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/convention/TestBeanForMultipleNestingLevelsIntegrationTests.java
@@ -104,7 +104,7 @@ void test() {
 	}
 
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByNameLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByNameLookupIntegrationTests.java
@@ -116,7 +116,7 @@ void fieldIsMockedWhenNoOriginalBean(ApplicationContext ctx) {
 	}
 
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean("field")
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanForByTypeLookupIntegrationTests.java
@@ -129,7 +129,7 @@ interface AnotherService {
 
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean("example")
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanWithResetIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoBeanWithResetIntegrationTests.java
@@ -101,7 +101,7 @@ public Class<?> getObjectType() {
 		}
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean("service")
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByNameLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByNameLookupIntegrationTests.java
@@ -98,7 +98,7 @@ void renamedFieldHasOverride(ApplicationContext ctx) {
 		}
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean("field")
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByTypeLookupIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanForByTypeLookupIntegrationTests.java
@@ -103,7 +103,7 @@ void overrideIsFoundByTypeAndDisambiguatedByMetaQualifier(ApplicationContext ctx
 	}
 
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean("example")
diff --git a/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanWithResetIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/bean/override/mockito/MockitoSpyBeanWithResetIntegrationTests.java
@@ -104,7 +104,7 @@ public Class<?> getObjectType() {
 		}
 	}
 
-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	static class Config {
 
 		@Bean("service")

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ void fieldHasOverride(ApplicationContext ctx) {`
`157`	`157`	`}`
`158`	`158`
`159`	`159`
`160`		`- @Configuration`
	`160`	`+ @Configuration(proxyBeanMethods = false)`
`161`	`161`	`static class Config {`
`162`	`162`
`163`	`163`	`@Bean("field")`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ void overrideIsFoundByTypeWithQualifierDisambiguation(ApplicationContext ctx) {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`
`91`		`- @Configuration`
	`91`	`+ @Configuration(proxyBeanMethods = false)`
`92`	`92`	`static class Config {`
`93`	`93`
`94`	`94`	`@Bean("example")`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ void test() {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`
`47`		`- @Configuration`
	`47`	`+ @Configuration(proxyBeanMethods = false)`
`48`	`48`	`static class Config {`
`49`	`49`
`50`	`50`	`@Bean`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public String toString() {`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
`100`		`- @Configuration`
	`100`	`+ @Configuration(proxyBeanMethods = false)`
`101`	`101`	`static class Config {`
`102`	`102`
`103`	`103`	`@Bean`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ void test() {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`
`48`		`- @Configuration`
	`48`	`+ @Configuration(proxyBeanMethods = false)`
`49`	`49`	`static class Config {`
`50`	`50`
`51`	`51`	`@Bean`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ void test() {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`
`107`		`- @Configuration`
	`107`	`+ @Configuration(proxyBeanMethods = false)`
`108`	`108`	`static class Config {`
`109`	`109`
`110`	`110`	`@Bean`
Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ void fieldIsMockedWhenNoOriginalBean(ApplicationContext ctx) {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`
`119`		`- @Configuration`
	`119`	`+ @Configuration(proxyBeanMethods = false)`
`120`	`120`	`static class Config {`
`121`	`121`
`122`	`122`	`@Bean("field")`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ interface AnotherService {`
`129`	`129`
`130`	`130`	`}`
`131`	`131`
`132`		`- @Configuration`
	`132`	`+ @Configuration(proxyBeanMethods = false)`
`133`	`133`	`static class Config {`
`134`	`134`
`135`	`135`	`@Bean("example")`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public Class<?> getObjectType() {`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`- @Configuration`
	`104`	`+ @Configuration(proxyBeanMethods = false)`
`105`	`105`	`static class Config {`
`106`	`106`
`107`	`107`	`@Bean("service")`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ void renamedFieldHasOverride(ApplicationContext ctx) {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`- @Configuration`
	`101`	`+ @Configuration(proxyBeanMethods = false)`
`102`	`102`	`static class Config {`
`103`	`103`
`104`	`104`	`@Bean("field")`