root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Polishing

This commit is contained in:
Sam Brannen 2023-08-16 12:17:46 +02:00
parent 02d3269dbb
commit 3a38bb48b5
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework-docs/modules/ROOT/pages/testing/testcontext-framework/ctx-management/caching.adoc
View File

@ -20,7 +20,7 @@ framework uses the following configuration parameters to build the context cache
* `contextLoader` (from `@ContextConfiguration`) * `contextLoader` (from `@ContextConfiguration`)
* `parent` (from `@ContextHierarchy`) * `parent` (from `@ContextHierarchy`)
* `activeProfiles` (from `@ActiveProfiles`) * `activeProfiles` (from `@ActiveProfiles`)
* `propertySourceLocations` (from `@TestPropertySource`) * `propertySourceDescriptors` (from `@TestPropertySource`)
* `propertySourceProperties` (from `@TestPropertySource`) * `propertySourceProperties` (from `@TestPropertySource`)
* `resourceBasePath` (from `@WebAppConfiguration`) * `resourceBasePath` (from `@WebAppConfiguration`)

12
spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java
View File

@ -177,7 +177,7 @@ public abstract class TestPropertySourceUtils {
/** /**
* Add the {@link Properties} files from the given resource {@code locations} * Add the {@link Properties} files from the given resource {@code locations}
* to the {@link Environment} of the supplied {@code context}. * to the {@link Environment} of the supplied {@code context}.
* <p>This method simply delegates to * <p>This method delegates to
* {@link #addPropertiesFilesToEnvironment(ConfigurableEnvironment, ResourceLoader, String...)}. * {@link #addPropertiesFilesToEnvironment(ConfigurableEnvironment, ResourceLoader, String...)}.
* @param context the application context whose environment should be updated; * @param context the application context whose environment should be updated;
* never {@code null} * never {@code null}
@ -229,14 +229,8 @@ public abstract class TestPropertySourceUtils {
/** /**
* Add property sources for the given {@code descriptors} to the * Add property sources for the given {@code descriptors} to the
* {@link Environment} of the supplied {@code context}. * {@link Environment} of the supplied {@code context}.
* <p>Property placeholders in resource locations (i.e., <code>${...}</code>) * <p>This method delegates to
* will be {@linkplain Environment#resolveRequiredPlaceholders(String) resolved} * {@link #addPropertySourcesToEnvironment(ConfigurableEnvironment, ResourceLoader, List)}.
* against the {@code Environment}.
* <p>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.
* @param context the application context whose environment should be updated; * @param context the application context whose environment should be updated;
* never {@code null} * never {@code null}
* @param descriptors the property source descriptors to process; potentially * @param descriptors the property source descriptors to process; potentially