|
|
@ -95,7 +95,7 @@ public class SpringBootContextLoader extends AbstractContextLoader {
|
|
|
|
setActiveProfiles(environment, config.getActiveProfiles());
|
|
|
|
setActiveProfiles(environment, config.getActiveProfiles());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ResourceLoader resourceLoader = (application.getResourceLoader() != null) ? application.getResourceLoader()
|
|
|
|
ResourceLoader resourceLoader = (application.getResourceLoader() != null) ? application.getResourceLoader()
|
|
|
|
: new DefaultResourceLoader(getClass().getClassLoader());
|
|
|
|
: new DefaultResourceLoader(null);
|
|
|
|
TestPropertySourceUtils.addPropertiesFilesToEnvironment(environment, resourceLoader,
|
|
|
|
TestPropertySourceUtils.addPropertiesFilesToEnvironment(environment, resourceLoader,
|
|
|
|
config.getPropertySourceLocations());
|
|
|
|
config.getPropertySourceLocations());
|
|
|
|
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(environment, getInlinedProperties(config));
|
|
|
|
TestPropertySourceUtils.addInlinedPropertiesToEnvironment(environment, getInlinedProperties(config));
|
|
|
|