methods = new LinkedHashSet<>();
findMethods(testClass, methods);
if (methods.isEmpty()) {
- return null;
+ methods = Collections.emptySet();
}
return new DynamicPropertiesContextCustomizer(methods);
}
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertySourceBeanInitializer.java b/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertySourceBeanInitializer.java
new file mode 100644
index 00000000000..ace5ea8ad8e
--- /dev/null
+++ b/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertySourceBeanInitializer.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context.support;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.ListableBeanFactory;
+import org.springframework.context.weaving.LoadTimeWeaverAware;
+import org.springframework.instrument.classloading.LoadTimeWeaver;
+import org.springframework.lang.Nullable;
+import org.springframework.test.context.DynamicPropertySource;
+
+/**
+ * Internal component which eagerly initializes beans created by {@code @Bean}
+ * factory methods annotated with {@link DynamicPropertySource @DynamicPropertySource}.
+ *
+ * This class implements {@link LoadTimeWeaverAware} since doing so is
+ * currently the only way to have a component eagerly initialized before the
+ * {@code ConfigurableListableBeanFactory.preInstantiateSingletons()} phase.
+ *
+ * @author Sam Brannen
+ * @since 6.2
+ */
+class DynamicPropertySourceBeanInitializer implements BeanFactoryAware, InitializingBean, LoadTimeWeaverAware {
+
+ private static final Log logger = LogFactory.getLog(DynamicPropertySourceBeanInitializer.class);
+
+ @Nullable
+ private BeanFactory beanFactory;
+
+
+ @Override
+ public void setBeanFactory(BeanFactory beanFactory) {
+ this.beanFactory = beanFactory;
+ }
+
+ @Override
+ public void afterPropertiesSet() {
+ if (!(this.beanFactory instanceof ListableBeanFactory lbf)) {
+ throw new IllegalStateException("BeanFactory must be set and must be a ListableBeanFactory");
+ }
+ for (String name : lbf.getBeanNamesForAnnotation(DynamicPropertySource.class)) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Eagerly initializing @DynamicPropertySource bean '%s'".formatted(name));
+ }
+ this.beanFactory.getBean(name);
+ }
+ }
+
+ @Override
+ public void setLoadTimeWeaver(LoadTimeWeaver loadTimeWeaver) {
+ // no-op
+ }
+
+}
diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DynamicValuesPropertySource.java b/spring-test/src/main/java/org/springframework/test/context/support/DynamicValuesPropertySource.java
index b87662215f4..8205a6c5568 100644
--- a/spring-test/src/main/java/org/springframework/test/context/support/DynamicValuesPropertySource.java
+++ b/spring-test/src/main/java/org/springframework/test/context/support/DynamicValuesPropertySource.java
@@ -16,11 +16,15 @@
package org.springframework.test.context.support;
+import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.Map;
import java.util.function.Supplier;
import org.springframework.core.env.MapPropertySource;
import org.springframework.lang.Nullable;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.util.Assert;
import org.springframework.util.function.SupplierUtils;
/**
@@ -33,9 +37,22 @@ import org.springframework.util.function.SupplierUtils;
*/
class DynamicValuesPropertySource extends MapPropertySource {
- @SuppressWarnings({"rawtypes", "unchecked"})
- DynamicValuesPropertySource(String name, Map> valueSuppliers) {
- super(name, (Map) valueSuppliers);
+ static final String PROPERTY_SOURCE_NAME = "Dynamic Test Properties";
+
+ final DynamicPropertyRegistry dynamicPropertyRegistry;
+
+
+ DynamicValuesPropertySource() {
+ this(Collections.synchronizedMap(new LinkedHashMap<>()));
+ }
+
+ DynamicValuesPropertySource(Map> valueSuppliers) {
+ super(PROPERTY_SOURCE_NAME, Collections.unmodifiableMap(valueSuppliers));
+ this.dynamicPropertyRegistry = (name, valueSupplier) -> {
+ Assert.hasText(name, "'name' must not be null or blank");
+ Assert.notNull(valueSupplier, "'valueSupplier' must not be null");
+ valueSuppliers.put(name, valueSupplier);
+ };
}
@Override
diff --git a/spring-test/src/test/java/org/springframework/test/context/DynamicPropertyRegistryIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/DynamicPropertyRegistryIntegrationTests.java
new file mode 100644
index 00000000000..c659f6f495b
--- /dev/null
+++ b/spring-test/src/test/java/org/springframework/test/context/DynamicPropertyRegistryIntegrationTests.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2002-2024 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.test.context;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Integration tests for {@link DynamicPropertyRegistry} bean support.
+ *
+ * @author Sam Brannen
+ * @since 6.2
+ * @see DynamicPropertySourceIntegrationTests
+ */
+@SpringJUnitConfig
+@TestPropertySource(properties = "api.url: https://example.com/test")
+class DynamicPropertyRegistryIntegrationTests {
+
+ private static final String API_URL = "api.url";
+
+
+ @Test
+ void dynamicPropertySourceOverridesTestPropertySource(@Autowired ConfigurableEnvironment env) {
+ assertApiUrlIsDynamic(env.getProperty(API_URL));
+
+ MutablePropertySources propertySources = env.getPropertySources();
+ assertThat(propertySources.size()).isGreaterThanOrEqualTo(4);
+ assertThat(propertySources.contains("Inlined Test Properties")).isTrue();
+ assertThat(propertySources.contains("Dynamic Test Properties")).isTrue();
+ assertThat(propertySources.get("Inlined Test Properties").getProperty(API_URL)).isEqualTo("https://example.com/test");
+ assertThat(propertySources.get("Dynamic Test Properties").getProperty(API_URL)).isEqualTo("https://example.com/dynamic");
+ }
+
+ @Test
+ void testReceivesDynamicProperty(@Value("${api.url}") String apiUrl) {
+ assertApiUrlIsDynamic(apiUrl);
+ }
+
+ @Test
+ void environmentInjectedServiceCanRetrieveDynamicProperty(@Autowired EnvironmentInjectedService service) {
+ assertApiUrlIsDynamic(service);
+ }
+
+ @Test
+ void constructorInjectedServiceReceivesDynamicProperty(@Autowired ConstructorInjectedService service) {
+ assertApiUrlIsDynamic(service);
+ }
+
+ @Test
+ void setterInjectedServiceReceivesDynamicProperty(@Autowired SetterInjectedService service) {
+ assertApiUrlIsDynamic(service);
+ }
+
+
+ private static void assertApiUrlIsDynamic(ApiUrlClient service) {
+ assertApiUrlIsDynamic(service.getApiUrl());
+ }
+
+ private static void assertApiUrlIsDynamic(String apiUrl) {
+ assertThat(apiUrl).isEqualTo("https://example.com/dynamic");
+ }
+
+
+ @Configuration
+ @Import({ EnvironmentInjectedService.class, ConstructorInjectedService.class, SetterInjectedService.class })
+ static class Config {
+
+ // Annotating this @Bean method with @DynamicPropertySource ensures that
+ // this bean will be instantiated before any other singleton beans in the
+ // context which further ensures that the dynamic "api.url" property is
+ // available to all standard singleton beans.
+ @Bean
+ @DynamicPropertySource
+ ApiServer apiServer(DynamicPropertyRegistry registry) {
+ ApiServer apiServer = new ApiServer();
+ registry.add(API_URL, apiServer::getUrl);
+ return apiServer;
+ }
+
+ }
+
+ interface ApiUrlClient {
+
+ String getApiUrl();
+ }
+
+ static class EnvironmentInjectedService implements ApiUrlClient {
+
+ private final Environment env;
+
+
+ EnvironmentInjectedService(Environment env) {
+ this.env = env;
+ }
+
+ @Override
+ public String getApiUrl() {
+ return this.env.getProperty(API_URL);
+ }
+ }
+
+ static class ConstructorInjectedService implements ApiUrlClient {
+
+ private final String apiUrl;
+
+
+ ConstructorInjectedService(@Value("${api.url}") String apiUrl) {
+ this.apiUrl = apiUrl;
+ }
+
+ @Override
+ public String getApiUrl() {
+ return this.apiUrl;
+ }
+ }
+
+ static class SetterInjectedService implements ApiUrlClient {
+
+ private String apiUrl;
+
+
+ @Autowired
+ void setApiUrl(@Value("${api.url}") String apiUrl) {
+ this.apiUrl = apiUrl;
+ }
+
+ @Override
+ public String getApiUrl() {
+ return this.apiUrl;
+ }
+ }
+
+ static class ApiServer {
+
+ String getUrl() {
+ return "https://example.com/dynamic";
+ }
+ }
+
+}
diff --git a/spring-test/src/test/java/org/springframework/test/context/DynamicPropertySourceIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/DynamicPropertySourceIntegrationTests.java
index 550de54679f..73a86f9dcb5 100644
--- a/spring-test/src/test/java/org/springframework/test/context/DynamicPropertySourceIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/DynamicPropertySourceIntegrationTests.java
@@ -37,6 +37,7 @@ import static org.junit.jupiter.api.TestInstance.Lifecycle.PER_CLASS;
*
* @author Phillip Webb
* @author Sam Brannen
+ * @see DynamicPropertyRegistryIntegrationTests
*/
@SpringJUnitConfig
@TestPropertySource(properties = "test.container.ip: test")
diff --git a/spring-test/src/test/java/org/springframework/test/context/aot/AbstractAotTests.java b/spring-test/src/test/java/org/springframework/test/context/aot/AbstractAotTests.java
index a18710b975b..99e746d8add 100644
--- a/spring-test/src/test/java/org/springframework/test/context/aot/AbstractAotTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/aot/AbstractAotTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,6 +40,7 @@ abstract class AbstractAotTests {
"org/springframework/test/context/aot/samples/basic/BasicSpringJupiterImportedConfigTests__TestContext001_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/basic/BasicSpringJupiterImportedConfigTests__TestContext001_BeanFactoryRegistrations.java",
"org/springframework/test/context/aot/samples/basic/BasicTestConfiguration__TestContext001_BeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext001_BeanDefinitions.java",
// BasicSpringJupiterSharedConfigTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext002_BeanDefinitions.java",
"org/springframework/context/event/EventListenerMethodProcessor__TestContext002_BeanDefinitions.java",
@@ -50,6 +51,7 @@ abstract class AbstractAotTests {
"org/springframework/test/context/aot/samples/basic/BasicTestConfiguration__TestContext002_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/management/ManagementConfiguration__TestContext002_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/management/ManagementMessageService__TestContext002_ManagementBeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext002_BeanDefinitions.java",
// BasicSpringJupiterTests -- not generated b/c already generated for BasicSpringJupiterSharedConfigTests.
// BasicSpringJupiterTests.NestedTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext003_BeanDefinitions.java",
@@ -61,24 +63,28 @@ abstract class AbstractAotTests {
"org/springframework/test/context/aot/samples/basic/BasicTestConfiguration__TestContext003_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/management/ManagementConfiguration__TestContext003_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/management/ManagementMessageService__TestContext003_ManagementBeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext003_BeanDefinitions.java",
// BasicSpringTestNGTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext004_BeanDefinitions.java",
"org/springframework/context/event/EventListenerMethodProcessor__TestContext004_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/basic/BasicSpringTestNGTests__TestContext004_ApplicationContextInitializer.java",
"org/springframework/test/context/aot/samples/basic/BasicSpringTestNGTests__TestContext004_BeanFactoryRegistrations.java",
"org/springframework/test/context/aot/samples/basic/BasicTestConfiguration__TestContext004_BeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext004_BeanDefinitions.java",
// BasicSpringVintageTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext005_BeanDefinitions.java",
"org/springframework/context/event/EventListenerMethodProcessor__TestContext005_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/basic/BasicSpringVintageTests__TestContext005_ApplicationContextInitializer.java",
"org/springframework/test/context/aot/samples/basic/BasicSpringVintageTests__TestContext005_BeanFactoryRegistrations.java",
"org/springframework/test/context/aot/samples/basic/BasicTestConfiguration__TestContext005_BeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext005_BeanDefinitions.java",
// DisabledInAotRuntimeMethodLevelTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext006_BeanDefinitions.java",
"org/springframework/context/event/EventListenerMethodProcessor__TestContext006_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/basic/DisabledInAotRuntimeMethodLevelTests__TestContext006_ApplicationContextInitializer.java",
"org/springframework/test/context/aot/samples/basic/DisabledInAotRuntimeMethodLevelTests__TestContext006_BeanDefinitions.java",
- "org/springframework/test/context/aot/samples/basic/DisabledInAotRuntimeMethodLevelTests__TestContext006_BeanFactoryRegistrations.java"
+ "org/springframework/test/context/aot/samples/basic/DisabledInAotRuntimeMethodLevelTests__TestContext006_BeanFactoryRegistrations.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext006_BeanDefinitions.java"
};
Stream> scan() {
diff --git a/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorIntegrationTests.java b/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorIntegrationTests.java
index 0fdbe04b1ef..d98478befd4 100644
--- a/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorIntegrationTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/aot/TestContextAotGeneratorIntegrationTests.java
@@ -395,6 +395,7 @@ class TestContextAotGeneratorIntegrationTests extends AbstractAotTests {
"org/springframework/test/context/aot/samples/basic/BasicTestConfiguration__TestContext001_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/management/ManagementConfiguration__TestContext001_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/management/ManagementMessageService__TestContext001_ManagementBeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext001_BeanDefinitions.java",
// BasicSpringJupiterTests -- not generated b/c already generated for BasicSpringJupiterSharedConfigTests.
// BasicSpringJupiterTests.NestedTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext002_BeanDefinitions.java",
@@ -406,24 +407,28 @@ class TestContextAotGeneratorIntegrationTests extends AbstractAotTests {
"org/springframework/test/context/aot/samples/basic/BasicTestConfiguration__TestContext002_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/management/ManagementConfiguration__TestContext002_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/management/ManagementMessageService__TestContext002_ManagementBeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext002_BeanDefinitions.java",
// BasicSpringTestNGTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext003_BeanDefinitions.java",
"org/springframework/context/event/EventListenerMethodProcessor__TestContext003_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/basic/BasicSpringTestNGTests__TestContext003_ApplicationContextInitializer.java",
"org/springframework/test/context/aot/samples/basic/BasicSpringTestNGTests__TestContext003_BeanFactoryRegistrations.java",
"org/springframework/test/context/aot/samples/basic/BasicTestConfiguration__TestContext003_BeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext003_BeanDefinitions.java",
// BasicSpringVintageTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext004_BeanDefinitions.java",
"org/springframework/context/event/EventListenerMethodProcessor__TestContext004_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/basic/BasicSpringVintageTests__TestContext004_ApplicationContextInitializer.java",
"org/springframework/test/context/aot/samples/basic/BasicSpringVintageTests__TestContext004_BeanFactoryRegistrations.java",
"org/springframework/test/context/aot/samples/basic/BasicTestConfiguration__TestContext004_BeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext004_BeanDefinitions.java",
// SqlScriptsSpringJupiterTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext005_BeanDefinitions.java",
"org/springframework/context/event/EventListenerMethodProcessor__TestContext005_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/jdbc/SqlScriptsSpringJupiterTests__TestContext005_ApplicationContextInitializer.java",
"org/springframework/test/context/aot/samples/jdbc/SqlScriptsSpringJupiterTests__TestContext005_BeanFactoryRegistrations.java",
"org/springframework/test/context/jdbc/EmptyDatabaseConfig__TestContext005_BeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext005_BeanDefinitions.java",
// WebSpringJupiterTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext006_BeanDefinitions.java",
"org/springframework/context/event/EventListenerMethodProcessor__TestContext006_BeanDefinitions.java",
@@ -432,12 +437,14 @@ class TestContextAotGeneratorIntegrationTests extends AbstractAotTests {
"org/springframework/test/context/aot/samples/web/WebTestConfiguration__TestContext006_BeanDefinitions.java",
"org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration__TestContext006_Autowiring.java",
"org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration__TestContext006_BeanDefinitions.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext006_BeanDefinitions.java",
// XmlSpringJupiterTests
"org/springframework/context/event/DefaultEventListenerFactory__TestContext007_BeanDefinitions.java",
"org/springframework/context/event/EventListenerMethodProcessor__TestContext007_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/common/DefaultMessageService__TestContext007_BeanDefinitions.java",
"org/springframework/test/context/aot/samples/xml/XmlSpringJupiterTests__TestContext007_ApplicationContextInitializer.java",
- "org/springframework/test/context/aot/samples/xml/XmlSpringJupiterTests__TestContext007_BeanFactoryRegistrations.java"
+ "org/springframework/test/context/aot/samples/xml/XmlSpringJupiterTests__TestContext007_BeanFactoryRegistrations.java",
+ "org/springframework/test/context/support/DynamicPropertySourceBeanInitializer__TestContext007_BeanDefinitions.java",
};
}
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java
index 5dd24e7ebef..6345184bbbe 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java
@@ -36,7 +36,6 @@ import org.springframework.test.context.web.WebDelegatingSmartContextLoader;
import org.springframework.test.context.web.WebMergedContextConfiguration;
import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
/**
* Tests for {@link BootstrapTestUtils} involving {@link MergedContextConfiguration}.
@@ -59,10 +58,14 @@ class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUt
*/
@Test
void buildMergedConfigWithContextConfigurationWithoutLocationsClassesOrInitializers() {
- assertThatIllegalStateException().isThrownBy(() ->
- buildMergedContextConfiguration(MissingContextAttributesTestCase.class))
- .withMessageStartingWith("DelegatingSmartContextLoader was unable to detect defaults, "
- + "and no ApplicationContextInitializers or ContextCustomizers were declared for context configuration attributes");
+ Class testClass = MissingContextAttributesTestCase.class;
+ MergedContextConfiguration mergedConfig = buildMergedContextConfiguration(testClass);
+
+ assertMergedConfig(mergedConfig, testClass, EMPTY_STRING_ARRAY, EMPTY_CLASS_ARRAY, DelegatingSmartContextLoader.class);
+ assertThat(mergedConfig.getContextCustomizers())
+ .map(Object::getClass)
+ .map(Class::getSimpleName)
+ .containsOnly("DynamicPropertiesContextCustomizer");
}
@Test
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizerFactoryTests.java b/spring-test/src/test/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizerFactoryTests.java
index 4f58a1b65b1..42211185917 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizerFactoryTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizerFactoryTests.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -40,10 +40,11 @@ class DynamicPropertiesContextCustomizerFactoryTests {
private final List configAttributes = Collections.emptyList();
@Test
- void createContextCustomizerWhenNoAnnotatedMethodsReturnsNull() {
+ void createContextCustomizerWhenNoAnnotatedMethodsReturnsCustomizerWithEmptyMethods() {
DynamicPropertiesContextCustomizer customizer = this.factory.createContextCustomizer(
NoDynamicPropertySource.class, this.configAttributes);
- assertThat(customizer).isNull();
+ assertThat(customizer).isNotNull();
+ assertThat(customizer.getMethods()).isEmpty();
}
@Test
diff --git a/spring-test/src/test/java/org/springframework/test/context/support/DynamicValuesPropertySourceTests.java b/spring-test/src/test/java/org/springframework/test/context/support/DynamicValuesPropertySourceTests.java
index 065486b2a27..7f75fe927eb 100644
--- a/spring-test/src/test/java/org/springframework/test/context/support/DynamicValuesPropertySourceTests.java
+++ b/spring-test/src/test/java/org/springframework/test/context/support/DynamicValuesPropertySourceTests.java
@@ -30,7 +30,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
class DynamicValuesPropertySourceTests {
- private final DynamicValuesPropertySource source = new DynamicValuesPropertySource("test",
+ private final DynamicValuesPropertySource source = new DynamicValuesPropertySource(
Map.of("a", () -> "A", "b", () -> "B"));