Allow overriding dynamic property from enclosing class in nested test class

quaff · sbrannen · commit 368036cab433 · 2023-08-21T14:03:24.000+02:00
Prior to this commit, a dynamic property registered via a @DynamicPropertySource method in a @nested test class was not able to override a property registered via a @DynamicPropertySource method in the enclosing class. See gh-26091 Closes gh-31083
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizerFactory.java b/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizerFactory.java
@@ -35,6 +35,7 @@
  *
  * @author Phillip Webb
  * @author Sam Brannen
+ * @author Yanming Zhou
  * @since 5.2.5
  * @see DynamicPropertiesContextCustomizer
  */
@@ -54,10 +55,10 @@ public DynamicPropertiesContextCustomizer createContextCustomizer(Class<?> testC
 	}
 
 	private void findMethods(Class<?> testClass, Set<Method> methods) {
-		methods.addAll(MethodIntrospector.selectMethods(testClass, this::isAnnotated));
 		if (TestContextAnnotationUtils.searchEnclosingClass(testClass)) {
 			findMethods(testClass.getEnclosingClass(), methods);
 		}
+		methods.addAll(MethodIntrospector.selectMethods(testClass, this::isAnnotated));
 	}
 
 	private boolean isAnnotated(Method method) {
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/DynamicPropertySourceNestedTests.java b/spring-test/src/test/java/org/springframework/test/context/junit/jupiter/nested/DynamicPropertySourceNestedTests.java
@@ -39,6 +39,7 @@
  * {@link SpringExtension} in a JUnit Jupiter environment.
  *
  * @author Sam Brannen
+ * @author Yanming Zhou
  * @since 5.3.2
  */
 @SpringJUnitConfig
@@ -125,6 +126,22 @@ void serviceHasInjectedValues(@Autowired Service service) {
 		}
 	}
 
+	@Nested
+	class DynamicPropertySourceOverrideEnclosingClassTests {
+
+		@DynamicPropertySource
+		static void overrideDynamicPropertyFromEnclosingClass(DynamicPropertyRegistry registry) {
+			registry.add(TEST_CONTAINER_PORT, () -> -999);
+		}
+
+		@Test
+		@DisplayName("@Service has values injected from @DynamicPropertySource in enclosing class and nested class")
+		void serviceHasInjectedValues(@Autowired Service service) {
+			assertThat(service.getIp()).isEqualTo("127.0.0.1");
+			assertThat(service.getPort()).isEqualTo(-999);
+		}
+
+	}
 
 	static abstract class DynamicPropertySourceSuperclass {
 

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@`
`35`	`35`	`*`
`36`	`36`	`* @author Phillip Webb`
`37`	`37`	`* @author Sam Brannen`
	`38`	`+ * @author Yanming Zhou`
`38`	`39`	`* @since 5.2.5`
`39`	`40`	`* @see DynamicPropertiesContextCustomizer`
`40`	`41`	`*/`
`@@ -54,10 +55,10 @@ public DynamicPropertiesContextCustomizer createContextCustomizer(Class<?> testC`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`private void findMethods(Class<?> testClass, Set<Method> methods) {`
`57`		`- methods.addAll(MethodIntrospector.selectMethods(testClass, this::isAnnotated));`
`58`	`58`	`if (TestContextAnnotationUtils.searchEnclosingClass(testClass)) {`
`59`	`59`	`findMethods(testClass.getEnclosingClass(), methods);`
`60`	`60`	`}`
	`61`	`+ methods.addAll(MethodIntrospector.selectMethods(testClass, this::isAnnotated));`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`private boolean isAnnotated(Method method) {`