diff --git a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/caching.adoc b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/caching.adoc index 0a4f02f9120..a75d6314aab 100644 --- a/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/caching.adoc +++ b/framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/caching.adoc @@ -20,7 +20,7 @@ framework uses the following configuration parameters to build the context cache * `contextLoader` (from `@ContextConfiguration`) * `parent` (from `@ContextHierarchy`) * `activeProfiles` (from `@ActiveProfiles`) -* `propertySourceLocations` (from `@TestPropertySource`) +* `propertySourceDescriptors` (from `@TestPropertySource`) * `propertySourceProperties` (from `@TestPropertySource`) * `resourceBasePath` (from `@WebAppConfiguration`) diff --git a/spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java b/spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java index 20f8b681655..67d61cb51c0 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java @@ -177,7 +177,7 @@ public abstract class TestPropertySourceUtils { /** * Add the {@link Properties} files from the given resource {@code locations} * to the {@link Environment} of the supplied {@code context}. - *
This method simply delegates to + *
This method delegates to * {@link #addPropertiesFilesToEnvironment(ConfigurableEnvironment, ResourceLoader, String...)}. * @param context the application context whose environment should be updated; * never {@code null} @@ -229,14 +229,8 @@ public abstract class TestPropertySourceUtils { /** * Add property sources for the given {@code descriptors} to the * {@link Environment} of the supplied {@code context}. - *
Property placeholders in resource locations (i.e., ${...})
- * will be {@linkplain Environment#resolveRequiredPlaceholders(String) resolved}
- * against the {@code Environment}.
- *
Each {@link PropertySource} will be created via the configured - * {@link PropertySourceDescriptor#propertySourceFactory() PropertySourceFactory} - * (or the {@link DefaultPropertySourceFactory} if no factory is configured) - * and added to the {@link PropertySources} of the environment with the highest - * precedence. + *
This method delegates to + * {@link #addPropertySourcesToEnvironment(ConfigurableEnvironment, ResourceLoader, List)}. * @param context the application context whose environment should be updated; * never {@code null} * @param descriptors the property source descriptors to process; potentially