From d745b69630bfb243d5bd031418a74baf31eeee14 Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Tue, 23 May 2017 10:05:43 -0700 Subject: [PATCH] Replace usages of EnvironmentTestUtils --- .../BootCuriesHrefIntegrationTests.java | 4 +- .../EndpointAutoConfigurationTests.java | 9 +- .../EndpointWebMvcAutoConfigurationTests.java | 112 ++++++++-------- ...iaManagementContextConfigurationTests.java | 4 +- ...vcManagementContextConfigurationTests.java | 6 +- ...HealthIndicatorAutoConfigurationTests.java | 122 +++++++++--------- ...althMvcEndpointAutoConfigurationTests.java | 10 +- ...InfoContributorAutoConfigurationTests.java | 4 +- .../JolokiaAutoConfigurationTests.java | 14 +- ...gementServerPropertiesNoSecurityTests.java | 4 +- .../ManagementServerPropertiesTests.java | 4 +- ...mentWebSecurityAutoConfigurationTests.java | 10 +- .../MetricExportAutoConfigurationTests.java | 6 +- .../MetricFilterAutoConfigurationTests.java | 14 +- .../MvcEndpointPathConfigurationTests.java | 6 +- .../TraceWebFilterAutoConfigurationTests.java | 4 +- ...FoundryActuatorAutoConfigurationTests.java | 22 ++-- .../endpoint/AbstractEndpointTests.java | 4 +- ...sReportEndpointMethodAnnotationsTests.java | 8 +- ...rtiesReportEndpointSerializationTests.java | 18 +-- ...gurationPropertiesReportEndpointTests.java | 18 +-- .../endpoint/EnvironmentEndpointTests.java | 28 ++-- .../mvc/EnvironmentMvcEndpointTests.java | 6 +- .../JolokiaMvcEndpointContextPathTests.java | 7 +- .../JolokiaMvcEndpointIntegrationTests.java | 5 +- .../mvc/MvcEndpointCorsIntegrationTests.java | 42 +++--- .../mvc/MvcEndpointIntegrationTests.java | 30 ++--- .../endpoint/mvc/MvcEndpointsTests.java | 6 +- ...rityHealthMvcEndpointIntegrationTests.java | 6 +- .../info/EnvironmentInfoContributorTests.java | 16 +-- ...icationAdminJmxAutoConfigurationTests.java | 4 +- .../amqp/RabbitAutoConfigurationTests.java | 4 +- .../aop/AopAutoConfigurationTests.java | 4 +- .../batch/BatchAutoConfigurationTests.java | 4 +- ...BatchAutoConfigurationWithoutJpaTests.java | 4 +- .../cache/CacheAutoConfigurationTests.java | 4 +- .../CassandraAutoConfigurationTests.java | 4 +- .../condition/AllNestedConditionsTests.java | 4 +- .../condition/AnyNestedConditionTests.java | 4 +- .../ConditionEvaluationReportTests.java | 4 +- .../condition/ConditionalOnBeanTests.java | 4 +- .../ConditionalOnCloudPlatformTests.java | 4 +- .../condition/ConditionalOnJndiTests.java | 4 +- .../ConditionalOnMissingBeanTests.java | 4 +- .../condition/ConditionalOnPropertyTests.java | 4 +- .../condition/ConditionalOnResourceTests.java | 4 +- .../condition/NoneNestedConditionsTests.java | 4 +- .../condition/ResourceConditionTests.java | 4 +- ...ationPropertiesAutoConfigurationTests.java | 4 +- .../MessageSourceAutoConfigurationTests.java | 8 +- ...ertyPlaceholderAutoConfigurationTests.java | 6 +- ...stractCouchbaseAutoConfigurationTests.java | 4 +- .../OnBootstrapHostsConditionTests.java | 4 +- ...tionTranslationAutoConfigurationTests.java | 10 +- ...DataAutoConfigurationIntegrationTests.java | 6 +- .../CassandraDataAutoConfigurationTests.java | 12 +- ...draReactiveDataAutoConfigurationTests.java | 4 +- .../CouchbaseDataAutoConfigurationTests.java | 4 +- ...aseRepositoriesAutoConfigurationTests.java | 4 +- .../ElasticsearchAutoConfigurationTests.java | 14 +- ...asticsearchDataAutoConfigurationTests.java | 10 +- ...rchRepositoriesAutoConfigurationTests.java | 6 +- .../ldap/LdapDataAutoConfigurationTests.java | 6 +- ...dapRepositoriesAutoConfigurationTests.java | 6 +- ...ngoRepositoriesAutoConfigurationTests.java | 22 ++-- .../MongoDataAutoConfigurationTests.java | 8 +- ...ingRepositoriesAutoConfigurationTests.java | 6 +- ...o4jRepositoriesAutoConfigurationTests.java | 20 +-- .../Neo4jDataAutoConfigurationTests.java | 4 +- .../data/neo4j/Neo4jPropertiesTests.java | 4 +- ...o4jRepositoriesAutoConfigurationTests.java | 6 +- .../RedisAutoConfigurationJedisTests.java | 4 +- .../redis/RedisAutoConfigurationTests.java | 4 +- .../RedisReactiveAutoConfigurationTests.java | 4 +- ...positoryRestMvcAutoConfigurationTests.java | 4 +- ...uchBeanDefinitionFailureAnalyzerTests.java | 4 +- .../jest/JestAutoConfigurationTests.java | 4 +- .../flyway/FlywayAutoConfigurationTests.java | 38 +++--- .../FreeMarkerAutoConfigurationTests.java | 4 +- .../GroovyTemplateAutoConfigurationTests.java | 8 +- .../h2/H2ConsoleAutoConfigurationTests.java | 22 ++-- .../HypermediaAutoConfigurationTests.java | 14 +- ...HazelcastAutoConfigurationClientTests.java | 4 +- ...HazelcastAutoConfigurationServerTests.java | 4 +- .../HazelcastAutoConfigurationTests.java | 4 +- ...ssageConvertersAutoConfigurationTests.java | 6 +- .../ProjectInfoAutoConfigurationTests.java | 4 +- .../IntegrationAutoConfigurationTests.java | 4 +- .../JacksonAutoConfigurationTests.java | 88 ++++++------- .../DataSourceAutoConfigurationTests.java | 34 ++--- .../jdbc/DataSourceInitializerTests.java | 46 +++---- ...nsactionManagerAutoConfigurationTests.java | 6 +- .../EmbeddedDataSourceConfigurationTests.java | 4 +- .../HikariDataSourceConfigurationTests.java | 12 +- ...iverConfigurationFailureAnalyzerTests.java | 6 +- .../JdbcTemplateAutoConfigurationTests.java | 6 +- .../JndiDataSourceAutoConfigurationTests.java | 14 +- .../TomcatDataSourceConfigurationTests.java | 36 +++--- .../XADataSourceAutoConfigurationTests.java | 4 +- .../jms/JmsAutoConfigurationTests.java | 4 +- .../ActiveMQAutoConfigurationTests.java | 4 +- .../ArtemisAutoConfigurationTests.java | 4 +- .../jooq/JooqAutoConfigurationTests.java | 11 +- ...afkaAutoConfigurationIntegrationTests.java | 4 +- .../kafka/KafkaAutoConfigurationTests.java | 4 +- .../ldap/LdapAutoConfigurationTests.java | 4 +- .../EmbeddedLdapAutoConfigurationTests.java | 12 +- .../LiquibaseAutoConfigurationTests.java | 46 +++---- .../MailSenderAutoConfigurationTests.java | 4 +- ...ingViewResolverAutoConfigurationTests.java | 4 +- .../SitePreferenceAutoConfigurationTests.java | 14 +- .../mongo/MongoAutoConfigurationTests.java | 10 +- .../mongo/MongoPropertiesTests.java | 4 +- .../MongoReactiveAutoConfigurationTests.java | 12 +- .../EmbeddedMongoAutoConfigurationTests.java | 12 +- .../MustacheAutoConfigurationTests.java | 10 +- .../AbstractJpaAutoConfigurationTests.java | 14 +- ...tomHibernateJpaAutoConfigurationTests.java | 14 +- .../HibernateJpaAutoConfigurationTests.java | 26 ++-- .../orm/jpa/JpaPropertiesTests.java | 4 +- .../SecurityAutoConfigurationTests.java | 16 +-- ...ConfigurationEarlyInitializationTests.java | 6 +- .../oauth2/OAuth2AutoConfigurationTests.java | 30 ++--- ...tipleResourceServerConfigurationTests.java | 6 +- ...ServerTokenServicesConfigurationTests.java | 54 ++++---- .../SendGridAutoConfigurationTests.java | 4 +- ...AbstractSessionAutoConfigurationTests.java | 4 +- .../FacebookAutoConfigurationTests.java | 10 +- .../LinkedInAutoConfigurationTests.java | 10 +- .../MultiApiAutoConfigurationTests.java | 4 +- .../social/TwitterAutoConfigurationTests.java | 10 +- ...ymeleafReactiveAutoConfigurationTests.java | 4 +- ...hymeleafServletAutoConfigurationTests.java | 4 +- .../TransactionAutoConfigurationTests.java | 4 +- .../jta/JtaAutoConfigurationTests.java | 38 +++--- .../ValidationAutoConfigurationTests.java | 4 +- ...onditionalOnEnabledResourceChainTests.java | 4 +- .../HttpHandlerAutoConfigurationTests.java | 4 +- .../WebFluxAutoConfigurationTests.java | 4 +- ...spatcherServletAutoConfigurationTests.java | 8 +- .../FilterOrderingIntegrationTests.java | 6 +- .../HttpEncodingAutoConfigurationTests.java | 4 +- .../MultipartAutoConfigurationTests.java | 10 +- ...ebServerFactoryAutoConfigurationTests.java | 6 +- .../servlet/WebMvcAutoConfigurationTests.java | 8 +- .../WebServicesAutoConfigurationTests.java | 4 +- ...SocketMessagingAutoConfigurationTests.java | 6 +- ...ToolsDataSourceAutoConfigurationTests.java | 8 +- .../RemoteDevToolsAutoConfigurationTests.java | 4 +- ...LocalDebugPortAvailableConditionTests.java | 6 +- .../RemoteClientConfigurationTests.java | 10 +- ...plePropertyValidationApplicationTests.java | 14 +- ...ConfigurationContextCustomizerFactory.java | 6 +- .../TestDatabaseAutoConfigurationTests.java | 4 +- ...abaseAutoConfigurationNoEmbeddedTests.java | 4 +- .../test/context/SpringBootContextLoader.java | 6 +- 156 files changed, 863 insertions(+), 883 deletions(-) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BootCuriesHrefIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BootCuriesHrefIntegrationTests.java index b440a80f39..17133b3f9c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BootCuriesHrefIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BootCuriesHrefIntegrationTests.java @@ -23,7 +23,7 @@ import net.minidev.json.JSONArray; import org.junit.After; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; @@ -123,7 +123,7 @@ public class BootCuriesHrefIntegrationTests { } }); - EnvironmentTestUtils.addEnvironment(this.context, properties); + TestPropertyValues.of(properties).applyTo(this.context); this.context.register(TestConfiguration.class); new ServerPortInfoApplicationContextInitializer().initialize(this.context); this.context.refresh(); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java index 1a3ec8d209..e30b4fb818 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointAutoConfigurationTests.java @@ -59,7 +59,7 @@ import org.springframework.boot.context.properties.bind.Bindable; import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.context.properties.source.MapConfigurationPropertySource; import org.springframework.boot.logging.LoggingSystem; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -172,7 +172,7 @@ public class EndpointAutoConfigurationTests { @Test public void testInfoEndpoint() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, "info.foo:bar"); + TestPropertyValues.of("info.foo:bar").applyTo(this.context); this.context.register(ProjectInfoAutoConfiguration.class, InfoContributorAutoConfiguration.class, EndpointAutoConfiguration.class); this.context.refresh(); @@ -186,8 +186,7 @@ public class EndpointAutoConfigurationTests { @Test public void testInfoEndpointNoGitProperties() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.info.git.location:classpath:nonexistent"); + TestPropertyValues.of("spring.info.git.location:classpath:nonexistent").applyTo(this.context); this.context.register(InfoContributorAutoConfiguration.class, EndpointAutoConfiguration.class); this.context.refresh(); @@ -199,7 +198,7 @@ public class EndpointAutoConfigurationTests { @Test public void testInfoEndpointOrdering() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, "info.name:foo"); + TestPropertyValues.of("info.name:foo").applyTo(this.context); this.context.register(CustomInfoContributorsConfig.class, ProjectInfoAutoConfiguration.class, InfoContributorAutoConfiguration.class, EndpointAutoConfiguration.class); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java index f78301974f..50a56c5214 100755 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java @@ -64,7 +64,7 @@ import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConf import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; import org.springframework.boot.logging.LoggingSystem; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.testutil.Matched; import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; @@ -124,9 +124,9 @@ public class EndpointWebMvcAutoConfigurationTests { public void setUp() { Ports values = new Ports(); ports.set(values); - EnvironmentTestUtils.addEnvironment(this.applicationContext, + TestPropertyValues.of( "management.context-path=", "management.security.enabled=false", - "server.servlet.context-path=", "server.port=" + ports.get().server); + "server.servlet.context-path=", "server.port=" + ports.get().server).applyTo(this.applicationContext); } @After @@ -137,8 +137,8 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void onSamePort() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.security.enabled=false"); + TestPropertyValues.of( + "management.security.enabled=false").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class); this.applicationContext.refresh(); @@ -154,8 +154,8 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void onSamePortWithHeader() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.add-application-context-header:true"); + TestPropertyValues.of( + "management.add-application-context-header:true").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class); this.applicationContext.refresh(); @@ -167,8 +167,8 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void onDifferentPort() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.port=" + ports.get().management); + TestPropertyValues.of( + "management.port=" + ports.get().management).applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, DifferentPortConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -187,8 +187,8 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void onDifferentPortWithSpecificServer() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.port=" + ports.get().management); + TestPropertyValues.of( + "management.port=" + ports.get().management).applyTo(this.applicationContext); this.applicationContext.register(SpecificWebServerConfig.class, RootConfig.class, DifferentPortConfig.class, EndpointConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -214,9 +214,9 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void onDifferentPortAndContext() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, + TestPropertyValues.of( "management.port=" + ports.get().management, - "management.context-path=/admin"); + "management.context-path=/admin").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, DifferentPortConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -228,10 +228,10 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void onDifferentPortAndMainContext() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, + TestPropertyValues.of( "server.servlet.context-path=/spring", "management.port=" + ports.get().management, - "management.context-path=/admin"); + "management.context-path=/admin").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, DifferentPortConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -243,8 +243,8 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void onDifferentPortWithoutErrorMvcAutoConfiguration() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.port=" + ports.get().management); + TestPropertyValues.of( + "management.port=" + ports.get().management).applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, DifferentPortConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class); @@ -254,8 +254,8 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void onDifferentPortInWebServer() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.port=" + ports.get().management); + TestPropertyValues.of( + "management.port=" + ports.get().management).applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, DifferentPortConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -272,8 +272,8 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void onRandomPort() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, "management.port=0", - "management.security.enabled=false"); + TestPropertyValues.of("management.port=0", + "management.security.enabled=false").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -291,8 +291,8 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void onDifferentPortWithPrimaryFailure() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.port=" + ports.get().management); + TestPropertyValues.of( + "management.port=" + ports.get().management).applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, DifferentPortConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -308,8 +308,7 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void disabled() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.port=-1"); + TestPropertyValues.of("management.port=-1").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class); this.applicationContext.refresh(); @@ -321,10 +320,10 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void specificPortsViaProperties() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, + TestPropertyValues.of( "server.port:" + ports.get().server, "management.port:" + ports.get().management, - "management.security.enabled:false"); + "management.security.enabled:false").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -340,9 +339,8 @@ public class EndpointWebMvcAutoConfigurationTests { int managementPort = ports.get().management; try (ServerSocket serverSocket = new ServerSocket()) { serverSocket.bind(new InetSocketAddress(managementPort)); - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "server.port:" + ports.get().server, - "management.port:" + ports.get().management); + TestPropertyValues.of("server.port:" + ports.get().server, + "management.port:" + ports.get().management).applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -353,8 +351,7 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void contextPath() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.context-path:/test", "management.security.enabled:false"); + TestPropertyValues.of("management.context-path:/test", "management.security.enabled:false").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, PropertyPlaceholderAutoConfiguration.class, JacksonAutoConfiguration.class, @@ -369,8 +366,8 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void overrideServerProperties() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "server.displayName:foo"); + TestPropertyValues.of( + "server.displayName:foo").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, PropertyPlaceholderAutoConfiguration.class, JacksonAutoConfiguration.class, @@ -403,8 +400,8 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void portPropertiesOnDifferentPort() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.port=" + ports.get().management); + TestPropertyValues.of( + "management.port=" + ports.get().management).applyTo(this.applicationContext); new ServerPortInfoApplicationContextInitializer() .initialize(this.applicationContext); this.applicationContext.register(RootConfig.class, DifferentPortConfig.class, @@ -444,8 +441,8 @@ public class EndpointWebMvcAutoConfigurationTests { public void endpointsAllDisabled() throws Exception { this.applicationContext.register(RootConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "endpoints.enabled:false"); + TestPropertyValues.of( + "endpoints.enabled:false").applyTo(this.applicationContext); this.applicationContext.refresh(); assertThat(this.applicationContext.getBeansOfType(MvcEndpoint.class)).isEmpty(); } @@ -494,8 +491,8 @@ public class EndpointWebMvcAutoConfigurationTests { public void shutdownEndpointEnabled() { this.applicationContext.register(RootConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "endpoints.shutdown.enabled:true"); + TestPropertyValues.of( + "endpoints.shutdown.enabled:true").applyTo(this.applicationContext); this.applicationContext.refresh(); assertThat(this.applicationContext.getBeansOfType(ShutdownMvcEndpoint.class)) .hasSize(1); @@ -505,8 +502,7 @@ public class EndpointWebMvcAutoConfigurationTests { public void actuatorEndpointEnabledIndividually() { this.applicationContext.register(RootConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "endpoints.enabled:false", "endpoints.actuator.enabled:true"); + TestPropertyValues.of("endpoints.enabled:false", "endpoints.actuator.enabled:true").applyTo(this.applicationContext); this.applicationContext.refresh(); assertThat(this.applicationContext.getBeansOfType(HalJsonMvcEndpoint.class)) .hasSize(1); @@ -514,11 +510,10 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void managementSpecificSslUsingDifferentPort() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.port=" + ports.get().management, + TestPropertyValues.of("management.port=" + ports.get().management, "management.ssl.enabled=true", "management.ssl.key-store=classpath:test.jks", - "management.ssl.key-password=password"); + "management.ssl.key-password=password").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, DifferentPortConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -541,10 +536,10 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void managementSpecificSslUsingSamePortFails() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, + TestPropertyValues.of( "management.ssl.enabled=true", "management.ssl.key-store=classpath:test.jks", - "management.ssl.key-password=password"); + "management.ssl.key-password=password").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -556,10 +551,10 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void managementServerCanDisableSslWhenUsingADifferentPort() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, + TestPropertyValues.of( "management.port=" + ports.get().management, "server.ssl.enabled=true", "server.ssl.key-store=classpath:test.jks", - "server.ssl.key-password=password", "management.ssl.enabled=false"); + "server.ssl.key-password=password", "management.ssl.enabled=false").applyTo(this.applicationContext); this.applicationContext.register(RootConfig.class, EndpointConfig.class, DifferentPortConfig.class, BaseConfiguration.class, @@ -583,13 +578,13 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void tomcatManagementAccessLogUsesCustomPrefix() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.port=" + ports.get().management); + TestPropertyValues.of( + "management.port=" + ports.get().management).applyTo(this.applicationContext); this.applicationContext.register(TomcatWebServerConfig.class, RootConfig.class, EndpointConfig.class, DifferentPortConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.applicationContext, - "server.tomcat.accesslog.enabled: true"); + TestPropertyValues.of( + "server.tomcat.accesslog.enabled: true").applyTo(this.applicationContext); this.applicationContext.refresh(); ApplicationContext managementContext = this.applicationContext .getBean(ManagementContextResolver.class).getApplicationContext(); @@ -604,9 +599,9 @@ public class EndpointWebMvcAutoConfigurationTests { @Test public void undertowManagementAccessLogUsesCustomPrefix() throws Exception { - EnvironmentTestUtils.addEnvironment(this.applicationContext, + TestPropertyValues.of( "management.port=" + ports.get().management, - "server.undertow.accesslog.enabled: true"); + "server.undertow.accesslog.enabled: true").applyTo(this.applicationContext); this.applicationContext.register(UndertowWebServerConfig.class, RootConfig.class, EndpointConfig.class, DifferentPortConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class, ErrorMvcAutoConfiguration.class); @@ -633,8 +628,7 @@ public class EndpointWebMvcAutoConfigurationTests { private void endpointDisabled(String name, Class type) { this.applicationContext.register(RootConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.applicationContext, - String.format("endpoints.%s.enabled:false", name)); + TestPropertyValues.of(String.format("endpoints.%s.enabled:false", name)).applyTo(this.applicationContext); this.applicationContext.refresh(); assertThat(this.applicationContext.getBeansOfType(type)).isEmpty(); } @@ -644,9 +638,9 @@ public class EndpointWebMvcAutoConfigurationTests { this.applicationContext.register(LoggingConfig.class, RootConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class); ConfigurationPropertySources.attach(this.applicationContext.getEnvironment()); - EnvironmentTestUtils.addEnvironment(this.applicationContext, + TestPropertyValues.of( "endpoints.enabled:false", - String.format("endpoints.%s.enabled:true", name)); + String.format("endpoints.%s.enabled:true", name)).applyTo(this.applicationContext); this.applicationContext.refresh(); assertThat(this.applicationContext.getBeansOfType(type)).hasSize(1); } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfigurationTests.java index 2bd7e20793..142780b6e3 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcHypermediaManagementContextConfigurationTests.java @@ -29,7 +29,7 @@ import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoints; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.hateoas.Link; @@ -126,7 +126,7 @@ public class EndpointWebMvcHypermediaManagementContextConfigurationTests { } }); - EnvironmentTestUtils.addEnvironment(this.context, properties); + TestPropertyValues.of(properties).applyTo(this.context); this.context.register(TestConfiguration.class, HttpMessageConvertersAutoConfiguration.class, EndpointWebMvcHypermediaManagementContextConfiguration.class); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java index 625583360c..544285eb29 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcManagementContextConfigurationTests.java @@ -30,7 +30,7 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration; import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.mock.web.MockServletContext; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; @@ -68,9 +68,9 @@ public class EndpointWebMvcManagementContextConfigurationTests { @Test public void endpointHandlerMapping() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.security.enabled=false", - "management.security.roles=my-role,your-role"); + "management.security.roles=my-role,your-role").applyTo(this.context); this.context.refresh(); EndpointHandlerMapping mapping = this.context.getBean("endpointHandlerMapping", EndpointHandlerMapping.class); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java index 551e4438c9..f4d830640f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorAutoConfigurationTests.java @@ -57,7 +57,7 @@ import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.boot.autoconfigure.solr.SolrAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -92,8 +92,8 @@ public class HealthIndicatorAutoConfigurationTests { public void defaultHealthIndicator() { this.context.register(HealthIndicatorAutoConfiguration.class, ManagementServerProperties.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -106,8 +106,8 @@ public class HealthIndicatorAutoConfigurationTests { public void defaultHealthIndicatorsDisabled() { this.context.register(HealthIndicatorAutoConfiguration.class, ManagementServerProperties.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.defaults.enabled:false"); + TestPropertyValues.of( + "management.health.defaults.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -120,8 +120,8 @@ public class HealthIndicatorAutoConfigurationTests { public void defaultHealthIndicatorsDisabledWithCustomOne() { this.context.register(CustomHealthIndicator.class, HealthIndicatorAutoConfiguration.class, ManagementServerProperties.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.defaults.enabled:false"); + TestPropertyValues.of( + "management.health.defaults.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -134,9 +134,9 @@ public class HealthIndicatorAutoConfigurationTests { public void defaultHealthIndicatorsDisabledButOne() { this.context.register(HealthIndicatorAutoConfiguration.class, ManagementServerProperties.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.defaults.enabled:false", - "management.health.diskspace.enabled:true"); + "management.health.diskspace.enabled:true").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -149,8 +149,8 @@ public class HealthIndicatorAutoConfigurationTests { public void redisHealthIndicator() { this.context.register(RedisAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -163,9 +163,9 @@ public class HealthIndicatorAutoConfigurationTests { public void notRedisHealthIndicator() { this.context.register(RedisAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.redis.enabled:false", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -179,8 +179,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context.register(MongoAutoConfiguration.class, ManagementServerProperties.class, MongoDataAutoConfiguration.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -194,9 +194,9 @@ public class HealthIndicatorAutoConfigurationTests { this.context.register(MongoAutoConfiguration.class, ManagementServerProperties.class, MongoDataAutoConfiguration.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.mongo.enabled:false", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -220,8 +220,8 @@ public class HealthIndicatorAutoConfigurationTests { public void dataSourceHealthIndicator() { this.context.register(EmbeddedDataSourceConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -235,8 +235,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context.register(EmbeddedDataSourceConfiguration.class, DataSourceConfig.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -252,8 +252,8 @@ public class HealthIndicatorAutoConfigurationTests { this.context.register(EmbeddedDataSourceConfiguration.class, RoutingDatasourceConfig.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -269,9 +269,9 @@ public class HealthIndicatorAutoConfigurationTests { DataSourceConfig.class, DataSourcePoolMetadataProvidersConfiguration.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.test.validation-query:SELECT from FOOBAR", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -286,9 +286,9 @@ public class HealthIndicatorAutoConfigurationTests { public void notDataSourceHealthIndicator() { this.context.register(EmbeddedDataSourceConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.db.enabled:false", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -301,8 +301,8 @@ public class HealthIndicatorAutoConfigurationTests { public void rabbitHealthIndicator() { this.context.register(RabbitAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -315,9 +315,9 @@ public class HealthIndicatorAutoConfigurationTests { public void notRabbitHealthIndicator() { this.context.register(RabbitAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.rabbit.enabled:false", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -330,8 +330,8 @@ public class HealthIndicatorAutoConfigurationTests { public void solrHealthIndicator() { this.context.register(SolrAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -344,9 +344,9 @@ public class HealthIndicatorAutoConfigurationTests { public void notSolrHealthIndicator() { this.context.register(SolrAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.solr.enabled:false", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.refresh(); Map beans = this.context .getBeansOfType(HealthIndicator.class); @@ -368,9 +368,9 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void mailHealthIndicator() { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.mail.host:smtp.acme.org", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.register(MailSenderAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); @@ -384,9 +384,9 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void notMailHealthIndicator() { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.mail.host:smtp.acme.org", "management.health.mail.enabled:false", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.register(MailSenderAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); @@ -400,8 +400,8 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void jmsHealthIndicator() { - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.register(ActiveMQAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); @@ -415,9 +415,9 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void notJmsHealthIndicator() { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.jms.enabled:false", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.register(ActiveMQAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); @@ -431,9 +431,9 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void elasticsearchHealthIndicator() { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.elasticsearch.properties.path.home:target", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.register(JestClientConfiguration.class, JestAutoConfiguration.class, ElasticsearchAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); @@ -448,8 +448,8 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void elasticsearchJestHealthIndicator() { - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.register(JestClientConfiguration.class, JestAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); @@ -463,10 +463,10 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void notElasticsearchHealthIndicator() { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.elasticsearch.enabled:false", "spring.data.elasticsearch.properties.path.home:target", - "management.health.diskspace.enabled:false"); + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.register(JestClientConfiguration.class, JestAutoConfiguration.class, ElasticsearchAutoConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); @@ -481,8 +481,8 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void cassandraHealthIndicator() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.register(CassandraConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); @@ -495,9 +495,9 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void notCassandraHealthIndicator() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.diskspace.enabled:false", - "management.health.cassandra.enabled:false"); + "management.health.cassandra.enabled:false").applyTo(this.context); this.context.register(CassandraConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); @@ -510,8 +510,8 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void couchbaseHealthIndicator() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.register(CouchbaseConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); @@ -524,9 +524,9 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void notCouchbaseHealthIndicator() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.diskspace.enabled:false", - "management.health.couchbase.enabled:false"); + "management.health.couchbase.enabled:false").applyTo(this.context); this.context.register(CouchbaseConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); @@ -539,8 +539,8 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void ldapHealthIndicator() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "management.health.diskspace.enabled:false"); + TestPropertyValues.of( + "management.health.diskspace.enabled:false").applyTo(this.context); this.context.register(LdapConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); @@ -553,9 +553,9 @@ public class HealthIndicatorAutoConfigurationTests { @Test public void notLdapHealthIndicator() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "management.health.diskspace.enabled:false", - "management.health.ldap.enabled:false"); + "management.health.ldap.enabled:false").applyTo(this.context); this.context.register(LdapConfiguration.class, ManagementServerProperties.class, HealthIndicatorAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointAutoConfigurationTests.java index 7e0e4b95d4..45dccae6cf 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/HealthMvcEndpointAutoConfigurationTests.java @@ -35,7 +35,7 @@ import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConf import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockHttpServletRequest; @@ -80,8 +80,8 @@ public class HealthMvcEndpointAutoConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); this.context.register(TestConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.security.enabled=false"); + TestPropertyValues.of( + "management.security.enabled=false").applyTo(this.context); this.context.refresh(); Health health = (Health) this.context.getBean(HealthMvcEndpoint.class) .invoke(null, null); @@ -96,8 +96,8 @@ public class HealthMvcEndpointAutoConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); this.context.register(TestConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "management.security.roles[0]=super"); + TestPropertyValues.of( + "management.security.roles[0]=super").applyTo(this.context); this.context.refresh(); HealthMvcEndpoint health = this.context.getBean(HealthMvcEndpoint.class); assertThat(ReflectionTestUtils.getField(health, "roles")) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/InfoContributorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/InfoContributorAutoConfigurationTests.java index 881365ec36..5f38957cef 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/InfoContributorAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/InfoContributorAutoConfigurationTests.java @@ -28,7 +28,7 @@ import org.springframework.boot.actuate.info.Info; import org.springframework.boot.actuate.info.InfoContributor; import org.springframework.boot.info.BuildProperties; import org.springframework.boot.info.GitProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -152,7 +152,7 @@ public class InfoContributorAutoConfigurationTests { context.register(config); } context.register(InfoContributorAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(context, environment); + TestPropertyValues.of(environment).applyTo(context); context.refresh(); this.context = context; } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java index b77160db8d..456addc36e 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/JolokiaAutoConfigurationTests.java @@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.server.WebServerFactoryCustomizerBeanPostProcessor; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; import org.springframework.boot.web.servlet.server.MockServletWebServerFactory; @@ -68,8 +68,8 @@ public class JolokiaAutoConfigurationTests { @Test public void agentServletRegisteredWithAppContext() throws Exception { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, "jolokia.config[key1]:value1", - "jolokia.config[key2]:value2"); + TestPropertyValues.of("jolokia.config[key1]:value1", + "jolokia.config[key2]:value2").applyTo(this.context); this.context.register(Config.class, WebMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, @@ -81,8 +81,8 @@ public class JolokiaAutoConfigurationTests { @Test public void agentServletWithCustomPath() throws Exception { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "endpoints.jolokia.path=/foo/bar"); + TestPropertyValues.of( + "endpoints.jolokia.path=/foo/bar").applyTo(this.context); this.context.register(EndpointsConfig.class, WebMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, @@ -113,7 +113,7 @@ public class JolokiaAutoConfigurationTests { private void assertEndpointDisabled(String... pairs) { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, pairs); + TestPropertyValues.of(pairs).applyTo(this.context); this.context.register(Config.class, WebMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, @@ -124,7 +124,7 @@ public class JolokiaAutoConfigurationTests { private void assertEndpointEnabled(String... pairs) { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, pairs); + TestPropertyValues.of(pairs).applyTo(this.context); this.context.register(Config.class, WebMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesNoSecurityTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesNoSecurityTests.java index d45e1af59e..0290a2c634 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesNoSecurityTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesNoSecurityTests.java @@ -23,7 +23,7 @@ import org.junit.runner.RunWith; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.assertj.core.api.Assertions.assertThat; @@ -54,7 +54,7 @@ public class ManagementServerPropertiesNoSecurityTests { public ManagementServerProperties load(String... environment) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, environment); + TestPropertyValues.of(environment).applyTo(context); context.register(Config.class); context.refresh(); this.context = context; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesTests.java index daddfc5024..68dad31299 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesTests.java @@ -20,7 +20,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.assertj.core.api.Assertions.assertThat; @@ -88,7 +88,7 @@ public class ManagementServerPropertiesTests { public ManagementServerProperties load(String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.register(Config.class); ctx.refresh(); this.context = ctx; diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java index 88337e8a45..b0e61b7f5c 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementWebSecurityAutoConfigurationTests.java @@ -32,7 +32,7 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.security.FallbackWebSecurityAutoConfiguration; import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockServletContext; @@ -91,7 +91,7 @@ public class ManagementWebSecurityAutoConfigurationTests { HttpMessageConvertersAutoConfiguration.class, EndpointAutoConfiguration.class, EndpointWebMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, AuditAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "security.basic.enabled:false"); + TestPropertyValues.of("security.basic.enabled:false").applyTo(this.context); this.context.refresh(); assertThat(this.context.getBean(AuthenticationManagerBuilder.class)).isNotNull(); FilterChainProxy filterChainProxy = this.context.getBean(FilterChainProxy.class); @@ -140,7 +140,7 @@ public class ManagementWebSecurityAutoConfigurationTests { ManagementWebSecurityAutoConfiguration.class, EndpointAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "security.ignored:none"); + TestPropertyValues.of("security.ignored:none").applyTo(this.context); this.context.refresh(); // Just the application and management endpoints now assertThat(this.context.getBean(FilterChainProxy.class).getFilterChains()) @@ -152,7 +152,7 @@ public class ManagementWebSecurityAutoConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); this.context.register(WebConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "security.basic.enabled:false"); + TestPropertyValues.of("security.basic.enabled:false").applyTo(this.context); this.context.refresh(); // Just the management endpoints (one filter) and ignores now plus the backup // filter on app endpoints @@ -233,7 +233,7 @@ public class ManagementWebSecurityAutoConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); this.context.register(WebConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "endpoints.sensitive:true"); + TestPropertyValues.of("endpoints.sensitive:true").applyTo(this.context); this.context.refresh(); MockMvc mockMvc = MockMvcBuilders.webAppContextSetup(this.context) // diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfigurationTests.java index 8460cc2665..e38f2022f1 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricExportAutoConfigurationTests.java @@ -34,7 +34,7 @@ import org.springframework.boot.actuate.metrics.statsd.StatsdMetricWriter; import org.springframework.boot.actuate.metrics.writer.GaugeWriter; import org.springframework.boot.actuate.metrics.writer.MetricWriter; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -148,8 +148,8 @@ public class MetricExportAutoConfigurationTests { @Test public void statsdWithHost() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.metrics.export.statsd.host=localhost"); + TestPropertyValues.of( + "spring.metrics.export.statsd.host=localhost").applyTo(this.context); this.context.register(MetricEndpointConfiguration.class, MetricExportAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java index 152de6052b..099c485beb 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java @@ -31,7 +31,7 @@ import org.mockito.stubbing.Answer; import org.springframework.boot.actuate.metrics.CounterService; import org.springframework.boot.actuate.metrics.GaugeService; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -234,8 +234,8 @@ public class MetricFilterAutoConfigurationTests { @Test public void skipsFilterIfPropertyDisabled() throws Exception { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, - "endpoints.metrics.filter.enabled:false"); + TestPropertyValues.of( + "endpoints.metrics.filter.enabled:false").applyTo(context); context.register(Config.class, MetricFilterAutoConfiguration.class); context.refresh(); assertThat(context.getBeansOfType(Filter.class).size()).isEqualTo(0); @@ -355,9 +355,9 @@ public class MetricFilterAutoConfigurationTests { throws Exception { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); context.register(Config.class, MetricFilterAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(context, + TestPropertyValues.of( "endpoints.metrics.filter.gauge-submissions=merged,per-http-method", - "endpoints.metrics.filter.counter-submissions=merged,per-http-method"); + "endpoints.metrics.filter.counter-submissions=merged,per-http-method").applyTo(context); context.refresh(); Filter filter = context.getBean(Filter.class); final MockHttpServletRequest request = new MockHttpServletRequest("PUT", @@ -387,9 +387,9 @@ public class MetricFilterAutoConfigurationTests { public void doesNotRecordRolledUpMetricsIfConfigured() throws Exception { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); context.register(Config.class, MetricFilterAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(context, + TestPropertyValues.of( "endpoints.metrics.filter.gauge-submissions=", - "endpoints.metrics.filter.counter-submissions="); + "endpoints.metrics.filter.counter-submissions=").applyTo(context); context.refresh(); Filter filter = context.getBean(Filter.class); final MockHttpServletRequest request = new MockHttpServletRequest("PUT", diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MvcEndpointPathConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MvcEndpointPathConfigurationTests.java index 1cbe80284b..876d69f535 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MvcEndpointPathConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/MvcEndpointPathConfigurationTests.java @@ -52,7 +52,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.logging.LoggingSystem; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockServletContext; @@ -117,10 +117,10 @@ public class MvcEndpointPathConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.register(TestConfiguration.class); this.context.setServletContext(new MockServletContext()); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "endpoints." + this.endpointName + ".path" + ":/custom/path", "endpoints." + this.endpointName + ".enabled:true", - "logging.file:target/test.log"); + "logging.file:target/test.log").applyTo(this.context); this.context.refresh(); assertThat(getConfiguredPath()).isEqualTo("/custom/path"); } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTests.java index 72acb33e5a..e03b9d763d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/TraceWebFilterAutoConfigurationTests.java @@ -25,7 +25,7 @@ import org.springframework.boot.actuate.trace.TraceProperties; import org.springframework.boot.actuate.trace.TraceRepository; import org.springframework.boot.actuate.trace.WebRequestTraceFilter; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -75,7 +75,7 @@ public class TraceWebFilterAutoConfigurationTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, environment); + TestPropertyValues.of(environment).applyTo(context); if (config != null) { context.register(config); } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java index 9b9697cea9..b4c4e02611 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java @@ -35,7 +35,7 @@ import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.http.HttpMethod; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockServletContext; @@ -119,8 +119,8 @@ public class CloudFoundryActuatorAutoConfigurationTests { @Test public void skipSslValidation() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "management.cloudfoundry.skipSslValidation:true"); + TestPropertyValues.of( + "management.cloudfoundry.skipSslValidation:true").applyTo(this.context); ConfigurationPropertySources.attach(this.context.getEnvironment()); this.context.refresh(); CloudFoundryEndpointHandlerMapping handlerMapping = getHandlerMapping(); @@ -137,8 +137,8 @@ public class CloudFoundryActuatorAutoConfigurationTests { @Test public void cloudFoundryPlatformActiveAndCloudControllerUrlNotPresent() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, "VCAP_APPLICATION:---", - "vcap.application.application_id:my-app-id"); + TestPropertyValues.of("VCAP_APPLICATION:---", + "vcap.application.application_id:my-app-id").applyTo(this.context); this.context.refresh(); CloudFoundryEndpointHandlerMapping handlerMapping = this.context.getBean( "cloudFoundryEndpointHandlerMapping", @@ -152,8 +152,8 @@ public class CloudFoundryActuatorAutoConfigurationTests { @Test public void cloudFoundryPathsIgnoredBySpringSecurity() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, "VCAP_APPLICATION:---", - "vcap.application.application_id:my-app-id"); + TestPropertyValues.of("VCAP_APPLICATION:---", + "vcap.application.application_id:my-app-id").applyTo(this.context); this.context.refresh(); IgnoredRequestCustomizer customizer = (IgnoredRequestCustomizer) this.context .getBean("cloudFoundryIgnoredRequestCustomizer"); @@ -179,17 +179,17 @@ public class CloudFoundryActuatorAutoConfigurationTests { @Test public void cloudFoundryManagementEndpointsDisabled() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, "VCAP_APPLICATION=---", - "management.cloudfoundry.enabled:false"); + TestPropertyValues.of("VCAP_APPLICATION=---", + "management.cloudfoundry.enabled:false").applyTo(this.context); this.context.refresh(); assertThat(this.context.containsBean("cloudFoundryEndpointHandlerMapping")) .isFalse(); } private CloudFoundryEndpointHandlerMapping getHandlerMapping() { - EnvironmentTestUtils.addEnvironment(this.context, "VCAP_APPLICATION:---", + TestPropertyValues.of("VCAP_APPLICATION:---", "vcap.application.application_id:my-app-id", - "vcap.application.cf_api:http://my-cloud-controller.com"); + "vcap.application.cf_api:http://my-cloud-controller.com").applyTo(this.context); this.context.refresh(); return this.context.getBean("cloudFoundryEndpointHandlerMapping", CloudFoundryEndpointHandlerMapping.class); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java index 4e33792526..7ab7fe9b2d 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/AbstractEndpointTests.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.PropertySource; @@ -89,7 +89,7 @@ public abstract class AbstractEndpointTests> { @Test public void idOverride() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, this.property + ".id:myid"); + TestPropertyValues.of(this.property + ".id:myid").applyTo(this.context); this.context.register(this.configClass); this.context.refresh(); assertThat(getEndpointBean().getId()).isEqualTo("myid"); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java index 372fa1c168..5f810016ec 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointMethodAnnotationsTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -56,8 +56,8 @@ public class ConfigurationPropertiesReportEndpointMethodAnnotationsTests { @SuppressWarnings("unchecked") public void testNaming() throws Exception { this.context.register(Config.class); - EnvironmentTestUtils.addEnvironment(this.context, "other.name:foo", - "first.name:bar"); + TestPropertyValues.of("other.name:foo", + "first.name:bar").applyTo(this.context); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = this.context .getBean(ConfigurationPropertiesReportEndpoint.class); @@ -73,7 +73,7 @@ public class ConfigurationPropertiesReportEndpointMethodAnnotationsTests { @SuppressWarnings("unchecked") public void testOverride() throws Exception { this.context.register(Other.class); - EnvironmentTestUtils.addEnvironment(this.context, "other.name:foo"); + TestPropertyValues.of("other.name:foo").applyTo(this.context); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = this.context .getBean(ConfigurationPropertiesReportEndpoint.class); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java index f9d87881b6..bcab102ddd 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointSerializationTests.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -63,7 +63,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { @SuppressWarnings("unchecked") public void testNaming() throws Exception { this.context.register(FooConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, "foo.name:foo"); + TestPropertyValues.of("foo.name:foo").applyTo(this.context); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = this.context .getBean(ConfigurationPropertiesReportEndpoint.class); @@ -83,7 +83,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { @SuppressWarnings("unchecked") public void testNestedNaming() throws Exception { this.context.register(FooConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, "foo.bar.name:foo"); + TestPropertyValues.of("foo.bar.name:foo").applyTo(this.context); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = this.context .getBean(ConfigurationPropertiesReportEndpoint.class); @@ -102,7 +102,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { @SuppressWarnings("unchecked") public void testCycle() throws Exception { this.context.register(CycleConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, "foo.name:foo"); + TestPropertyValues.of("foo.name:foo").applyTo(this.context); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = this.context .getBean(ConfigurationPropertiesReportEndpoint.class); @@ -122,7 +122,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { @SuppressWarnings("unchecked") public void testMap() throws Exception { this.context.register(MapConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, "foo.map.name:foo"); + TestPropertyValues.of("foo.map.name:foo").applyTo(this.context); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = this.context .getBean(ConfigurationPropertiesReportEndpoint.class); @@ -162,7 +162,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { @SuppressWarnings("unchecked") public void testList() throws Exception { this.context.register(ListConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, "foo.list[0]:foo"); + TestPropertyValues.of("foo.list[0]:foo").applyTo(this.context); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = this.context .getBean(ConfigurationPropertiesReportEndpoint.class); @@ -182,7 +182,7 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { @SuppressWarnings("unchecked") public void testInetAddress() throws Exception { this.context.register(AddressedConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, "foo.address:192.168.1.10"); + TestPropertyValues.of("foo.address:192.168.1.10").applyTo(this.context); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = this.context .getBean(ConfigurationPropertiesReportEndpoint.class); @@ -203,8 +203,8 @@ public class ConfigurationPropertiesReportEndpointSerializationTests { @SuppressWarnings("unchecked") public void testInitializedMapAndList() throws Exception { this.context.register(InitializedMapAndListPropertiesConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, "foo.map.entryOne:true", - "foo.list[0]:abc"); + TestPropertyValues.of("foo.map.entryOne:true", + "foo.list[0]:abc").applyTo(this.context); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = this.context .getBean(ConfigurationPropertiesReportEndpoint.class); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java index db9e820621..34b75a45e6 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/ConfigurationPropertiesReportEndpointTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -130,8 +130,8 @@ public class ConfigurationPropertiesReportEndpointTests @Test public void testKeySanitizationWithCustomKeysByEnvironment() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "endpoints.configprops.keys-to-sanitize:property"); + TestPropertyValues.of( + "endpoints.configprops.keys-to-sanitize:property").applyTo(this.context); this.context.register(Config.class); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = getEndpointBean(); @@ -147,8 +147,8 @@ public class ConfigurationPropertiesReportEndpointTests @Test public void testKeySanitizationWithCustomPatternByEnvironment() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "endpoints.configprops.keys-to-sanitize: .*pass.*"); + TestPropertyValues.of( + "endpoints.configprops.keys-to-sanitize: .*pass.*").applyTo(this.context); this.context.register(Config.class); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = getEndpointBean(); @@ -165,8 +165,8 @@ public class ConfigurationPropertiesReportEndpointTests public void testKeySanitizationWithCustomPatternAndKeyByEnvironment() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "endpoints.configprops.keys-to-sanitize: .*pass.*, property"); + TestPropertyValues.of( + "endpoints.configprops.keys-to-sanitize: .*pass.*, property").applyTo(this.context); this.context.register(Config.class); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = getEndpointBean(); @@ -184,8 +184,8 @@ public class ConfigurationPropertiesReportEndpointTests throws Exception { // gh-4415 this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "endpoints.configprops.keys-to-sanitize: .*\\.secrets\\..*, .*\\.hidden\\..*"); + TestPropertyValues.of( + "endpoints.configprops.keys-to-sanitize: .*\\.secrets\\..*, .*\\.hidden\\..*").applyTo(this.context); this.context.register(Config.class); this.context.refresh(); ConfigurationPropertiesReportEndpoint report = getEndpointBean(); diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java index f2a7ffc364..7d1a16b2fa 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/EnvironmentEndpointTests.java @@ -24,7 +24,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -151,8 +151,8 @@ public class EnvironmentEndpointTests extends AbstractEndpointTests config, String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(config); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.register(AopAutoConfiguration.class); ctx.refresh(); this.context = ctx; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java index 69cb9bbe5e..0daed75ffd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -53,7 +53,7 @@ import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfigurati import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.test.City; import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -263,7 +263,7 @@ public class BatchAutoConfigurationTests { private void load(Class[] configs, String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); if (configs != null) { ctx.register(configs); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java index da1d9bb490..676d3a829d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfigurationWithoutJpaTests.java @@ -34,7 +34,7 @@ import org.springframework.boot.autoconfigure.orm.jpa.test.City; import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration; import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.transaction.PlatformTransactionManager; @@ -100,7 +100,7 @@ public class BatchAutoConfigurationWithoutJpaTests { private void load(Class[] configs, String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); if (configs != null) { ctx.register(configs); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java index 7f40b3e1fe..b21435256f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cache/CacheAutoConfigurationTests.java @@ -58,7 +58,7 @@ import org.springframework.boot.autoconfigure.cache.support.MockCachingProvider; import org.springframework.boot.autoconfigure.hazelcast.HazelcastAutoConfiguration; import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.cache.Cache; import org.springframework.cache.CacheManager; import org.springframework.cache.annotation.CachingConfigurerSupport; @@ -697,7 +697,7 @@ public class CacheAutoConfigurationTests { private void load(Class[] configs, String... environment) { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.register(configs); applicationContext.register(CacheAutoConfiguration.class); applicationContext.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java index 5707df4502..e3cda12e07 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/cassandra/CassandraAutoConfigurationTests.java @@ -21,7 +21,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -91,7 +91,7 @@ public class CassandraAutoConfigurationTests { } ctx.register(PropertyPlaceholderAutoConfiguration.class, CassandraAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.refresh(); this.context = ctx; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java index eb7f995fb0..514076d4d9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AllNestedConditionsTests.java @@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.condition; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Condition; @@ -64,7 +64,7 @@ public class AllNestedConditionsTests { private AnnotationConfigApplicationContext load(Class config, String... env) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, env); + TestPropertyValues.of(env).applyTo(context); context.register(config); context.refresh(); return context; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java index a11b93ac3c..4021f47692 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/AnyNestedConditionTests.java @@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.condition; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Condition; @@ -67,7 +67,7 @@ public class AnyNestedConditionTests { private AnnotationConfigApplicationContext load(Class config, String... env) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, env); + TestPropertyValues.of(env).applyTo(context); context.register(config); context.refresh(); return context; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java index d5d1909456..7b952cb206 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionEvaluationReportTests.java @@ -32,7 +32,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionEvaluationRepor import org.springframework.boot.autoconfigure.condition.ConditionEvaluationReport.ConditionAndOutcomes; import org.springframework.boot.autoconfigure.web.servlet.MultipartAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.testutil.Matched; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -227,7 +227,7 @@ public class ConditionEvaluationReportTests { @Test public void negativeOuterPositiveInnerBean() throws Exception { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, "test.present=true"); + TestPropertyValues.of("test.present=true").applyTo(context); context.register(NegativeOuterConfig.class); context.refresh(); ConditionEvaluationReport report = ConditionEvaluationReport diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java index 4f8dfe1cdc..53f1eaf1ad 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBeanTests.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -124,7 +124,7 @@ public class ConditionalOnBeanTests { @Test public void withPropertyPlaceholderClassName() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, "mybeanclass=java.lang.String"); + TestPropertyValues.of("mybeanclass=java.lang.String").applyTo(this.context); this.context.register(PropertySourcesPlaceholderConfigurer.class, WithPropertyPlaceholderClassName.class, OnBeanClassConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java index 9d9aa5a5a0..1765a15f00 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnCloudPlatformTests.java @@ -20,7 +20,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.boot.cloud.CloudPlatform; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -62,7 +62,7 @@ public class ConditionalOnCloudPlatformTests { } private void load(Class config, String... environment) { - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); this.context.register(config); this.context.refresh(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java index 7d3c4e104f..2725f05b32 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnJndiTests.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.jndi.JndiPropertiesHidingClassLoader; import org.springframework.boot.autoconfigure.jndi.TestableInitialContextFactory; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -133,7 +133,7 @@ public class ConditionalOnJndiTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.register(config); applicationContext.register(JndiConditionConfiguration.class); applicationContext.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java index 95c0c63e2a..25d574ce40 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBeanTests.java @@ -32,7 +32,7 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.boot.autoconfigure.condition.scan.ScannedFactoryBeanConfiguration; import org.springframework.boot.autoconfigure.condition.scan.ScannedFactoryBeanWithBeanMethodArgumentsConfiguration; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -176,7 +176,7 @@ public class ConditionalOnMissingBeanTests { this.context.register(FactoryBeanWithBeanMethodArgumentsConfiguration.class, ConditionalOnFactoryBean.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "theValue:foo"); + TestPropertyValues.of("theValue:foo").applyTo(this.context); this.context.refresh(); assertThat(this.context.getBean(ExampleBean.class).toString()) .isEqualTo("fromFactory"); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java index d0c3d4344d..c59e927262 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnPropertyTests.java @@ -28,7 +28,7 @@ import org.junit.rules.ExpectedException; import org.springframework.boot.WebApplicationType; import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -258,7 +258,7 @@ public class ConditionalOnPropertyTests { } private void load(Class config, String... environment) { - EnvironmentTestUtils.addEnvironment(this.environment, environment); + TestPropertyValues.of(environment).applyTo(this.environment); this.context = new SpringApplicationBuilder(config).environment(this.environment) .web(WebApplicationType.NONE).run(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java index 9f1d133566..6d2829a941 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ConditionalOnResourceTests.java @@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.condition; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -44,7 +44,7 @@ public class ConditionalOnResourceTests { @Test public void testResourceExistsWithPlaceholder() { - EnvironmentTestUtils.addEnvironment(this.context, "schema=schema.sql"); + TestPropertyValues.of("schema=schema.sql").applyTo(this.context); this.context.register(PlaceholderConfiguration.class); this.context.refresh(); assertThat(this.context.containsBean("foo")).isTrue(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java index 3d584834ad..7d4e5bb1b8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/NoneNestedConditionsTests.java @@ -18,7 +18,7 @@ package org.springframework.boot.autoconfigure.condition; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Condition; @@ -64,7 +64,7 @@ public class NoneNestedConditionsTests { private AnnotationConfigApplicationContext load(Class config, String... env) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, env); + TestPropertyValues.of(env).applyTo(context); context.register(config); context.refresh(); return context; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java index 71f7a26a56..d871d41eda 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/condition/ResourceConditionTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.condition; import org.junit.After; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -65,7 +65,7 @@ public class ResourceConditionTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.register(config); applicationContext.refresh(); this.context = applicationContext; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java index a8eec3cb9b..f8b406639f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/ConfigurationPropertiesAutoConfigurationTests.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; @@ -59,7 +59,7 @@ public class ConfigurationPropertiesAutoConfigurationTests { private void load(Class[] configs, String... environment) { this.context = new AnnotationConfigApplicationContext(); this.context.register(configs); - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); this.context.refresh(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java index 46f76d8e70..beaa29d353 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/MessageSourceAutoConfigurationTests.java @@ -22,7 +22,7 @@ import org.junit.After; import org.junit.Ignore; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.MessageSource; import org.springframework.context.MessageSourceResolvable; @@ -147,8 +147,8 @@ public class MessageSourceAutoConfigurationTests { parent.refresh(); this.context = new AnnotationConfigApplicationContext(); this.context.setParent(parent); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.messages.basename:test/messages"); + TestPropertyValues.of( + "spring.messages.basename:test/messages").applyTo(this.context); this.context.register(MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); @@ -159,7 +159,7 @@ public class MessageSourceAutoConfigurationTests { private void load(String... environment) { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); this.context.register(MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java index 4acb7d7911..5c54a3fe66 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/context/PropertyPlaceholderAutoConfigurationTests.java @@ -20,7 +20,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -49,7 +49,7 @@ public class PropertyPlaceholderAutoConfigurationTests { public void propertyPlaceholders() throws Exception { this.context.register(PropertyPlaceholderAutoConfiguration.class, PlaceholderConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, "foo:two"); + TestPropertyValues.of("foo:two").applyTo(this.context); this.context.refresh(); assertThat(this.context.getBean(PlaceholderConfig.class).getFoo()) .isEqualTo("two"); @@ -59,7 +59,7 @@ public class PropertyPlaceholderAutoConfigurationTests { public void propertyPlaceholdersOverride() throws Exception { this.context.register(PropertyPlaceholderAutoConfiguration.class, PlaceholderConfig.class, PlaceholdersOverride.class); - EnvironmentTestUtils.addEnvironment(this.context, "foo:two"); + TestPropertyValues.of("foo:two").applyTo(this.context); this.context.refresh(); assertThat(this.context.getBean(PlaceholderConfig.class).getFoo()) .isEqualTo("spam"); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/AbstractCouchbaseAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/AbstractCouchbaseAutoConfigurationTests.java index cf7a84a119..69d00e5002 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/AbstractCouchbaseAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/AbstractCouchbaseAutoConfigurationTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.couchbase; import org.junit.After; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; /** @@ -40,7 +40,7 @@ public abstract class AbstractCouchbaseAutoConfigurationTests { protected void load(Class config, String... environment) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, environment); + TestPropertyValues.of(environment).applyTo(context); if (config != null) { context.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java index 5f0db8ddf7..198af45167 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/couchbase/OnBootstrapHostsConditionTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.couchbase; import org.junit.After; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; @@ -75,7 +75,7 @@ public class OnBootstrapHostsConditionTests { private void load(Class config, String... environment) { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); this.context.register(config); this.context.refresh(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java index 0e4c1fdc78..e2675831b2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfigurationTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -66,8 +66,8 @@ public class PersistenceExceptionTranslationAutoConfigurationTests { @Test public void exceptionTranslationPostProcessorCanBeConfiguredToUseJdkProxy() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.aop.proxy-target-class=false"); + TestPropertyValues.of( + "spring.aop.proxy-target-class=false").applyTo(this.context); this.context.register(PersistenceExceptionTranslationAutoConfiguration.class); this.context.refresh(); Map beans = this.context @@ -79,8 +79,8 @@ public class PersistenceExceptionTranslationAutoConfigurationTests { @Test public void exceptionTranslationPostProcessorCanBeDisabled() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.dao.exceptiontranslation.enabled=false"); + TestPropertyValues.of( + "spring.dao.exceptiontranslation.enabled=false").applyTo(this.context); this.context.register(PersistenceExceptionTranslationAutoConfiguration.class); this.context.refresh(); Map beans = this.context diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java index 2951bdc44c..24d9177234 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationIntegrationTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.AutoConfigurationPackages; import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration; import org.springframework.boot.autoconfigure.data.cassandra.city.City; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.cassandra.config.CassandraSessionFactoryBean; import org.springframework.data.cassandra.config.SchemaAction; @@ -71,9 +71,9 @@ public class CassandraDataAutoConfigurationIntegrationTests { this.context = new AnnotationConfigApplicationContext(); String cityPackage = City.class.getPackage().getName(); AutoConfigurationPackages.register(this.context, cityPackage); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.cassandra.schemaAction=recreate_drop_unused", - "spring.data.cassandra.keyspaceName=boot_test"); + "spring.data.cassandra.keyspaceName=boot_test").applyTo(this.context); this.context.register(CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java index 73cbfa6f93..7e9699a601 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraDataAutoConfigurationTests.java @@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfigurati import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.data.cassandra.city.City; import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -60,8 +60,8 @@ public class CassandraDataAutoConfigurationTests { @Test public void templateExists() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.cassandra.keyspaceName:boot_test"); + TestPropertyValues.of( + "spring.data.cassandra.keyspaceName:boot_test").applyTo(this.context); this.context.register(TestExcludeConfiguration.class, TestConfiguration.class, PropertyPlaceholderAutoConfiguration.class, CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class); @@ -74,7 +74,7 @@ public class CassandraDataAutoConfigurationTests { @SuppressWarnings("unchecked") public void entityScanShouldSetInitialEntitySet() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.cassandra.keyspaceName:boot_test"); this.context.register(TestConfiguration.class, EntityScanConfig.class, PropertyPlaceholderAutoConfiguration.class, @@ -90,8 +90,8 @@ public class CassandraDataAutoConfigurationTests { @Test public void userTypeResolverShouldBeSet() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.cassandra.keyspaceName:boot_test"); + TestPropertyValues.of( + "spring.data.cassandra.keyspaceName:boot_test").applyTo(this.context); this.context.register(TestConfiguration.class, PropertyPlaceholderAutoConfiguration.class, CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java index 45b80bb50c..3708638c6a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.cassandra.CassandraAutoConfiguration; import org.springframework.boot.autoconfigure.data.cassandra.city.City; import org.springframework.boot.autoconfigure.domain.EntityScan; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -88,7 +88,7 @@ public class CassandraReactiveDataAutoConfigurationTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); if (config != null) { ctx.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java index 5a75ba877c..7187644fae 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseDataAutoConfigurationTests.java @@ -29,7 +29,7 @@ import org.springframework.boot.autoconfigure.couchbase.CouchbaseTestConfigurer; import org.springframework.boot.autoconfigure.data.couchbase.city.City; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.validation.ValidationAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -135,7 +135,7 @@ public class CouchbaseDataAutoConfigurationTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, environment); + TestPropertyValues.of(environment).applyTo(context); if (config != null) { context.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java index 051465633a..0d419baa4a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/couchbase/CouchbaseRepositoriesAutoConfigurationTests.java @@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.couchbase.CouchbaseTestConfigurer; import org.springframework.boot.autoconfigure.data.couchbase.city.City; import org.springframework.boot.autoconfigure.data.couchbase.city.CityRepository; import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -77,7 +77,7 @@ public class CouchbaseRepositoriesAutoConfigurationTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, environment); + TestPropertyValues.of(environment).applyTo(context); if (config != null) { context.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java index 5941467e1f..65eb45889d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchAutoConfigurationTests.java @@ -25,7 +25,7 @@ import org.junit.rules.ExpectedException; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -55,9 +55,9 @@ public class ElasticsearchAutoConfigurationTests { @Test public void createNodeClientWithDefaults() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.elasticsearch.properties.foo.bar:baz", - "spring.data.elasticsearch.properties.path.home:target"); + "spring.data.elasticsearch.properties.path.home:target").applyTo(this.context); this.context.register(PropertyPlaceholderAutoConfiguration.class, ElasticsearchAutoConfiguration.class); this.context.refresh(); @@ -71,12 +71,12 @@ public class ElasticsearchAutoConfigurationTests { @Test public void createNodeClientWithOverrides() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.elasticsearch.properties.foo.bar:baz", "spring.data.elasticsearch.properties.path.home:target", "spring.data.elasticsearch.properties.node.local:false", "spring.data.elasticsearch.properties.node.data:true", - "spring.data.elasticsearch.properties.http.enabled:true"); + "spring.data.elasticsearch.properties.http.enabled:true").applyTo(this.context); this.context.register(PropertyPlaceholderAutoConfiguration.class, ElasticsearchAutoConfiguration.class); this.context.refresh(); @@ -105,9 +105,9 @@ public class ElasticsearchAutoConfigurationTests { // We don't have a local elasticsearch server so use an address that's missing // a port and check the exception this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.elasticsearch.cluster-nodes:localhost", - "spring.data.elasticsearch.properties.path.home:target"); + "spring.data.elasticsearch.properties.path.home:target").applyTo(this.context); this.context.register(PropertyPlaceholderAutoConfiguration.class, ElasticsearchAutoConfiguration.class); this.thrown.expect(BeanCreationException.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java index 46619269f0..d17177e672 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java @@ -20,7 +20,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.elasticsearch.core.ElasticsearchTemplate; import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter; @@ -48,9 +48,9 @@ public class ElasticsearchDataAutoConfigurationTests { @Test public void templateExists() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.elasticsearch.properties.path.data:target/data", - "spring.data.elasticsearch.properties.path.logs:target/logs"); + "spring.data.elasticsearch.properties.path.logs:target/logs").applyTo(this.context); this.context.register(PropertyPlaceholderAutoConfiguration.class, ElasticsearchAutoConfiguration.class, ElasticsearchDataAutoConfiguration.class); @@ -62,7 +62,7 @@ public class ElasticsearchDataAutoConfigurationTests { @Test public void mappingContextExists() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.elasticsearch.properties.path.data:target/data", "spring.data.elasticsearch.properties.path.logs:target/logs"); this.context.register(PropertyPlaceholderAutoConfiguration.class, @@ -77,7 +77,7 @@ public class ElasticsearchDataAutoConfigurationTests { @Test public void converterExists() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.elasticsearch.properties.path.data:target/data", "spring.data.elasticsearch.properties.path.logs:target/logs"); this.context.register(PropertyPlaceholderAutoConfiguration.class, diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java index b3ad7eab71..06f9f37ecd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchRepositoriesAutoConfigurationTests.java @@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.data.alt.elasticsearch.CityElastic import org.springframework.boot.autoconfigure.data.elasticsearch.city.City; import org.springframework.boot.autoconfigure.data.elasticsearch.city.CityRepository; import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; @@ -88,8 +88,8 @@ public class ElasticsearchRepositoriesAutoConfigurationTests { } private void addElasticsearchProperties(AnnotationConfigApplicationContext context) { - EnvironmentTestUtils.addEnvironment(context, - "spring.data.elasticsearch.properties.path.home:target"); + TestPropertyValues.of( + "spring.data.elasticsearch.properties.path.home:target").applyTo(context); } @Configuration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapDataAutoConfigurationTests.java index 537eb69453..b4181f8dce 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapDataAutoConfigurationTests.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.ldap.core.LdapTemplate; @@ -46,8 +46,8 @@ public class LdapDataAutoConfigurationTests { @Test public void templateExists() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.ldap.urls:ldap://localhost:389"); + TestPropertyValues.of( + "spring.ldap.urls:ldap://localhost:389").applyTo(this.context); this.context.register(PropertyPlaceholderAutoConfiguration.class, LdapAutoConfiguration.class, LdapDataAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java index 09b3004d48..6a093dd026 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/ldap/LdapRepositoriesAutoConfigurationTests.java @@ -26,7 +26,7 @@ import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage; import org.springframework.boot.autoconfigure.data.ldap.person.Person; import org.springframework.boot.autoconfigure.data.ldap.person.PersonRepository; import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.data.ldap.repository.config.EnableLdapRepositories; @@ -69,8 +69,8 @@ public class LdapRepositoriesAutoConfigurationTests { private void load(Class... configurationClasses) { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.ldap.urls:ldap://localhost:389"); + TestPropertyValues.of( + "spring.ldap.urls:ldap://localhost:389").applyTo(this.context); this.context.register(configurationClasses); this.context.register(LdapAutoConfiguration.class, LdapDataAutoConfiguration.class, LdapRepositoriesAutoConfiguration.class, diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java index d06dc9c0e6..e7cb00677f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MixedMongoRepositoriesAutoConfigurationTests.java @@ -33,7 +33,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfigurationTests; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -62,8 +62,8 @@ public class MixedMongoRepositoriesAutoConfigurationTests { @Test public void testDefaultRepositoryConfiguration() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:false"); + TestPropertyValues.of( + "spring.datasource.initialize:false").applyTo(this.context); this.context.register(TestConfiguration.class, BaseConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(CountryRepository.class)).isNotNull(); @@ -72,8 +72,8 @@ public class MixedMongoRepositoriesAutoConfigurationTests { @Test public void testMixedRepositoryConfiguration() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:false"); + TestPropertyValues.of( + "spring.datasource.initialize:false").applyTo(this.context); this.context.register(MixedConfiguration.class, BaseConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(CountryRepository.class)).isNotNull(); @@ -83,8 +83,8 @@ public class MixedMongoRepositoriesAutoConfigurationTests { @Test public void testJpaRepositoryConfigurationWithMongoTemplate() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:false"); + TestPropertyValues.of( + "spring.datasource.initialize:false").applyTo(this.context); this.context.register(JpaConfiguration.class, BaseConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(CityRepository.class)).isNotNull(); @@ -93,8 +93,8 @@ public class MixedMongoRepositoriesAutoConfigurationTests { @Test public void testJpaRepositoryConfigurationWithMongoOverlap() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:false"); + TestPropertyValues.of( + "spring.datasource.initialize:false").applyTo(this.context); this.context.register(OverlapConfiguration.class, BaseConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(CityRepository.class)).isNotNull(); @@ -104,9 +104,9 @@ public class MixedMongoRepositoriesAutoConfigurationTests { public void testJpaRepositoryConfigurationWithMongoOverlapDisabled() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false", - "spring.data.mongodb.repositories.enabled:false"); + "spring.data.mongodb.repositories.enabled:false").applyTo(this.context); this.context.register(OverlapConfiguration.class, BaseConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(CityRepository.class)).isNotNull(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java index fddcaa5664..9769747f30 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoDataAutoConfigurationTests.java @@ -35,7 +35,7 @@ import org.springframework.boot.autoconfigure.data.mongo.city.City; import org.springframework.boot.autoconfigure.data.mongo.country.Country; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -86,7 +86,7 @@ public class MongoDataAutoConfigurationTests { @Test public void gridFsTemplateExists() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.mongodb.gridFsDatabase:grid"); this.context.register(PropertyPlaceholderAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class); @@ -180,8 +180,8 @@ public class MongoDataAutoConfigurationTests { Class expectedType) { this.context = new AnnotationConfigApplicationContext(); if (strategy != null) { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.mongodb.field-naming-strategy:" + strategy); + TestPropertyValues.of( + "spring.data.mongodb.field-naming-strategy:" + strategy).applyTo(this.context); } this.context.register(PropertyPlaceholderAutoConfiguration.class, MongoAutoConfiguration.class, MongoDataAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java index c72d55ed11..58098b0a4e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java @@ -28,7 +28,7 @@ import org.springframework.boot.autoconfigure.data.mongo.city.ReactiveCityReposi import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfigurationTests; import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -58,8 +58,8 @@ public class MongoReactiveAndBlockingRepositoriesAutoConfigurationTests { public void shouldCreateInstancesForReactiveAndBlockingRepositories() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:false"); + TestPropertyValues.of( + "spring.datasource.initialize:false").applyTo(this.context); this.context.register(BlockingAndReactiveConfiguration.class, BaseConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java index 241d006c16..1336582ab9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/MixedNeo4jRepositoriesAutoConfigurationTests.java @@ -33,7 +33,7 @@ import org.springframework.boot.autoconfigure.data.neo4j.empty.EmptyMarker; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -64,8 +64,8 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { @Test public void testDefaultRepositoryConfiguration() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:false"); + TestPropertyValues.of( + "spring.datasource.initialize:false").applyTo(this.context); this.context.register(TestConfiguration.class, BaseConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(CountryRepository.class)).isNotNull(); @@ -73,7 +73,7 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { @Test public void testMixedRepositoryConfiguration() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false"); this.context.register(MixedConfiguration.class, BaseConfiguration.class); this.context.refresh(); @@ -83,8 +83,8 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { @Test public void testJpaRepositoryConfigurationWithNeo4jTemplate() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:false"); + TestPropertyValues.of( + "spring.datasource.initialize:false").applyTo(this.context); this.context.register(JpaConfiguration.class, BaseConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(CityRepository.class)).isNotNull(); @@ -93,8 +93,8 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { @Test @Ignore public void testJpaRepositoryConfigurationWithNeo4jOverlap() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:false"); + TestPropertyValues.of( + "spring.datasource.initialize:false").applyTo(this.context); this.context.register(OverlapConfiguration.class, BaseConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(CityRepository.class)).isNotNull(); @@ -103,9 +103,9 @@ public class MixedNeo4jRepositoriesAutoConfigurationTests { @Test public void testJpaRepositoryConfigurationWithNeo4jOverlapDisabled() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false", - "spring.data.neo4j.repositories.enabled:false"); + "spring.data.neo4j.repositories.enabled:false").applyTo(this.context); this.context.register(OverlapConfiguration.class, BaseConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(CityRepository.class)).isNotNull(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java index 7c9ff49744..35434723f2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jDataAutoConfigurationTests.java @@ -32,7 +32,7 @@ import org.springframework.boot.autoconfigure.data.neo4j.city.City; import org.springframework.boot.autoconfigure.data.neo4j.country.Country; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -141,7 +141,7 @@ public class Neo4jDataAutoConfigurationTests { private void load(Class config, String... environment) { AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); if (config != null) { ctx.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java index 2fc24742bc..3b9ff023f3 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jPropertiesTests.java @@ -27,7 +27,7 @@ import org.neo4j.ogm.config.Configuration; import org.neo4j.ogm.config.Credentials; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.assertj.core.api.Assertions.assertThat; @@ -182,7 +182,7 @@ public class Neo4jPropertiesTests { } }); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.register(TestConfiguration.class); ctx.refresh(); this.context = ctx; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java index 62b2eadeb2..0a02ebd4ae 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/neo4j/Neo4jRepositoriesAutoConfigurationTests.java @@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.data.alt.neo4j.CityNeo4jRepository import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage; import org.springframework.boot.autoconfigure.data.neo4j.city.City; import org.springframework.boot.autoconfigure.data.neo4j.city.CityRepository; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.data.neo4j.mapping.Neo4jMappingContext; @@ -82,8 +82,8 @@ public class Neo4jRepositoriesAutoConfigurationTests { private void prepareApplicationContext(Class... configurationClasses) { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.neo4j.uri=http://localhost:9797"); + TestPropertyValues.of( + "spring.data.neo4j.uri=http://localhost:9797").applyTo(this.context); this.context.register(configurationClasses); this.context.register(Neo4jDataAutoConfiguration.class, Neo4jRepositoriesAutoConfiguration.class, diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java index ac1b887f9b..ed76ff0485 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationJedisTests.java @@ -26,7 +26,7 @@ import redis.clients.jedis.Jedis; import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.util.StringUtils; @@ -131,7 +131,7 @@ public class RedisAutoConfigurationJedisTests { private void load(String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.register(RedisAutoConfiguration.class); ctx.refresh(); this.context = ctx; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java index 1dfe9ac2a2..aafecf1762 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisAutoConfigurationTests.java @@ -26,7 +26,7 @@ import io.lettuce.core.api.StatefulRedisConnection; import org.junit.After; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.redis.connection.lettuce.DefaultLettucePool; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; @@ -191,7 +191,7 @@ public class RedisAutoConfigurationTests { private void load(String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.register(RedisAutoConfiguration.class); ctx.refresh(); this.context = ctx; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfigurationTests.java index c852e2746d..5991f5a841 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/redis/RedisReactiveAutoConfigurationTests.java @@ -21,7 +21,7 @@ import java.util.Map; import org.junit.After; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.redis.core.ReactiveRedisTemplate; @@ -52,7 +52,7 @@ public class RedisReactiveAutoConfigurationTests { private void load(String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.register(RedisAutoConfiguration.class, RedisReactiveAutoConfiguration.class); ctx.refresh(); this.context = ctx; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java index 3e3462284d..67316e7ec2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java @@ -33,7 +33,7 @@ import org.springframework.boot.autoconfigure.data.jpa.city.City; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -175,7 +175,7 @@ public class RepositoryRestMvcAutoConfigurationTests { AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext(); applicationContext.setServletContext(new MockServletContext()); applicationContext.register(config, BaseConfiguration.class); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.refresh(); this.context = applicationContext; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java index bbd1196306..7fc81153d8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/diagnostics/analyzer/NoSuchBeanDefinitionFailureAnalyzerTests.java @@ -34,7 +34,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.diagnostics.FailureAnalysis; import org.springframework.boot.diagnostics.LoggingFailureAnalysisReporter; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -237,7 +237,7 @@ public class NoSuchBeanDefinitionFailureAnalyzerTests { private FatalBeanException createFailure(Class config, String... environment) { try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext()) { this.analyzer.setBeanFactory(context.getBeanFactory()); - EnvironmentTestUtils.addEnvironment(context, environment); + TestPropertyValues.of(environment).applyTo(context); context.register(config); context.refresh(); return null; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java index cdc9583406..a4333d6e2d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestAutoConfigurationTests.java @@ -36,7 +36,7 @@ import org.junit.rules.ExpectedException; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration; import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -129,7 +129,7 @@ public class JestAutoConfigurationTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, environment); + TestPropertyValues.of(environment).applyTo(context); if (config != null) { context.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java index 2b2ab70744..6ab718e627 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfigurationTests.java @@ -41,7 +41,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -76,8 +76,8 @@ public class FlywayAutoConfigurationTests { @Before public void init() { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.name:flywaytest"); + TestPropertyValues.of( + "spring.datasource.name:flywaytest").applyTo(this.context); } @After @@ -96,8 +96,8 @@ public class FlywayAutoConfigurationTests { @Test public void createDataSource() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "flyway.url:jdbc:hsqldb:mem:flywaytest", "flyway.user:sa"); + TestPropertyValues.of( + "flyway.url:jdbc:hsqldb:mem:flywaytest", "flyway.user:sa").applyTo(this.context); registerAndRefresh(EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -126,8 +126,8 @@ public class FlywayAutoConfigurationTests { @Test public void overrideLocations() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "flyway.locations:classpath:db/changelog,classpath:db/migration"); + TestPropertyValues.of( + "flyway.locations:classpath:db/changelog,classpath:db/migration").applyTo(this.context); registerAndRefresh(EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -138,9 +138,9 @@ public class FlywayAutoConfigurationTests { @Test public void overrideLocationsList() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "flyway.locations[0]:classpath:db/changelog", - "flyway.locations[1]:classpath:db/migration"); + "flyway.locations[1]:classpath:db/migration").applyTo(this.context); registerAndRefresh(EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -151,7 +151,7 @@ public class FlywayAutoConfigurationTests { @Test public void overrideSchemas() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, "flyway.schemas:public"); + TestPropertyValues.of("flyway.schemas:public").applyTo(this.context); registerAndRefresh(EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -161,8 +161,8 @@ public class FlywayAutoConfigurationTests { @Test public void changeLogDoesNotExist() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "flyway.locations:file:no-such-dir"); + TestPropertyValues.of( + "flyway.locations:file:no-such-dir").applyTo(this.context); this.thrown.expect(BeanCreationException.class); registerAndRefresh(EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class, @@ -171,9 +171,9 @@ public class FlywayAutoConfigurationTests { @Test public void checkLocationsAllMissing() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "flyway.locations:classpath:db/missing1,classpath:db/migration2", - "flyway.check-location:true"); + "flyway.check-location:true").applyTo(this.context); this.thrown.expect(BeanCreationException.class); this.thrown.expectMessage("Cannot find migrations location in"); registerAndRefresh(EmbeddedDataSourceConfiguration.class, @@ -183,9 +183,9 @@ public class FlywayAutoConfigurationTests { @Test public void checkLocationsAllExist() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "flyway.locations:classpath:db/changelog,classpath:db/migration", - "flyway.check-location:true"); + "flyway.check-location:true").applyTo(this.context); registerAndRefresh(EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -220,7 +220,7 @@ public class FlywayAutoConfigurationTests { @Test public void overrideBaselineVersionString() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, "flyway.baseline-version=0"); + TestPropertyValues.of("flyway.baseline-version=0").applyTo(this.context); registerAndRefresh(EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -245,8 +245,8 @@ public class FlywayAutoConfigurationTests { @Test public void useVendorDirectory() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "flyway.locations=classpath:db/vendors/{vendor},classpath:db/changelog"); + TestPropertyValues.of( + "flyway.locations=classpath:db/vendors/{vendor},classpath:db/changelog").applyTo(this.context); registerAndRefresh(EmbeddedDataSourceConfiguration.class, FlywayAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java index b9103518ae..d7cc3fabcd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerAutoConfigurationTests.java @@ -28,7 +28,7 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.boot.test.rule.OutputCapture; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -202,7 +202,7 @@ public class FreeMarkerAutoConfigurationTests { } private void registerAndRefreshContext(String... env) { - EnvironmentTestUtils.addEnvironment(this.context, env); + TestPropertyValues.of(env).applyTo(this.context); this.context.register(FreeMarkerAutoConfiguration.class); this.context.refresh(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java index 737200541d..9a7aac8763 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java @@ -30,7 +30,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.core.io.ClassPathResource; import org.springframework.mock.web.MockHttpServletRequest; @@ -101,8 +101,8 @@ public class GroovyTemplateAutoConfigurationTests { @Test public void disableViewResolution() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.groovy.template.enabled:false"); + TestPropertyValues.of( + "spring.groovy.template.enabled:false").applyTo(this.context); registerAndRefreshContext(); assertThat(this.context.getBeanNamesForType(ViewResolver.class)).isEmpty(); } @@ -179,7 +179,7 @@ public class GroovyTemplateAutoConfigurationTests { } private void registerAndRefreshContext(String... env) { - EnvironmentTestUtils.addEnvironment(this.context, env); + TestPropertyValues.of(env).applyTo(this.context); this.context.register(GroovyTemplateAutoConfiguration.class); this.context.refresh(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java index 86f3bd5c70..6341f887e9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/h2/H2ConsoleAutoConfigurationTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.beans.factory.BeanCreationException; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; @@ -66,8 +66,8 @@ public class H2ConsoleAutoConfigurationTests { @Test public void propertyCanEnableConsole() { this.context.register(H2ConsoleAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.h2.console.enabled:true"); + TestPropertyValues.of( + "spring.h2.console.enabled:true").applyTo(this.context); this.context.refresh(); assertThat(this.context.getBeansOfType(ServletRegistrationBean.class)).hasSize(1); ServletRegistrationBean registrationBean = this.context @@ -83,16 +83,16 @@ public class H2ConsoleAutoConfigurationTests { this.thrown.expect(BeanCreationException.class); this.thrown.expectMessage("Failed to bind properties under 'spring.h2.console'"); this.context.register(H2ConsoleAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.h2.console.enabled:true", "spring.h2.console.path:custom"); + TestPropertyValues.of( + "spring.h2.console.enabled:true", "spring.h2.console.path:custom").applyTo(this.context); this.context.refresh(); } @Test public void customPathWithTrailingSlash() { this.context.register(H2ConsoleAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.h2.console.enabled:true", "spring.h2.console.path:/custom/"); + TestPropertyValues.of( + "spring.h2.console.enabled:true", "spring.h2.console.path:/custom/").applyTo(this.context); this.context.refresh(); assertThat(this.context.getBeansOfType(ServletRegistrationBean.class)).hasSize(1); ServletRegistrationBean servletRegistrationBean = this.context @@ -103,8 +103,8 @@ public class H2ConsoleAutoConfigurationTests { @Test public void customPath() { this.context.register(H2ConsoleAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.h2.console.enabled:true", "spring.h2.console.path:/custom"); + TestPropertyValues.of( + "spring.h2.console.enabled:true", "spring.h2.console.path:/custom").applyTo(this.context); this.context.refresh(); assertThat(this.context.getBeansOfType(ServletRegistrationBean.class)).hasSize(1); ServletRegistrationBean servletRegistrationBean = this.context @@ -115,9 +115,9 @@ public class H2ConsoleAutoConfigurationTests { @Test public void customInitParameters() { this.context.register(H2ConsoleAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.h2.console.enabled:true", "spring.h2.console.settings.trace=true", - "spring.h2.console.settings.webAllowOthers=true"); + "spring.h2.console.settings.webAllowOthers=true").applyTo(this.context); this.context.refresh(); assertThat(this.context.getBeansOfType(ServletRegistrationBean.class)).hasSize(1); ServletRegistrationBean registrationBean = this.context diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java index 4a615b0c23..5fdeabedeb 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfigurationTests.java @@ -25,7 +25,7 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.Configuration; import org.springframework.hateoas.EntityLinks; import org.springframework.hateoas.LinkDiscoverer; @@ -88,8 +88,8 @@ public class HypermediaAutoConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); this.context.register(EnableHypermediaSupportConfig.class, BaseConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.serialization.INDENT_OUTPUT:true"); + TestPropertyValues.of( + "spring.jackson.serialization.INDENT_OUTPUT:true").applyTo(this.context); this.context.refresh(); ObjectMapper objectMapper = this.context.getBean("_halObjectMapper", ObjectMapper.class); @@ -102,8 +102,8 @@ public class HypermediaAutoConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); this.context.register(BaseConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.serialization.INDENT_OUTPUT:true"); + TestPropertyValues.of( + "spring.jackson.serialization.INDENT_OUTPUT:true").applyTo(this.context); this.context.refresh(); ObjectMapper objectMapper = this.context.getBean("_halObjectMapper", ObjectMapper.class); @@ -132,8 +132,8 @@ public class HypermediaAutoConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); this.context.register(BaseConfig.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.hateoas.use-hal-as-default-json-media-type:false"); + TestPropertyValues.of( + "spring.hateoas.use-hal-as-default-json-media-type:false").applyTo(this.context); this.context.refresh(); RequestMappingHandlerAdapter handlerAdapter = this.context .getBean(RequestMappingHandlerAdapter.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java index 203266ea96..cec3d722c6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.beans.factory.BeanCreationException; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -133,7 +133,7 @@ public class HazelcastAutoConfigurationClientTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); if (config != null) { applicationContext.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java index bb66916b4c..6e36a452aa 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java @@ -32,7 +32,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -150,7 +150,7 @@ public class HazelcastAutoConfigurationServerTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); if (config != null) { applicationContext.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java index 54ced943aa..f47b4bbe26 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationTests.java @@ -22,7 +22,7 @@ import com.hazelcast.core.HazelcastInstance; import org.junit.After; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.io.ClassPathResource; @@ -55,7 +55,7 @@ public class HazelcastAutoConfigurationTests { private void load(String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.register(HazelcastAutoConfiguration.class); ctx.refresh(); this.context = ctx; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java index b70f79d2c5..c16bab0ff9 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/http/HttpMessageConvertersAutoConfigurationTests.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration; import org.springframework.boot.autoconfigure.http.JacksonHttpMessageConvertersConfiguration.MappingJackson2HttpMessageConverterConfiguration; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -153,8 +153,8 @@ public class HttpMessageConvertersAutoConfigurationTests { public void gsonCanBePreferredWhenBothGsonAndJacksonAreAvailable() { this.context.register(GsonAutoConfiguration.class, JacksonAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.http.converters.preferred-json-mapper:gson"); + TestPropertyValues.of( + "spring.http.converters.preferred-json-mapper:gson").applyTo(this.context); this.context.refresh(); assertConverterBeanExists(GsonHttpMessageConverter.class, "gsonHttpMessageConverter"); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java index d8d1355ead..a5b40be014 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/info/ProjectInfoAutoConfigurationTests.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.info.BuildProperties; import org.springframework.boot.info.GitProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -141,7 +141,7 @@ public class ProjectInfoAutoConfigurationTests { } context.register(PropertyPlaceholderAutoConfiguration.class, ProjectInfoAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(context, environment); + TestPropertyValues.of(environment).applyTo(context); context.refresh(); this.context = context; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java index 8112cead18..6292ee97b0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfigurationTests.java @@ -32,7 +32,7 @@ import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfigurati import org.springframework.boot.autoconfigure.jdbc.JdbcTemplateAutoConfiguration; import org.springframework.boot.autoconfigure.jmx.JmxAutoConfiguration; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -207,7 +207,7 @@ public class IntegrationAutoConfigurationTests { private void load(Class[] configs, String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); if (configs != null) { ctx.register(configs); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java index 2d695efdf5..5d3cb57ad5 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jackson/JacksonAutoConfigurationTests.java @@ -53,7 +53,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.jackson.JsonComponent; import org.springframework.boot.jackson.JsonObjectSerializer; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -126,8 +126,8 @@ public class JacksonAutoConfigurationTests { @Test public void customDateFormat() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.date-format:yyyyMMddHHmmss"); + TestPropertyValues.of( + "spring.jackson.date-format:yyyyMMddHHmmss").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); DateFormat dateFormat = mapper.getDateFormat(); @@ -139,9 +139,9 @@ public class JacksonAutoConfigurationTests { @Test public void customJodaDateTimeFormat() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.jackson.date-format:yyyyMMddHHmmss", - "spring.jackson.joda-date-time-format:yyyy-MM-dd HH:mm:ss"); + "spring.jackson.joda-date-time-format:yyyy-MM-dd HH:mm:ss").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); DateTime dateTime = new DateTime(1988, 6, 25, 20, 30, DateTimeZone.UTC); @@ -154,8 +154,8 @@ public class JacksonAutoConfigurationTests { @Test public void customDateFormatClass() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.date-format:org.springframework.boot.autoconfigure.jackson.JacksonAutoConfigurationTests.MyDateFormat"); + TestPropertyValues.of( + "spring.jackson.date-format:org.springframework.boot.autoconfigure.jackson.JacksonAutoConfigurationTests.MyDateFormat").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(mapper.getDateFormat()).isInstanceOf(MyDateFormat.class); @@ -172,8 +172,8 @@ public class JacksonAutoConfigurationTests { @Test public void customPropertyNamingStrategyField() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.property-naming-strategy:SNAKE_CASE"); + TestPropertyValues.of( + "spring.jackson.property-naming-strategy:SNAKE_CASE").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(mapper.getPropertyNamingStrategy()) @@ -183,8 +183,8 @@ public class JacksonAutoConfigurationTests { @Test public void customPropertyNamingStrategyClass() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.property-naming-strategy:com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy"); + TestPropertyValues.of( + "spring.jackson.property-naming-strategy:com.fasterxml.jackson.databind.PropertyNamingStrategy.SnakeCaseStrategy").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(mapper.getPropertyNamingStrategy()) @@ -194,8 +194,8 @@ public class JacksonAutoConfigurationTests { @Test public void enableSerializationFeature() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.serialization.indent_output:true"); + TestPropertyValues.of( + "spring.jackson.serialization.indent_output:true").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(SerializationFeature.INDENT_OUTPUT.enabledByDefault()).isFalse(); @@ -207,8 +207,8 @@ public class JacksonAutoConfigurationTests { @Test public void disableSerializationFeature() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.serialization.write_dates_as_timestamps:false"); + TestPropertyValues.of( + "spring.jackson.serialization.write_dates_as_timestamps:false").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS.enabledByDefault()) @@ -220,8 +220,8 @@ public class JacksonAutoConfigurationTests { @Test public void enableDeserializationFeature() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.deserialization.use_big_decimal_for_floats:true"); + TestPropertyValues.of( + "spring.jackson.deserialization.use_big_decimal_for_floats:true").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS.enabledByDefault()) @@ -233,8 +233,8 @@ public class JacksonAutoConfigurationTests { @Test public void disableDeserializationFeature() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.deserialization.fail-on-unknown-properties:false"); + TestPropertyValues.of( + "spring.jackson.deserialization.fail-on-unknown-properties:false").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES.enabledByDefault()) @@ -246,8 +246,8 @@ public class JacksonAutoConfigurationTests { @Test public void enableMapperFeature() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.mapper.require_setters_for_getters:true"); + TestPropertyValues.of( + "spring.jackson.mapper.require_setters_for_getters:true").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(MapperFeature.REQUIRE_SETTERS_FOR_GETTERS.enabledByDefault()) @@ -263,8 +263,8 @@ public class JacksonAutoConfigurationTests { @Test public void disableMapperFeature() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.mapper.use_annotations:false"); + TestPropertyValues.of( + "spring.jackson.mapper.use_annotations:false").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(MapperFeature.USE_ANNOTATIONS.enabledByDefault()).isTrue(); @@ -277,8 +277,8 @@ public class JacksonAutoConfigurationTests { @Test public void enableParserFeature() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.parser.allow_single_quotes:true"); + TestPropertyValues.of( + "spring.jackson.parser.allow_single_quotes:true").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(JsonParser.Feature.ALLOW_SINGLE_QUOTES.enabledByDefault()).isFalse(); @@ -289,8 +289,8 @@ public class JacksonAutoConfigurationTests { @Test public void disableParserFeature() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.parser.auto_close_source:false"); + TestPropertyValues.of( + "spring.jackson.parser.auto_close_source:false").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(JsonParser.Feature.AUTO_CLOSE_SOURCE.enabledByDefault()).isTrue(); @@ -301,8 +301,8 @@ public class JacksonAutoConfigurationTests { @Test public void enableGeneratorFeature() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.generator.write_numbers_as_strings:true"); + TestPropertyValues.of( + "spring.jackson.generator.write_numbers_as_strings:true").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(JsonGenerator.Feature.WRITE_NUMBERS_AS_STRINGS.enabledByDefault()) @@ -314,8 +314,8 @@ public class JacksonAutoConfigurationTests { @Test public void disableGeneratorFeature() throws Exception { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.generator.auto_close_target:false"); + TestPropertyValues.of( + "spring.jackson.generator.auto_close_target:false").applyTo(this.context); this.context.refresh(); ObjectMapper mapper = this.context.getBean(ObjectMapper.class); assertThat(JsonGenerator.Feature.AUTO_CLOSE_TARGET.enabledByDefault()).isTrue(); @@ -369,8 +369,8 @@ public class JacksonAutoConfigurationTests { @Test public void customSerializationInclusion() { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.default-property-inclusion:non_null"); + TestPropertyValues.of( + "spring.jackson.default-property-inclusion:non_null").applyTo(this.context); this.context.refresh(); ObjectMapper objectMapper = this.context .getBean(Jackson2ObjectMapperBuilder.class).build(); @@ -381,11 +381,11 @@ public class JacksonAutoConfigurationTests { @Test public void customTimeZoneFormattingADateTime() throws JsonProcessingException { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.time-zone:America/Los_Angeles"); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.date-format:zzzz"); - EnvironmentTestUtils.addEnvironment(this.context, "spring.jackson.locale:en"); + TestPropertyValues.of( + "spring.jackson.time-zone:America/Los_Angeles").applyTo(this.context); + TestPropertyValues.of( + "spring.jackson.date-format:zzzz").applyTo(this.context); + TestPropertyValues.of("spring.jackson.locale:en").applyTo(this.context); this.context.refresh(); ObjectMapper objectMapper = this.context .getBean(Jackson2ObjectMapperBuilder.class).build(); @@ -397,9 +397,9 @@ public class JacksonAutoConfigurationTests { @Test public void customTimeZoneFormattingADate() throws JsonProcessingException { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.time-zone:GMT+10"); - EnvironmentTestUtils.addEnvironment(this.context, "spring.jackson.date-format:z"); + TestPropertyValues.of( + "spring.jackson.time-zone:GMT+10").applyTo(this.context); + TestPropertyValues.of("spring.jackson.date-format:z").applyTo(this.context); this.context.refresh(); ObjectMapper objectMapper = this.context .getBean(Jackson2ObjectMapperBuilder.class).build(); @@ -410,9 +410,9 @@ public class JacksonAutoConfigurationTests { @Test public void customLocale() throws JsonProcessingException { this.context.register(JacksonAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "spring.jackson.locale:de"); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jackson.date-format:zzzz"); + TestPropertyValues.of("spring.jackson.locale:de").applyTo(this.context); + TestPropertyValues.of( + "spring.jackson.date-format:zzzz").applyTo(this.context); this.context.refresh(); ObjectMapper objectMapper = this.context .getBean(Jackson2ObjectMapperBuilder.class).build(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java index e011c7dd4b..8988fd2c8d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java @@ -36,7 +36,7 @@ import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.jdbc.DatabaseDriver; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -58,9 +58,9 @@ public class DataSourceAutoConfigurationTests { @Before public void init() { EmbeddedDatabaseConnection.override = null; - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false", - "spring.datasource.url:jdbc:hsqldb:mem:testdb-" + new Random().nextInt()); + "spring.datasource.url:jdbc:hsqldb:mem:testdb-" + new Random().nextInt()).applyTo(this.context); } @After @@ -89,8 +89,8 @@ public class DataSourceAutoConfigurationTests { @Test(expected = BeanCreationException.class) public void testBadUrl() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.url:jdbc:not-going-to-work"); + TestPropertyValues.of( + "spring.datasource.url:jdbc:not-going-to-work").applyTo(this.context); EmbeddedDatabaseConnection.override = EmbeddedDatabaseConnection.NONE; this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -100,9 +100,9 @@ public class DataSourceAutoConfigurationTests { @Test(expected = BeanCreationException.class) public void testBadDriverClass() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.driverClassName:org.none.jdbcDriver", - "spring.datasource.url:jdbc:hsqldb:mem:testdb"); + "spring.datasource.url:jdbc:hsqldb:mem:testdb").applyTo(this.context); EmbeddedDatabaseConnection.override = EmbeddedDatabaseConnection.NONE; this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -152,9 +152,9 @@ public class DataSourceAutoConfigurationTests { @Test public void testEmbeddedTypeDefaultsUsername() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.driverClassName:org.hsqldb.jdbcDriver", - "spring.datasource.url:jdbc:hsqldb:mem:testdb"); + "spring.datasource.url:jdbc:hsqldb:mem:testdb").applyTo(this.context); this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); @@ -172,10 +172,10 @@ public class DataSourceAutoConfigurationTests { */ @Test public void explicitTypeNoSupportedDataSource() { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.driverClassName:org.hsqldb.jdbcDriver", "spring.datasource.url:jdbc:hsqldb:mem:testdb", - "spring.datasource.type:" + SimpleDriverDataSource.class.getName()); + "spring.datasource.type:" + SimpleDriverDataSource.class.getName()).applyTo(this.context); this.context.setClassLoader( new HidePackagesClassLoader("org.apache.tomcat", "com.zaxxer.hikari", "org.apache.commons.dbcp", "org.apache.commons.dbcp2")); @@ -184,10 +184,10 @@ public class DataSourceAutoConfigurationTests { @Test public void explicitTypeSupportedDataSource() { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.driverClassName:org.hsqldb.jdbcDriver", "spring.datasource.url:jdbc:hsqldb:mem:testdb", - "spring.datasource.type:" + SimpleDriverDataSource.class.getName()); + "spring.datasource.type:" + SimpleDriverDataSource.class.getName()).applyTo(this.context); testExplicitType(); } @@ -203,11 +203,11 @@ public class DataSourceAutoConfigurationTests { @Test public void testExplicitDriverClassClearsUsername() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.driverClassName:" + "org.springframework.boot.autoconfigure.jdbc." + "DataSourceAutoConfigurationTests$DatabaseTestDriver", - "spring.datasource.url:jdbc:foo://localhost"); + "spring.datasource.url:jdbc:foo://localhost").applyTo(this.context); this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); @@ -232,9 +232,9 @@ public class DataSourceAutoConfigurationTests { @SuppressWarnings("unchecked") private T autoConfigureDataSource(Class expectedType, final String... hiddenPackages) { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.driverClassName:org.hsqldb.jdbcDriver", - "spring.datasource.url:jdbc:hsqldb:mem:testdb"); + "spring.datasource.url:jdbc:hsqldb:mem:testdb").applyTo(this.context); this.context.setClassLoader(new HidePackagesClassLoader(hiddenPackages)); this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java index 6f4788da87..391f9c4d78 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceInitializerTests.java @@ -35,7 +35,7 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -69,9 +69,9 @@ public class DataSourceInitializerTests { @Before public void init() { EmbeddedDatabaseConnection.override = null; - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false", - "spring.datasource.url:jdbc:hsqldb:mem:testdb-" + new Random().nextInt()); + "spring.datasource.url:jdbc:hsqldb:mem:testdb-" + new Random().nextInt()).applyTo(this.context); } @After @@ -93,9 +93,9 @@ public class DataSourceInitializerTests { @Test public void testTwoDataSources() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "datasource.one.url=jdbc:hsqldb:mem:/one", - "datasource.two.url=jdbc:hsqldb:mem:/two"); + "datasource.two.url=jdbc:hsqldb:mem:/two").applyTo(this.context); this.context.register(TwoDataSources.class, DataSourceInitializer.class, PropertyPlaceholderAutoConfiguration.class, DataSourceProperties.class); this.context.refresh(); @@ -105,8 +105,8 @@ public class DataSourceInitializerTests { @Test public void testDataSourceInitialized() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:true"); + TestPropertyValues.of( + "spring.datasource.initialize:true").applyTo(this.context); this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); @@ -122,12 +122,12 @@ public class DataSourceInitializerTests { public void testDataSourceInitializedWithExplicitScript() throws Exception { this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:true", "spring.datasource.schema:" + ClassUtils .addResourcePathToPackagePath(getClass(), "schema.sql"), "spring.datasource.data:" + ClassUtils - .addResourcePathToPackagePath(getClass(), "data.sql")); + .addResourcePathToPackagePath(getClass(), "data.sql")).applyTo(this.context); this.context.refresh(); DataSource dataSource = this.context.getBean(DataSource.class); assertThat(dataSource).isInstanceOf(HikariDataSource.class); @@ -139,7 +139,7 @@ public class DataSourceInitializerTests { @Test public void testDataSourceInitializedWithMultipleScripts() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:true", "spring.datasource.schema:" + ClassUtils.addResourcePathToPackagePath(getClass(), @@ -148,7 +148,7 @@ public class DataSourceInitializerTests { + ClassUtils.addResourcePathToPackagePath(getClass(), "another.sql"), "spring.datasource.data:" + ClassUtils - .addResourcePathToPackagePath(getClass(), "data.sql")); + .addResourcePathToPackagePath(getClass(), "data.sql")).applyTo(this.context); this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); @@ -167,13 +167,13 @@ public class DataSourceInitializerTests { throws Exception { this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:true", "spring.datasource.sqlScriptEncoding:UTF-8", "spring.datasource.schema:" + ClassUtils .addResourcePathToPackagePath(getClass(), "encoding-schema.sql"), "spring.datasource.data:" + ClassUtils - .addResourcePathToPackagePath(getClass(), "encoding-data.sql")); + .addResourcePathToPackagePath(getClass(), "encoding-data.sql")).applyTo(this.context); this.context.refresh(); DataSource dataSource = this.context.getBean(DataSource.class); assertThat(dataSource).isInstanceOf(HikariDataSource.class); @@ -214,7 +214,7 @@ public class DataSourceInitializerTests { public void testDataSourceInitializedWithSchemaCredentials() { this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:true", "spring.datasource.sqlScriptEncoding:UTF-8", "spring.datasource.schema:" + ClassUtils @@ -222,7 +222,7 @@ public class DataSourceInitializerTests { "spring.datasource.data:" + ClassUtils .addResourcePathToPackagePath(getClass(), "encoding-data.sql"), "spring.datasource.schema-username:admin", - "spring.datasource.schema-password:admin"); + "spring.datasource.schema-password:admin").applyTo(this.context); try { this.context.refresh(); fail("User does not exist"); @@ -236,7 +236,7 @@ public class DataSourceInitializerTests { public void testDataSourceInitializedWithDataCredentials() { this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:true", "spring.datasource.sqlScriptEncoding:UTF-8", "spring.datasource.schema:" + ClassUtils @@ -244,7 +244,7 @@ public class DataSourceInitializerTests { "spring.datasource.data:" + ClassUtils .addResourcePathToPackagePath(getClass(), "encoding-data.sql"), "spring.datasource.data-username:admin", - "spring.datasource.data-password:admin"); + "spring.datasource.data-password:admin").applyTo(this.context); try { this.context.refresh(); fail("User does not exist"); @@ -256,12 +256,12 @@ public class DataSourceInitializerTests { @Test public void multipleScriptsAppliedInLexicalOrder() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:true", "spring.datasource.schema:" + ClassUtils .addResourcePathToPackagePath(getClass(), "lexical-schema-*.sql"), "spring.datasource.data:" + ClassUtils - .addResourcePathToPackagePath(getClass(), "data.sql")); + .addResourcePathToPackagePath(getClass(), "data.sql")).applyTo(this.context); this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); ReverseOrderResourceLoader resourceLoader = new ReverseOrderResourceLoader( @@ -280,9 +280,9 @@ public class DataSourceInitializerTests { public void testDataSourceInitializedWithInvalidSchemaResource() { this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:true", - "spring.datasource.schema:classpath:does/not/exist.sql"); + "spring.datasource.schema:classpath:does/not/exist.sql").applyTo(this.context); this.thrown.expect(BeanCreationException.class); this.thrown.expectMessage("does/not/exist.sql"); @@ -294,11 +294,11 @@ public class DataSourceInitializerTests { public void testDataSourceInitializedWithInvalidDataResource() { this.context.register(DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:true", "spring.datasource.schema:" + ClassUtils .addResourcePathToPackagePath(getClass(), "schema.sql"), - "spring.datasource.data:classpath:does/not/exist.sql"); + "spring.datasource.data:classpath:does/not/exist.sql").applyTo(this.context); this.thrown.expect(BeanCreationException.class); this.thrown.expectMessage("does/not/exist.sql"); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java index 816eea2ad0..49f3a27b9c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java @@ -21,7 +21,7 @@ import javax.sql.DataSource; import org.junit.Test; import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -110,9 +110,9 @@ public class DataSourceTransactionManagerAutoConfigurationTests { @Test public void testCustomizeDataSourceTransactionManagerUsingProperties() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.transaction.default-timeout:30", - "spring.transaction.rollback-on-commit-failure:true"); + "spring.transaction.rollback-on-commit-failure:true").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, DataSourceTransactionManagerAutoConfiguration.class, TransactionAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfigurationTests.java index 8cc7c0702c..38931ea747 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/EmbeddedDataSourceConfigurationTests.java @@ -25,7 +25,7 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.assertj.core.api.Assertions.assertThat; @@ -79,7 +79,7 @@ public class EmbeddedDataSourceConfigurationTests { private AnnotationConfigApplicationContext load(String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.register(EmbeddedDataSourceConfiguration.class); ctx.refresh(); return ctx; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java index ee1b1dd135..6715e1a19a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDataSourceConfigurationTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -61,9 +61,9 @@ public class HikariDataSourceConfigurationTests { @Test public void testDataSourcePropertiesOverridden() throws Exception { this.context.register(HikariDataSourceConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - PREFIX + "jdbcUrl:jdbc:foo//bar/spam"); - EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "maxLifetime:1234"); + TestPropertyValues.of( + PREFIX + "jdbcUrl:jdbc:foo//bar/spam").applyTo(this.context); + TestPropertyValues.of(PREFIX + "maxLifetime:1234").applyTo(this.context); this.context.refresh(); HikariDataSource ds = this.context.getBean(HikariDataSource.class); assertThat(ds.getJdbcUrl()).isEqualTo("jdbc:foo//bar/spam"); @@ -74,8 +74,8 @@ public class HikariDataSourceConfigurationTests { @Test public void testDataSourceGenericPropertiesOverridden() throws Exception { this.context.register(HikariDataSourceConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, PREFIX - + "dataSourceProperties.dataSourceClassName:org.h2.JDBCDataSource"); + TestPropertyValues.of(PREFIX + + "dataSourceProperties.dataSourceClassName:org.h2.JDBCDataSource").applyTo(this.context); this.context.refresh(); HikariDataSource ds = this.context.getBean(HikariDataSource.class); assertThat(ds.getDataSourceProperties().getProperty("dataSourceClassName")) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java index d2950d2d05..e44030a43e 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/HikariDriverConfigurationFailureAnalyzerTests.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.diagnostics.FailureAnalysis; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; @@ -61,9 +61,9 @@ public class HikariDriverConfigurationFailureAnalyzerTests { private BeanCreationException createFailure(Class configuration) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, + TestPropertyValues.of( "spring.datasource.type=" + HikariDataSource.class.getName(), - "spring.datasource.hikari.data-source-class-name=com.example.Foo"); + "spring.datasource.hikari.data-source-class-name=com.example.Foo").applyTo(context); context.register(configuration); try { context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java index 365e111c8e..de6fcf927f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JdbcTemplateAutoConfigurationTests.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -52,9 +52,9 @@ public class JdbcTemplateAutoConfigurationTests { @Before public void init() { EmbeddedDatabaseConnection.override = null; - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false", - "spring.datasource.url:jdbc:hsqldb:mem:testdb-" + new Random().nextInt()); + "spring.datasource.url:jdbc:hsqldb:mem:testdb-" + new Random().nextInt()).applyTo(this.context); } @After diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java index e1ceb09b7d..c48f8958cf 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfigurationTests.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.boot.autoconfigure.jndi.JndiPropertiesHidingClassLoader; import org.springframework.boot.autoconfigure.jndi.TestableInitialContextFactory; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.jmx.export.MBeanExporter; @@ -88,8 +88,8 @@ public class JndiDataSourceAutoConfigurationTests { configureJndi("foo", dataSource); this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.jndi-name:foo"); + TestPropertyValues.of( + "spring.datasource.jndi-name:foo").applyTo(this.context); this.context.register(JndiDataSourceAutoConfiguration.class); this.context.refresh(); @@ -104,8 +104,8 @@ public class JndiDataSourceAutoConfigurationTests { configureJndi("foo", dataSource); this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.jndi-name:foo"); + TestPropertyValues.of( + "spring.datasource.jndi-name:foo").applyTo(this.context); this.context.register(JndiDataSourceAutoConfiguration.class, MBeanExporterConfiguration.class); this.context.refresh(); @@ -125,8 +125,8 @@ public class JndiDataSourceAutoConfigurationTests { configureJndi("foo", dataSource); this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.jndi-name:foo"); + TestPropertyValues.of( + "spring.datasource.jndi-name:foo").applyTo(this.context); this.context.register(JndiDataSourceAutoConfiguration.class, MBeanExporterConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java index 83f962b827..c656954ad1 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -53,7 +53,7 @@ public class TomcatDataSourceConfigurationTests { @Before public void init() { - EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "initialize:false"); + TestPropertyValues.of(PREFIX + "initialize:false"); } @After @@ -64,8 +64,8 @@ public class TomcatDataSourceConfigurationTests { @Test public void testDataSourceExists() throws Exception { this.context.register(TomcatDataSourceConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - PREFIX + "url:jdbc:h2:mem:testdb"); + TestPropertyValues.of( + PREFIX + "url:jdbc:h2:mem:testdb").applyTo(this.context); this.context.refresh(); assertThat(this.context.getBean(DataSource.class)).isNotNull(); assertThat(this.context.getBean(org.apache.tomcat.jdbc.pool.DataSource.class)) @@ -75,20 +75,16 @@ public class TomcatDataSourceConfigurationTests { @Test public void testDataSourcePropertiesOverridden() throws Exception { this.context.register(TomcatDataSourceConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - PREFIX + "url:jdbc:h2:mem:testdb"); - EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "testWhileIdle:true"); - EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "testOnBorrow:true"); - EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "testOnReturn:true"); - EnvironmentTestUtils.addEnvironment(this.context, - PREFIX + "timeBetweenEvictionRunsMillis:10000"); - EnvironmentTestUtils.addEnvironment(this.context, - PREFIX + "minEvictableIdleTimeMillis:12345"); - EnvironmentTestUtils.addEnvironment(this.context, PREFIX + "maxWait:1234"); - EnvironmentTestUtils.addEnvironment(this.context, - PREFIX + "jdbcInterceptors:SlowQueryReport"); - EnvironmentTestUtils.addEnvironment(this.context, - PREFIX + "validationInterval:9999"); + TestPropertyValues.of( + PREFIX + "url:jdbc:h2:mem:testdb", + PREFIX + "testWhileIdle:true", + PREFIX + "testOnBorrow:true", + PREFIX + "testOnReturn:true", + PREFIX + "timeBetweenEvictionRunsMillis:10000", + PREFIX + "minEvictableIdleTimeMillis:12345", + PREFIX + "maxWait:1234", + PREFIX + "jdbcInterceptors:SlowQueryReport", + PREFIX + "validationInterval:9999").applyTo(this.context); this.context.refresh(); org.apache.tomcat.jdbc.pool.DataSource ds = this.context .getBean(org.apache.tomcat.jdbc.pool.DataSource.class); @@ -118,8 +114,8 @@ public class TomcatDataSourceConfigurationTests { @Test public void testDataSourceDefaultsPreserved() throws Exception { this.context.register(TomcatDataSourceConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - PREFIX + "url:jdbc:h2:mem:testdb"); + TestPropertyValues.of( + PREFIX + "url:jdbc:h2:mem:testdb").applyTo(this.context); this.context.refresh(); org.apache.tomcat.jdbc.pool.DataSource ds = this.context .getBean(org.apache.tomcat.jdbc.pool.DataSource.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java index 3d4032e84c..d7141ce20c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/XADataSourceAutoConfigurationTests.java @@ -23,7 +23,7 @@ import org.hsqldb.jdbc.pool.JDBCXADataSource; import org.junit.Test; import org.springframework.boot.jta.XADataSourceWrapper; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -75,7 +75,7 @@ public class XADataSourceAutoConfigurationTests { private ApplicationContext createContext(Class configuration, String... env) { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, env); + TestPropertyValues.of(env).applyTo(context); context.register(configuration, XADataSourceAutoConfiguration.class); context.refresh(); return context; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java index 4593ba4f60..c4aa4c2a82 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/JmsAutoConfigurationTests.java @@ -28,7 +28,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.autoconfigure.jms.activemq.ActiveMQAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -405,7 +405,7 @@ public class JmsAutoConfigurationTests { applicationContext.register(configs); applicationContext.register(ActiveMQAutoConfiguration.class, JmsAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.refresh(); return applicationContext; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java index 9daa5a93ff..ac71acd2d6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java @@ -24,7 +24,7 @@ import org.apache.activemq.pool.PooledConnectionFactory; import org.junit.Test; import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -102,7 +102,7 @@ public class ActiveMQAutoConfigurationTests { applicationContext.register(config); applicationContext.register(ActiveMQAutoConfiguration.class, JmsAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.refresh(); return applicationContext; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java index 76f440bcc6..3c9eb65096 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisAutoConfigurationTests.java @@ -43,7 +43,7 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -305,7 +305,7 @@ public class ArtemisAutoConfigurationTests { applicationContext.register(config); applicationContext.register(ArtemisAutoConfiguration.class, JmsAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.refresh(); return applicationContext; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java index 8bbffb356b..cc345564b4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jooq/JooqAutoConfigurationTests.java @@ -39,7 +39,7 @@ import org.junit.rules.ExpectedException; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -68,9 +68,8 @@ public class JooqAutoConfigurationTests { @Before public void init() { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.name:jooqtest"); - EnvironmentTestUtils.addEnvironment(this.context, "spring.jooq.sql-dialect:H2"); + TestPropertyValues.of("spring.datasource.name:jooqtest").applyTo(this.context); + TestPropertyValues.of("spring.jooq.sql-dialect:H2").applyTo(this.context); } @After @@ -160,8 +159,8 @@ public class JooqAutoConfigurationTests { @Test public void relaxedBindingOfSqlDialect() { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jooq.sql-dialect:PoSTGrES"); + TestPropertyValues.of( + "spring.jooq.sql-dialect:PoSTGrES").applyTo(this.context); registerAndRefresh(JooqDataSourceConfiguration.class, JooqAutoConfiguration.class); assertThat(this.context.getBean(org.jooq.Configuration.class).dialect()) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java index 3c863edc43..01d3f4fdfc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java @@ -23,7 +23,7 @@ import org.junit.After; import org.junit.ClassRule; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.kafka.annotation.KafkaListener; @@ -81,7 +81,7 @@ public class KafkaAutoConfigurationIntegrationTests { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); applicationContext.register(configs); applicationContext.register(KafkaAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.refresh(); return applicationContext; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java index acbf66a5c3..34328bbf74 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationTests.java @@ -33,7 +33,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.kafka.config.KafkaListenerContainerFactory; import org.springframework.kafka.core.DefaultKafkaConsumerFactory; @@ -213,7 +213,7 @@ public class KafkaAutoConfigurationTests { private void load(String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); ctx.register(KafkaAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.refresh(); this.context = ctx; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java index 1f9807997a..82614df4ff 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/LdapAutoConfigurationTests.java @@ -20,7 +20,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.ldap.core.ContextSource; import org.springframework.test.util.ReflectionTestUtils; @@ -82,7 +82,7 @@ public class LdapAutoConfigurationTests { private void load(String... properties) { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, properties); + TestPropertyValues.of(properties).applyTo(this.context); this.context.register(LdapAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java index 5643eda946..a6c7c665a2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/ldap/embedded/EmbeddedLdapAutoConfigurationTests.java @@ -29,7 +29,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.data.ldap.LdapDataAutoConfiguration; import org.springframework.boot.autoconfigure.ldap.LdapAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -78,8 +78,8 @@ public class EmbeddedLdapAutoConfigurationTests { @Test public void testRandomPortWithValueAnnotation() throws LDAPException { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.ldap.embedded.base-dn:dc=spring,dc=org"); + TestPropertyValues.of( + "spring.ldap.embedded.base-dn:dc=spring,dc=org").applyTo(this.context); this.context.register(EmbeddedLdapAutoConfiguration.class, LdapClientConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -119,8 +119,8 @@ public class EmbeddedLdapAutoConfigurationTests { @Test public void testQueryEmbeddedLdap() throws LDAPException { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.ldap.embedded.base-dn:dc=spring,dc=org"); + TestPropertyValues.of( + "spring.ldap.embedded.base-dn:dc=spring,dc=org").applyTo(this.context); this.context.register(EmbeddedLdapAutoConfiguration.class, LdapAutoConfiguration.class, LdapDataAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -155,7 +155,7 @@ public class EmbeddedLdapAutoConfigurationTests { } private void load(String... properties) { - EnvironmentTestUtils.addEnvironment(this.context, properties); + TestPropertyValues.of(properties).applyTo(this.context); this.context.register(EmbeddedLdapAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java index 562fe154eb..81cebc9662 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfigurationTests.java @@ -37,7 +37,7 @@ import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfigurati import org.springframework.boot.liquibase.CommonsLoggingLiquibaseLogger; import org.springframework.boot.liquibase.LiquibaseServiceLocatorApplicationListener; import org.springframework.boot.test.rule.OutputCapture; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -69,8 +69,8 @@ public class LiquibaseAutoConfigurationTests { @Before public void init() { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.name:liquibasetest"); + TestPropertyValues.of( + "spring.datasource.name:liquibasetest").applyTo(this.context); new LiquibaseServiceLocatorApplicationListener().onApplicationEvent(null); } @@ -106,8 +106,8 @@ public class LiquibaseAutoConfigurationTests { @Test public void testXmlChangeLog() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "liquibase.change-log:classpath:/db/changelog/db.changelog-override.xml"); + TestPropertyValues.of( + "liquibase.change-log:classpath:/db/changelog/db.changelog-override.xml").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -119,8 +119,8 @@ public class LiquibaseAutoConfigurationTests { @Test public void testJsonChangeLog() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "liquibase.change-log:classpath:/db/changelog/db.changelog-override.json"); + TestPropertyValues.of( + "liquibase.change-log:classpath:/db/changelog/db.changelog-override.json").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -132,8 +132,8 @@ public class LiquibaseAutoConfigurationTests { @Test public void testSqlChangeLog() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "liquibase.change-log:classpath:/db/changelog/db.changelog-override.sql"); + TestPropertyValues.of( + "liquibase.change-log:classpath:/db/changelog/db.changelog-override.sql").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -145,8 +145,8 @@ public class LiquibaseAutoConfigurationTests { @Test public void testOverrideContexts() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "liquibase.contexts:test, production"); + TestPropertyValues.of( + "liquibase.contexts:test, production").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -157,8 +157,8 @@ public class LiquibaseAutoConfigurationTests { @Test public void testOverrideDefaultSchema() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "liquibase.default-schema:public"); + TestPropertyValues.of( + "liquibase.default-schema:public").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -169,7 +169,7 @@ public class LiquibaseAutoConfigurationTests { @Test public void testOverrideDropFirst() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, "liquibase.drop-first:true"); + TestPropertyValues.of("liquibase.drop-first:true").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -180,8 +180,8 @@ public class LiquibaseAutoConfigurationTests { @Test public void testOverrideDataSource() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "liquibase.url:jdbc:hsqldb:mem:liquibase", "liquibase.user:sa"); + TestPropertyValues.of( + "liquibase.url:jdbc:hsqldb:mem:liquibase", "liquibase.user:sa").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -195,8 +195,8 @@ public class LiquibaseAutoConfigurationTests { @Test(expected = BeanCreationException.class) public void testChangeLogDoesNotExist() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "liquibase.change-log:classpath:/no-such-changelog.yaml"); + TestPropertyValues.of( + "liquibase.change-log:classpath:/no-such-changelog.yaml").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -217,8 +217,8 @@ public class LiquibaseAutoConfigurationTests { @Test public void testOverrideLabels() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "liquibase.labels:test, production"); + TestPropertyValues.of( + "liquibase.labels:test, production").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -230,7 +230,7 @@ public class LiquibaseAutoConfigurationTests { @Test @SuppressWarnings("unchecked") public void testOverrideParameters() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, "liquibase.parameters.foo:bar"); + TestPropertyValues.of("liquibase.parameters.foo:bar").applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -245,8 +245,8 @@ public class LiquibaseAutoConfigurationTests { @Test public void testRollbackFile() throws Exception { File file = this.temp.newFile("rollback-file.sql"); - EnvironmentTestUtils.addEnvironment(this.context, - "liquibase.rollbackFile:" + file.getAbsolutePath()); + TestPropertyValues.of( + "liquibase.rollbackFile:" + file.getAbsolutePath()).applyTo(this.context); this.context.register(EmbeddedDataSourceConfiguration.class, LiquibaseAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java index c79a09cd87..3579bd2ad8 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfigurationTests.java @@ -32,7 +32,7 @@ import org.junit.rules.ExpectedException; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.jndi.JndiPropertiesHidingClassLoader; import org.springframework.boot.autoconfigure.jndi.TestableInitialContextFactory; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -209,7 +209,7 @@ public class MailSenderAutoConfigurationTests { private AnnotationConfigApplicationContext doLoad(Class[] configs, String... environment) { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.register(configs); applicationContext.register(MailSenderAutoConfiguration.class); applicationContext.register(MailSenderValidatorAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java index 3c8409a257..64686e8151 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverAutoConfigurationTests.java @@ -36,7 +36,7 @@ import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConf import org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration; import org.springframework.boot.autoconfigure.thymeleaf.ThymeleafAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.servlet.view.MustacheViewResolver; import org.springframework.core.Ordered; import org.springframework.mobile.device.view.LiteDeviceDelegatingViewResolver; @@ -246,7 +246,7 @@ public class DeviceDelegatingViewResolverAutoConfigurationTests { HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, DeviceDelegatingViewResolverAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); this.context.refresh(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/SitePreferenceAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/SitePreferenceAutoConfigurationTests.java index 0473007c52..b977eec880 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/SitePreferenceAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mobile/SitePreferenceAutoConfigurationTests.java @@ -23,7 +23,7 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mobile.device.site.SitePreferenceHandlerInterceptor; @@ -67,7 +67,7 @@ public class SitePreferenceAutoConfigurationTests { @Test public void sitePreferenceHandlerInterceptorEnabled() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.mobile.sitepreference.enabled:true"); this.context.register(SitePreferenceAutoConfiguration.class); this.context.refresh(); @@ -78,8 +78,8 @@ public class SitePreferenceAutoConfigurationTests { @Test(expected = NoSuchBeanDefinitionException.class) public void sitePreferenceHandlerInterceptorDisabled() { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.mobile.sitepreference.enabled:false"); + TestPropertyValues.of( + "spring.mobile.sitepreference.enabled:false").applyTo(this.context); this.context.register(SitePreferenceAutoConfiguration.class); this.context.refresh(); this.context.getBean(SitePreferenceHandlerInterceptor.class); @@ -98,7 +98,7 @@ public class SitePreferenceAutoConfigurationTests { @Test public void sitePreferenceMethodArgumentResolverEnabled() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.mobile.sitepreference.enabled:true"); this.context.register(SitePreferenceAutoConfiguration.class); this.context.refresh(); @@ -110,8 +110,8 @@ public class SitePreferenceAutoConfigurationTests { @Test(expected = NoSuchBeanDefinitionException.class) public void sitePreferenceMethodArgumentResolverDisabled() { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.mobile.sitepreference.enabled:false"); + TestPropertyValues.of( + "spring.mobile.sitepreference.enabled:false").applyTo(this.context); this.context.register(SitePreferenceAutoConfiguration.class); this.context.refresh(); this.context.getBean(SitePreferenceHandlerMethodArgumentResolver.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java index 888ff87d98..b9d0229475 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoAutoConfigurationTests.java @@ -25,7 +25,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -60,7 +60,7 @@ public class MongoAutoConfigurationTests { @Test public void optionsAdded() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.mongodb.host:localhost"); this.context.register(OptionsConfig.class, PropertyPlaceholderAutoConfiguration.class, MongoAutoConfiguration.class); @@ -72,7 +72,7 @@ public class MongoAutoConfigurationTests { @Test public void optionsAddedButNoHost() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.mongodb.uri:mongodb://localhost/test"); this.context.register(OptionsConfig.class, PropertyPlaceholderAutoConfiguration.class, MongoAutoConfiguration.class); @@ -84,8 +84,8 @@ public class MongoAutoConfigurationTests { @Test public void optionsSslConfig() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.mongodb.uri:mongodb://localhost/test"); + TestPropertyValues.of( + "spring.data.mongodb.uri:mongodb://localhost/test").applyTo(this.context); this.context.register(SslOptionsConfig.class, PropertyPlaceholderAutoConfiguration.class, MongoAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java index c4c8db834e..c349e248ac 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoPropertiesTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; @@ -46,7 +46,7 @@ public class MongoPropertiesTests { public void canBindCharArrayPassword() { // gh-1572 AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, "spring.data.mongodb.password:word"); + TestPropertyValues.of("spring.data.mongodb.password:word").applyTo(context); context.register(Config.class); context.refresh(); MongoProperties properties = context.getBean(MongoProperties.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java index 46611b6472..b09548016c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java @@ -28,7 +28,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -66,8 +66,8 @@ public class MongoReactiveAutoConfigurationTests { @Test public void optionsAdded() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.mongodb.host:localhost"); + TestPropertyValues.of( + "spring.data.mongodb.host:localhost").applyTo(this.context); this.context.register(OptionsConfig.class, PropertyPlaceholderAutoConfiguration.class, MongoReactiveAutoConfiguration.class); @@ -79,7 +79,7 @@ public class MongoReactiveAutoConfigurationTests { @Test public void optionsAddedButNoHost() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.data.mongodb.uri:mongodb://localhost/test"); this.context.register(OptionsConfig.class, PropertyPlaceholderAutoConfiguration.class, @@ -93,8 +93,8 @@ public class MongoReactiveAutoConfigurationTests { @Test public void optionsSslConfig() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.mongodb.uri:mongodb://localhost/test"); + TestPropertyValues.of( + "spring.data.mongodb.uri:mongodb://localhost/test").applyTo(this.context); this.context.register(SslOptionsConfig.class, PropertyPlaceholderAutoConfiguration.class, MongoReactiveAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java index c3acc343d6..4db58375ac 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/embedded/EmbeddedMongoAutoConfigurationTests.java @@ -31,7 +31,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -158,11 +158,11 @@ public class EmbeddedMongoAutoConfigurationTests { String expectedVersion) { this.context = new AnnotationConfigApplicationContext(); int mongoPort = SocketUtils.findAvailableTcpPort(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.data.mongodb.port=" + mongoPort); + TestPropertyValues.of( + "spring.data.mongodb.port=" + mongoPort).applyTo(this.context); if (configuredVersion != null) { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.mongodb.embedded.version=" + configuredVersion); + TestPropertyValues.of( + "spring.mongodb.embedded.version=" + configuredVersion).applyTo(this.context); } this.context.register(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class, EmbeddedMongoAutoConfiguration.class); @@ -182,7 +182,7 @@ public class EmbeddedMongoAutoConfigurationTests { if (config != null) { ctx.register(config); } - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.register(EmbeddedMongoAutoConfiguration.class, MongoAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); ctx.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java index aba0adf3ac..a476d36488 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.mustache; import com.samskivert.mustache.Mustache; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.reactive.context.GenericReactiveWebApplicationContext; import org.springframework.boot.web.servlet.view.MustacheViewResolver; import org.springframework.context.annotation.Bean; @@ -83,8 +83,8 @@ public class MustacheAutoConfigurationTests { private void loadWithServlet(Class config) { this.webContext = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.webContext, - "spring.mustache.prefix=classpath:/mustache-templates/"); + TestPropertyValues.of( + "spring.mustache.prefix=classpath:/mustache-templates/").applyTo(this.webContext); if (config != null) { this.webContext.register(config); } @@ -94,8 +94,8 @@ public class MustacheAutoConfigurationTests { private void loadWithReactive(Class config) { this.reactiveWebContext = new GenericReactiveWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.reactiveWebContext, - "spring.mustache.prefix=classpath:/mustache-templates/"); + TestPropertyValues.of( + "spring.mustache.prefix=classpath:/mustache-templates/").applyTo(this.reactiveWebContext); if (config != null) { this.reactiveWebContext.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java index 64a616898d..5a6fa19b34 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/AbstractJpaAutoConfigurationTests.java @@ -38,7 +38,7 @@ import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfigurati import org.springframework.boot.autoconfigure.orm.jpa.test.City; import org.springframework.boot.autoconfigure.transaction.TransactionAutoConfiguration; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -129,7 +129,7 @@ public abstract class AbstractJpaAutoConfigurationTests { public void testOpenEntityManagerInViewInterceptorNotRegisteredWhenExplicitlyOff() throws Exception { AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(context, "spring.jpa.open_in_view:false"); + TestPropertyValues.of("spring.jpa.open_in_view:false").applyTo(context); context.register(TestConfiguration.class, EmbeddedDataSourceConfiguration.class, PropertyPlaceholderAutoConfiguration.class, getAutoConfigureClass()); ConfigurationPropertySources.attach(context.getEnvironment()); @@ -140,8 +140,8 @@ public abstract class AbstractJpaAutoConfigurationTests { @Test public void customJpaProperties() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, "spring.jpa.properties.a:b", - "spring.jpa.properties.a.b:c", "spring.jpa.properties.c:d"); + TestPropertyValues.of("spring.jpa.properties.a:b", + "spring.jpa.properties.a.b:c", "spring.jpa.properties.c:d").applyTo(this.context); setupTestConfiguration(); this.context.refresh(); LocalContainerEntityManagerFactoryBean bean = this.context @@ -154,7 +154,7 @@ public abstract class AbstractJpaAutoConfigurationTests { @Test public void usesManuallyDefinedLocalContainerEntityManagerFactoryBeanIfAvailable() { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false"); setupTestConfiguration( TestConfigurationWithLocalContainerEntityManagerFactoryBean.class); @@ -167,8 +167,8 @@ public abstract class AbstractJpaAutoConfigurationTests { @Test public void usesManuallyDefinedEntityManagerFactoryIfAvailable() { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.initialize:false"); + TestPropertyValues.of( + "spring.datasource.initialize:false").applyTo(this.context); setupTestConfiguration(TestConfigurationWithEntityManagerFactory.class); this.context.refresh(); EntityManagerFactory factoryBean = this.context diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java index f69c334a41..2752814cb0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/CustomHibernateJpaAutoConfigurationTests.java @@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.test.City; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -63,11 +63,11 @@ public class CustomHibernateJpaAutoConfigurationTests { public void testDefaultDdlAutoForMySql() throws Exception { // Set up environment so we get a MySQL database but don't require server to be // running... - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.type:" + org.apache.tomcat.jdbc.pool.DataSource.class.getName(), "spring.datasource.database:mysql", "spring.datasource.url:jdbc:mysql://localhost/nonexistent", - "spring.datasource.initialize:false", "spring.jpa.database:MYSQL"); + "spring.datasource.initialize:false", "spring.jpa.database:MYSQL").applyTo(this.context); this.context.register(TestConfiguration.class, DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, HibernateJpaAutoConfiguration.class); @@ -82,7 +82,7 @@ public class CustomHibernateJpaAutoConfigurationTests { @Test public void testDefaultDdlAutoForEmbedded() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false"); this.context.register(TestConfiguration.class, EmbeddedDataSourceConfiguration.class, @@ -98,7 +98,7 @@ public class CustomHibernateJpaAutoConfigurationTests { @Test public void testNamingStrategyDelegatorTakesPrecedence() { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.jpa.properties.hibernate.ejb.naming_strategy_delegator:" + "org.hibernate.cfg.naming.ImprovedNamingStrategyDelegator"); this.context.register(TestConfiguration.class, @@ -114,9 +114,9 @@ public class CustomHibernateJpaAutoConfigurationTests { @Test public void testDefaultDatabaseForH2() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.url:jdbc:h2:mem:testdb", - "spring.datasource.initialize:false"); + "spring.datasource.initialize:false").applyTo(this.context); this.context.register(TestConfiguration.class, DataSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class, HibernateJpaAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index 0af0ea49bb..56c98539fd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -35,7 +35,7 @@ import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration; import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; import org.springframework.boot.autoconfigure.transaction.jta.JtaAutoConfiguration; import org.springframework.boot.orm.jpa.hibernate.SpringJtaPlatform; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; @@ -64,10 +64,10 @@ public class HibernateJpaAutoConfigurationTests @Test public void testDataScriptWithMissingDdl() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.data:classpath:/city.sql", // Missing: - "spring.datasource.schema:classpath:/ddl.sql"); + "spring.datasource.schema:classpath:/ddl.sql").applyTo(this.context); setupTestConfiguration(); this.thrown.expectMessage("ddl.sql"); this.thrown.expectMessage("spring.datasource.schema"); @@ -79,8 +79,8 @@ public class HibernateJpaAutoConfigurationTests // and Hibernate hasn't initialized yet at that point @Test(expected = BeanCreationException.class) public void testDataScript() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.datasource.data:classpath:/city.sql"); + TestPropertyValues.of( + "spring.datasource.data:classpath:/city.sql").applyTo(this.context); setupTestConfiguration(); this.context.refresh(); assertThat(new JdbcTemplate(this.context.getBean(DataSource.class)) @@ -89,10 +89,10 @@ public class HibernateJpaAutoConfigurationTests @Test public void testFlywayPlusValidation() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false", "flyway.locations:classpath:db/city", - "spring.jpa.hibernate.ddl-auto:validate"); + "spring.jpa.hibernate.ddl-auto:validate").applyTo(this.context); setupTestConfiguration(); this.context.register(FlywayAutoConfiguration.class); this.context.refresh(); @@ -100,10 +100,10 @@ public class HibernateJpaAutoConfigurationTests @Test public void testLiquibasePlusValidation() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false", "liquibase.changeLog:classpath:db/changelog/db.changelog-city.yaml", - "spring.jpa.hibernate.ddl-auto:validate"); + "spring.jpa.hibernate.ddl-auto:validate").applyTo(this.context); setupTestConfiguration(); this.context.register(LiquibaseAutoConfiguration.class); this.context.refresh(); @@ -123,9 +123,9 @@ public class HibernateJpaAutoConfigurationTests @Test public void testCustomJtaPlatform() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.jpa.properties.hibernate.transaction.jta.platform:" - + TestJtaPlatform.class.getName()); + + TestJtaPlatform.class.getName()).applyTo(this.context); this.context.register(JtaAutoConfiguration.class); setupTestConfiguration(); this.context.refresh(); @@ -138,9 +138,9 @@ public class HibernateJpaAutoConfigurationTests @Test public void testCustomJpaTransactionManagerUsingProperties() throws Exception { - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.transaction.default-timeout:30", - "spring.transaction.rollback-on-commit-failure:true"); + "spring.transaction.rollback-on-commit-failure:true").applyTo(this.context); setupTestConfiguration(); this.context.refresh(); JpaTransactionManager transactionManager = this.context diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java index 6a37bd178f..e534a94a9f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/orm/jpa/JpaPropertiesTests.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy; import org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.orm.jpa.vendor.Database; @@ -177,7 +177,7 @@ public class JpaPropertiesTests { private JpaProperties load(String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.register(TestConfiguration.class); ctx.refresh(); this.context = ctx; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java index f4acddf500..eb97c64099 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityAutoConfigurationTests.java @@ -28,7 +28,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.boot.autoconfigure.orm.jpa.test.City; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.servlet.DelegatingFilterProxyRegistrationBean; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.ApplicationEvent; @@ -133,7 +133,7 @@ public class SecurityAutoConfigurationTests { @Test public void testCustomFilterOrder() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, "security.filter-order:12345"); + TestPropertyValues.of("security.filter-order:12345").applyTo(this.context); this.context.setServletContext(new MockServletContext()); this.context.register(SecurityAutoConfiguration.class, SecurityFilterAutoConfiguration.class, @@ -149,7 +149,7 @@ public class SecurityAutoConfigurationTests { this.context.setServletContext(new MockServletContext()); this.context.register(SecurityAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "security.ignored:none"); + TestPropertyValues.of("security.ignored:none").applyTo(this.context); this.context.refresh(); // Just the application endpoints now assertThat(this.context.getBean(FilterChainProxy.class).getFilterChains()) @@ -162,7 +162,7 @@ public class SecurityAutoConfigurationTests { this.context.setServletContext(new MockServletContext()); this.context.register(SecurityAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "security.basic.enabled:false"); + TestPropertyValues.of("security.basic.enabled:false"); this.context.refresh(); // Ignores and the "matches-none" filter only assertThat(this.context.getBeanNamesForType(FilterChainProxy.class).length) @@ -277,9 +277,9 @@ public class SecurityAutoConfigurationTests { public void testJpaCoexistsHappily() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.url:jdbc:hsqldb:mem:testsecdb"); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.datasource.initialize:false"); this.context.register(EntityConfiguration.class, PropertyPlaceholderAutoConfiguration.class, @@ -370,8 +370,8 @@ public class SecurityAutoConfigurationTests { this.context.register(SecurityAutoConfiguration.class, SecurityFilterAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, - "security.filter-dispatcher-types:INCLUDE,ERROR"); + TestPropertyValues.of( + "security.filter-dispatcher-types:INCLUDE,ERROR").applyTo(this.context); this.context.refresh(); DelegatingFilterProxyRegistrationBean bean = this.context.getBean( "securityFilterChainRegistration", diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfigurationEarlyInitializationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfigurationEarlyInitializationTests.java index 2057120908..8c24843471 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfigurationEarlyInitializationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/SecurityFilterAutoConfigurationEarlyInitializationTests.java @@ -33,7 +33,7 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.security.SecurityAutoConfigurationTests.WebSecurity; import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; @@ -59,8 +59,8 @@ public class SecurityFilterAutoConfigurationEarlyInitializationTests { @Test public void testSecurityFilterDoesNotCauseEarlyInitialization() throws Exception { try (AnnotationConfigServletWebServerApplicationContext context = new AnnotationConfigServletWebServerApplicationContext()) { - EnvironmentTestUtils.addEnvironment(context, "server.port:0", - "security.user.password:password"); + TestPropertyValues.of("server.port:0", + "security.user.password:password").applyTo(context); context.register(Config.class); context.refresh(); int port = context.getWebServer().getPort(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java index 06a575173a..b21ad1a6f6 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2AutoConfigurationTests.java @@ -36,7 +36,7 @@ import org.springframework.boot.autoconfigure.security.oauth2.resource.ResourceS import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; @@ -183,12 +183,12 @@ public class OAuth2AutoConfigurationTests { @Test public void testEnvironmentalOverrides() { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "security.oauth2.client.clientId:myclientid", "security.oauth2.client.clientSecret:mysecret", "security.oauth2.client.autoApproveScopes:read,write", "security.oauth2.client.accessTokenValiditySeconds:40", - "security.oauth2.client.refreshTokenValiditySeconds:80"); + "security.oauth2.client.refreshTokenValiditySeconds:80").applyTo(this.context); this.context.register(AuthorizationAndResourceServerConfiguration.class, MinimalSecureWebApplication.class); this.context.refresh(); @@ -230,9 +230,9 @@ public class OAuth2AutoConfigurationTests { this.context = new AnnotationConfigServletWebServerApplicationContext(); this.context.register(TestSecurityConfiguration.class, MinimalSecureWebApplication.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "security.oauth2.client.clientId=client", - "security.oauth2.client.grantType=client_credentials"); + "security.oauth2.client.grantType=client_credentials").applyTo(this.context); ConfigurationPropertySources.attach(this.context.getEnvironment()); this.context.refresh(); OAuth2ClientContext bean = this.context.getBean(OAuth2ClientContext.class); @@ -246,9 +246,9 @@ public class OAuth2AutoConfigurationTests { this.context = new AnnotationConfigServletWebServerApplicationContext(); this.context.register(ClientConfiguration.class, MinimalSecureWebApplication.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "security.oauth2.client.clientId=client", - "security.oauth2.client.grantType=client_credentials"); + "security.oauth2.client.grantType=client_credentials").applyTo(this.context); ConfigurationPropertySources.attach(this.context.getEnvironment()); this.context.refresh(); // The primary context is fine (not session scoped): @@ -267,8 +267,8 @@ public class OAuth2AutoConfigurationTests { public void testClientIsNotAuthCode() { AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); context.register(MinimalSecureNonWebApplication.class); - EnvironmentTestUtils.addEnvironment(context, - "security.oauth2.client.clientId=client"); + TestPropertyValues.of( + "security.oauth2.client.clientId=client").applyTo(context); context.refresh(); assertThat(countBeans(context, ClientCredentialsResourceDetails.class)) .isEqualTo(1); @@ -280,8 +280,8 @@ public class OAuth2AutoConfigurationTests { this.context = new AnnotationConfigServletWebServerApplicationContext(); this.context.register(ResourceServerConfiguration.class, MinimalSecureWebApplication.class); - EnvironmentTestUtils.addEnvironment(this.context, - "security.oauth2.resource.jwt.keyValue:DEADBEEF"); + TestPropertyValues.of( + "security.oauth2.resource.jwt.keyValue:DEADBEEF").applyTo(this.context); ConfigurationPropertySources.attach(this.context.getEnvironment()); this.context.refresh(); assertThat(countBeans(RESOURCE_SERVER_CONFIG)).isEqualTo(1); @@ -306,8 +306,8 @@ public class OAuth2AutoConfigurationTests { @Test public void testAuthorizationServerOverride() { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "security.oauth2.resourceId:resource-id"); + TestPropertyValues.of( + "security.oauth2.resourceId:resource-id").applyTo(this.context); this.context.register(AuthorizationAndResourceServerConfiguration.class, CustomAuthorizationServer.class, MinimalSecureWebApplication.class); this.context.refresh(); @@ -396,8 +396,8 @@ public class OAuth2AutoConfigurationTests { public void resourceServerConditionWhenJwkConfigurationPresentShouldMatch() throws Exception { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "security.oauth2.resource.jwk.key-set-uri:http://my-auth-server/token_keys"); + TestPropertyValues.of( + "security.oauth2.resource.jwk.key-set-uri:http://my-auth-server/token_keys").applyTo(this.context); this.context.register(ResourceServerConfiguration.class, MinimalSecureWebApplication.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/MultipleResourceServerConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/MultipleResourceServerConfigurationTests.java index 0e716fdc88..209f164530 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/MultipleResourceServerConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/MultipleResourceServerConfigurationTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.security.oauth2.OAuth2AutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -55,9 +55,9 @@ public class MultipleResourceServerConfigurationTests { public void orderIsUnchangedWhenThereAreMultipleResourceServerConfigurations() { this.context = new AnnotationConfigWebApplicationContext(); this.context.register(DoubleResourceConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "security.oauth2.resource.tokenInfoUri:http://example.com", - "security.oauth2.client.clientId=acme"); + "security.oauth2.client.clientId=acme").applyTo(this.context); this.context.refresh(); assertThat(this.context .getBean("adminResources", ResourceServerConfiguration.class).getOrder()) diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java index af40e7e367..b569885cb5 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerTokenServicesConfigurationTests.java @@ -36,7 +36,7 @@ import org.springframework.boot.autoconfigure.social.FacebookAutoConfiguration; import org.springframework.boot.autoconfigure.social.SocialWebAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.servlet.server.MockServletWebServerFactory; import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.context.ConfigurableApplicationContext; @@ -99,8 +99,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void useRemoteTokenServices() { - EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.tokenInfoUri:http://example.com"); + TestPropertyValues.of( + "security.oauth2.resource.tokenInfoUri:http://example.com").applyTo(this.environment); this.context = new SpringApplicationBuilder(ResourceConfiguration.class) .environment(this.environment).web(WebApplicationType.NONE).run(); RemoteTokenServices services = this.context.getBean(RemoteTokenServices.class); @@ -109,8 +109,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void switchToUserInfo() { - EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.userInfoUri:http://example.com"); + TestPropertyValues.of( + "security.oauth2.resource.userInfoUri:http://example.com").applyTo(this.environment); this.context = new SpringApplicationBuilder(ResourceConfiguration.class) .environment(this.environment).web(WebApplicationType.NONE).run(); UserInfoTokenServices services = this.context @@ -120,8 +120,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void userInfoWithAuthorities() { - EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.userInfoUri:http://example.com"); + TestPropertyValues.of( + "security.oauth2.resource.userInfoUri:http://example.com").applyTo(this.environment); this.context = new SpringApplicationBuilder(AuthoritiesConfiguration.class) .environment(this.environment).web(WebApplicationType.NONE).run(); UserInfoTokenServices services = this.context @@ -133,8 +133,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void userInfoWithPrincipal() { - EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.userInfoUri:http://example.com"); + TestPropertyValues.of( + "security.oauth2.resource.userInfoUri:http://example.com").applyTo(this.environment); this.context = new SpringApplicationBuilder(PrincipalConfiguration.class) .environment(this.environment).web(WebApplicationType.NONE).run(); UserInfoTokenServices services = this.context @@ -146,10 +146,10 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void userInfoWithClient() { - EnvironmentTestUtils.addEnvironment(this.environment, + TestPropertyValues.of( "security.oauth2.client.client-id=acme", "security.oauth2.resource.userInfoUri:http://example.com", - "server.port=-1", "debug=true"); + "server.port=-1", "debug=true").applyTo(this.environment); this.context = new SpringApplicationBuilder(ResourceNoClientConfiguration.class) .environment(this.environment).web(WebApplicationType.SERVLET).run(); BeanDefinition bean = ((BeanDefinitionRegistry) this.context) @@ -159,10 +159,10 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void preferUserInfo() { - EnvironmentTestUtils.addEnvironment(this.environment, + TestPropertyValues.of( "security.oauth2.resource.userInfoUri:http://example.com", "security.oauth2.resource.tokenInfoUri:http://example.com", - "security.oauth2.resource.preferTokenInfo:false"); + "security.oauth2.resource.preferTokenInfo:false").applyTo(this.environment); this.context = new SpringApplicationBuilder(ResourceConfiguration.class) .environment(this.environment).web(WebApplicationType.NONE).run(); UserInfoTokenServices services = this.context @@ -172,10 +172,10 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void userInfoWithCustomizer() { - EnvironmentTestUtils.addEnvironment(this.environment, + TestPropertyValues.of( "security.oauth2.resource.userInfoUri:http://example.com", "security.oauth2.resource.tokenInfoUri:http://example.com", - "security.oauth2.resource.preferTokenInfo:false"); + "security.oauth2.resource.preferTokenInfo:false").applyTo(this.environment); this.context = new SpringApplicationBuilder(ResourceConfiguration.class, Customizer.class).environment(this.environment) .web(WebApplicationType.NONE).run(); @@ -186,8 +186,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void switchToJwt() { - EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.jwt.keyValue=FOOBAR"); + TestPropertyValues.of( + "security.oauth2.resource.jwt.keyValue=FOOBAR").applyTo(this.environment); this.context = new SpringApplicationBuilder(ResourceConfiguration.class) .environment(this.environment).web(WebApplicationType.NONE).run(); DefaultTokenServices services = this.context.getBean(DefaultTokenServices.class); @@ -198,8 +198,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void asymmetricJwt() { - EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.jwt.keyValue=" + PUBLIC_KEY); + TestPropertyValues.of( + "security.oauth2.resource.jwt.keyValue=" + PUBLIC_KEY).applyTo(this.environment); this.context = new SpringApplicationBuilder(ResourceConfiguration.class) .environment(this.environment).web(WebApplicationType.NONE).run(); DefaultTokenServices services = this.context.getBean(DefaultTokenServices.class); @@ -208,8 +208,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void jwkConfiguration() throws Exception { - EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.jwk.key-set-uri=http://my-auth-server/token_keys"); + TestPropertyValues.of( + "security.oauth2.resource.jwk.key-set-uri=http://my-auth-server/token_keys").applyTo(this.environment); this.context = new SpringApplicationBuilder(ResourceConfiguration.class) .environment(this.environment).web(WebApplicationType.NONE).run(); DefaultTokenServices services = this.context.getBean(DefaultTokenServices.class); @@ -220,10 +220,10 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void springSocialUserInfo() { - EnvironmentTestUtils.addEnvironment(this.environment, + TestPropertyValues.of( "security.oauth2.resource.userInfoUri:http://example.com", "spring.social.facebook.app-id=foo", - "spring.social.facebook.app-secret=bar"); + "spring.social.facebook.app-secret=bar").applyTo(this.environment); this.context = new SpringApplicationBuilder(SocialResourceConfiguration.class) .environment(this.environment).web(WebApplicationType.SERVLET).run(); ConnectionFactoryLocator connectionFactory = this.context @@ -236,8 +236,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void customUserInfoRestTemplateFactory() { - EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.userInfoUri:http://example.com"); + TestPropertyValues.of( + "security.oauth2.resource.userInfoUri:http://example.com").applyTo(this.environment); this.context = new SpringApplicationBuilder( CustomUserInfoRestTemplateFactory.class, ResourceConfiguration.class) .environment(this.environment).web(WebApplicationType.NONE).run(); @@ -249,8 +249,8 @@ public class ResourceServerTokenServicesConfigurationTests { @Test public void jwtAccessTokenConverterIsConfiguredWhenKeyUriIsProvided() { - EnvironmentTestUtils.addEnvironment(this.environment, - "security.oauth2.resource.jwt.key-uri=http://localhost:12345/banana"); + TestPropertyValues.of( + "security.oauth2.resource.jwt.key-uri=http://localhost:12345/banana").applyTo(this.environment); this.context = new SpringApplicationBuilder(ResourceConfiguration.class, JwtAccessTokenConverterRestTemplateCustomizerConfiguration.class) .environment(this.environment).web(WebApplicationType.NONE).run(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java index 1e2fedac38..c6db7f91cd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfigurationTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -85,7 +85,7 @@ public class SendGridAutoConfigurationTests { private void loadContext(Class additionalConfiguration, String... environment) { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); ConfigurationPropertySources.attach(this.context.getEnvironment()); this.context.register(SendGridAutoConfiguration.class); if (additionalConfiguration != null) { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java index fc591bb7d1..b073673ba3 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/session/AbstractSessionAutoConfigurationTests.java @@ -23,7 +23,7 @@ import org.junit.After; import org.springframework.beans.DirectFieldAccessor; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.web.ServerProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.session.SessionRepository; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; @@ -63,7 +63,7 @@ public abstract class AbstractSessionAutoConfigurationTests { protected void load(Collection> configs, String... environment) { AnnotationConfigWebApplicationContext ctx = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); if (configs != null) { ctx.register(configs.toArray(new Class[configs.size()])); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java index 71715e260a..f3db73dd27 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/FacebookAutoConfigurationTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.social; import org.junit.Test; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.social.facebook.api.Facebook; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; @@ -35,10 +35,10 @@ public class FacebookAutoConfigurationTests extends AbstractSocialAutoConfigurat @Test public void expectedSocialBeansCreated() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.social.facebook.appId:12345"); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.social.facebook.appSecret:secret"); + TestPropertyValues.of( + "spring.social.facebook.appId:12345").applyTo(this.context); + TestPropertyValues.of( + "spring.social.facebook.appSecret:secret").applyTo(this.context); ConfigurationPropertySources.attach(this.context.getEnvironment()); this.context.register(FacebookAutoConfiguration.class); this.context.register(SocialWebAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfigurationTests.java index 149b7cad87..433802a8e2 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/LinkedInAutoConfigurationTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.social; import org.junit.Test; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.social.linkedin.api.LinkedIn; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; @@ -35,10 +35,10 @@ public class LinkedInAutoConfigurationTests extends AbstractSocialAutoConfigurat @Test public void expectedSocialBeansCreated() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.social.linkedin.appId:12345"); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.social.linkedin.appSecret:secret"); + TestPropertyValues.of( + "spring.social.linkedin.appId:12345").applyTo(this.context); + TestPropertyValues.of( + "spring.social.linkedin.appSecret:secret").applyTo(this.context); ConfigurationPropertySources.attach(this.context.getEnvironment()); this.context.register(LinkedInAutoConfiguration.class); this.context.register(SocialWebAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/MultiApiAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/MultiApiAutoConfigurationTests.java index a15f7e10f7..3fbfe96ff4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/MultiApiAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/MultiApiAutoConfigurationTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.social; import org.junit.Test; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.social.facebook.api.Facebook; import org.springframework.social.linkedin.api.LinkedIn; import org.springframework.social.twitter.api.Twitter; @@ -111,7 +111,7 @@ public class MultiApiAutoConfigurationTests extends AbstractSocialAutoConfigurat private void setupContext(String... environment) { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); ConfigurationPropertySources.attach(this.context.getEnvironment()); this.context.register(TwitterAutoConfiguration.class); this.context.register(FacebookAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfigurationTests.java index a83ff69035..5554989d84 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/social/TwitterAutoConfigurationTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.social; import org.junit.Test; import org.springframework.boot.context.properties.source.ConfigurationPropertySources; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.social.twitter.api.Twitter; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; @@ -35,10 +35,10 @@ public class TwitterAutoConfigurationTests extends AbstractSocialAutoConfigurati @Test public void expectedSocialBeansCreated() throws Exception { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.social.twitter.appId:12345"); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.social.twitter.appSecret:secret"); + TestPropertyValues.of( + "spring.social.twitter.appId:12345").applyTo(this.context); + TestPropertyValues.of( + "spring.social.twitter.appSecret:secret").applyTo(this.context); ConfigurationPropertySources.attach(this.context.getEnvironment()); this.context.register(TwitterAutoConfiguration.class); this.context.register(SocialWebAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java index a5cb712341..7ebe9d4dcd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafReactiveAutoConfigurationTests.java @@ -35,7 +35,7 @@ import org.thymeleaf.templateresolver.ITemplateResolver; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.test.rule.OutputCapture; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.reactive.context.GenericReactiveWebApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -167,7 +167,7 @@ public class ThymeleafReactiveAutoConfigurationTests { private void load(Class config, String... envVariables) { this.context = new GenericReactiveWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, envVariables); + TestPropertyValues.of(envVariables).applyTo(this.context); if (config != null) { this.context.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java index b6787a89b2..4c5b3ec4bd 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafServletAutoConfigurationTests.java @@ -35,7 +35,7 @@ import org.thymeleaf.templateresolver.ITemplateResolver; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.test.rule.OutputCapture; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -219,7 +219,7 @@ public class ThymeleafServletAutoConfigurationTests { private void load(Class config, String... envVariables) { this.context = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, envVariables); + TestPropertyValues.of(envVariables).applyTo(this.context); if (config != null) { this.context.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java index e453f65b2c..76be4ca7db 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfigurationTests.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder; import org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -151,7 +151,7 @@ public class TransactionAutoConfigurationTests { AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(); applicationContext.register(configs); applicationContext.register(TransactionAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.refresh(); this.context = applicationContext; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java index e7548cea48..ef94176806 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfigurationTests.java @@ -52,7 +52,7 @@ import org.springframework.boot.jta.atomikos.AtomikosProperties; import org.springframework.boot.jta.bitronix.BitronixDependentBeanFactoryPostProcessor; import org.springframework.boot.jta.bitronix.PoolingConnectionFactoryBean; import org.springframework.boot.jta.bitronix.PoolingDataSourceBean; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -102,7 +102,7 @@ public class JtaAutoConfigurationTests { @Test public void disableJtaSupport() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, "spring.jta.enabled:false"); + TestPropertyValues.of("spring.jta.enabled:false").applyTo(this.context); this.context.register(JtaAutoConfiguration.class); this.context.refresh(); assertThat(this.context.getBeansOfType(JtaTransactionManager.class)).isEmpty(); @@ -149,8 +149,7 @@ public class JtaAutoConfigurationTests { @Test public void customBitronixServerId() throws UnknownHostException { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jta.transactionManagerId:custom"); + TestPropertyValues.of("spring.jta.transactionManagerId:custom").applyTo(this.context); this.context.register(JtaPropertiesConfiguration.class, BitronixJtaConfiguration.class); this.context.refresh(); @@ -162,8 +161,7 @@ public class JtaAutoConfigurationTests { @Test public void defaultAtomikosTransactionManagerName() throws UnknownHostException { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.jta.logDir:target/transaction-logs"); + TestPropertyValues.of("spring.jta.logDir:target/transaction-logs").applyTo(this.context); this.context.register(JtaPropertiesConfiguration.class, AtomikosJtaConfiguration.class); this.context.refresh(); @@ -176,9 +174,9 @@ public class JtaAutoConfigurationTests { @Test public void customAtomikosTransactionManagerName() throws BeansException, Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.jta.transactionManagerId:custom", - "spring.jta.logDir:target/transaction-logs"); + "spring.jta.logDir:target/transaction-logs").applyTo(this.context); this.context.register(JtaPropertiesConfiguration.class, AtomikosJtaConfiguration.class); this.context.refresh(); @@ -190,9 +188,9 @@ public class JtaAutoConfigurationTests { @Test public void atomikosConnectionFactoryPoolConfiguration() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.jta.atomikos.connectionfactory.minPoolSize:5", - "spring.jta.atomikos.connectionfactory.maxPoolSize:10"); + "spring.jta.atomikos.connectionfactory.maxPoolSize:10").applyTo(this.context); this.context.register(JtaPropertiesConfiguration.class, AtomikosJtaConfiguration.class, PoolConfiguration.class); this.context.refresh(); @@ -205,9 +203,9 @@ public class JtaAutoConfigurationTests { @Test public void bitronixConnectionFactoryPoolConfiguration() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.jta.bitronix.connectionfactory.minPoolSize:5", - "spring.jta.bitronix.connectionfactory.maxPoolSize:10"); + "spring.jta.bitronix.connectionfactory.maxPoolSize:10").applyTo(this.context); this.context.register(JtaPropertiesConfiguration.class, BitronixJtaConfiguration.class, PoolConfiguration.class); this.context.refresh(); @@ -220,9 +218,9 @@ public class JtaAutoConfigurationTests { @Test public void atomikosDataSourcePoolConfiguration() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.jta.atomikos.datasource.minPoolSize:5", - "spring.jta.atomikos.datasource.maxPoolSize:10"); + "spring.jta.atomikos.datasource.maxPoolSize:10").applyTo(this.context); this.context.register(JtaPropertiesConfiguration.class, AtomikosJtaConfiguration.class, PoolConfiguration.class); this.context.refresh(); @@ -235,9 +233,9 @@ public class JtaAutoConfigurationTests { @Test public void bitronixDataSourcePoolConfiguration() { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.jta.bitronix.datasource.minPoolSize:5", - "spring.jta.bitronix.datasource.maxPoolSize:10"); + "spring.jta.bitronix.datasource.maxPoolSize:10").applyTo(this.context); this.context.register(JtaPropertiesConfiguration.class, BitronixJtaConfiguration.class, PoolConfiguration.class); this.context.refresh(); @@ -250,9 +248,9 @@ public class JtaAutoConfigurationTests { @Test public void atomikosCustomizeJtaTransactionManagerUsingProperties() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.transaction.default-timeout:30", - "spring.transaction.rollback-on-commit-failure:true"); + "spring.transaction.rollback-on-commit-failure:true").applyTo(this.context); this.context.register(AtomikosJtaConfiguration.class, TransactionAutoConfiguration.class); this.context.refresh(); @@ -265,9 +263,9 @@ public class JtaAutoConfigurationTests { @Test public void bitronixCustomizeJtaTransactionManagerUsingProperties() throws Exception { this.context = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.transaction.default-timeout:30", - "spring.transaction.rollback-on-commit-failure:true"); + "spring.transaction.rollback-on-commit-failure:true").applyTo(this.context); this.context.register(BitronixJtaConfiguration.class, TransactionAutoConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java index 49db8492e6..c2bd802640 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/validation/ValidationAutoConfigurationTests.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -204,7 +204,7 @@ public class ValidationAutoConfigurationTests { private void load(Class config, String... environment) { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); if (config != null) { ctx.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java index 2b580da08d..a3a4b7b3ed 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ConditionalOnEnabledResourceChainTests.java @@ -19,7 +19,7 @@ package org.springframework.boot.autoconfigure.web; import org.junit.After; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -72,7 +72,7 @@ public class ConditionalOnEnabledResourceChainTests { private void load(String... environment) { this.context.register(Config.class); - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); this.context.refresh(); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java index 36f51b5a94..9694f47994 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/HttpHandlerAutoConfigurationTests.java @@ -20,7 +20,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.reactive.context.GenericReactiveWebApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -61,7 +61,7 @@ public class HttpHandlerAutoConfigurationTests { private void load(Class config, String... environment) { this.context = new GenericReactiveWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); if (this.context != null) { this.context.register(config); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java index 36326a1fdc..d3c0a66ede 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfigurationTests.java @@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.validation.ValidationAutoConfigura import org.springframework.boot.autoconfigure.validation.ValidatorAdapter; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfigurationTests.Config; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.reactive.context.GenericReactiveWebApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -287,7 +287,7 @@ public class WebFluxAutoConfigurationTests { private void load(Class config, Class[] exclude, String... environment) { this.context = new GenericReactiveWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); List> configClasses = new ArrayList<>(); if (config != null) { configClasses.add(config); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java index 68c64f49d1..d8598784d4 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DispatcherServletAutoConfigurationTests.java @@ -23,7 +23,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.context.annotation.Bean; @@ -118,7 +118,7 @@ public class DispatcherServletAutoConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); this.context.register(DispatcherServletAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, "server.servlet.path:/spring"); + TestPropertyValues.of("server.servlet.path:/spring").applyTo(this.context); this.context.refresh(); assertThat(this.context.getBean(DispatcherServlet.class)).isNotNull(); ServletRegistrationBean registration = this.context @@ -174,11 +174,11 @@ public class DispatcherServletAutoConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); this.context.register(DispatcherServletAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "spring.mvc.throw-exception-if-no-handler-found:true", "spring.mvc.dispatch-options-request:false", "spring.mvc.dispatch-trace-request:true", - "spring.mvc.servlet.load-on-startup=5"); + "spring.mvc.servlet.load-on-startup=5").applyTo(this.context); this.context.refresh(); DispatcherServlet bean = this.context.getBean(DispatcherServlet.class); assertThat(bean).extracting("throwExceptionIfNoHandlerFound") diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java index 9233e41edc..070f3dd65b 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/FilterOrderingIntegrationTests.java @@ -29,7 +29,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration; import org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration; import org.springframework.boot.autoconfigure.session.SessionAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.server.WebServerFactoryCustomizerBeanPostProcessor; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; import org.springframework.boot.web.servlet.filter.OrderedCharacterEncodingFilter; @@ -85,8 +85,8 @@ public class FilterOrderingIntegrationTests { private void load() { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.session.store-type=hash-map"); + TestPropertyValues.of( + "spring.session.store-type=hash-map").applyTo(this.context); this.context.register(MockWebServerConfiguration.class, TestRedisConfiguration.class, WebMvcAutoConfiguration.class, SecurityAutoConfiguration.class, SessionAutoConfiguration.class, diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java index f5218c77c1..3fb11415de 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfigurationTests.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.boot.web.server.WebServerFactoryCustomizerBeanPostProcessor; import org.springframework.boot.web.servlet.filter.OrderedHiddenHttpMethodFilter; @@ -187,7 +187,7 @@ public class HttpEncodingAutoConfigurationTests { private AnnotationConfigWebApplicationContext doLoad(Class[] configs, String... environment) { AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext(); - EnvironmentTestUtils.addEnvironment(applicationContext, environment); + TestPropertyValues.of(environment).applyTo(applicationContext); applicationContext.register(configs); applicationContext.register(MinimalWebAutoConfiguration.class, HttpEncodingAutoConfiguration.class); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java index d99370a7cb..a0618ac719 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java @@ -27,7 +27,7 @@ import org.junit.rules.ExpectedException; import org.springframework.boot.autoconfigure.web.ServerProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; @@ -171,8 +171,8 @@ public class MultipartAutoConfigurationTests { private void testWebServerWithCustomMultipartConfigEnabledSetting( final String propertyValue, int expectedNumberOfMultipartConfigElementBeans) { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.servlet.multipart.enabled=" + propertyValue); + TestPropertyValues.of( + "spring.servlet.multipart.enabled=" + propertyValue).applyTo(this.context); this.context.register(WebServerWithNoMultipartTomcat.class, BaseConfiguration.class); this.context.refresh(); @@ -194,8 +194,8 @@ public class MultipartAutoConfigurationTests { @Test public void configureResolveLazily() { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.servlet.multipart.resolve-lazily=true"); + TestPropertyValues.of( + "spring.servlet.multipart.resolve-lazily=true").applyTo(this.context); this.context.register(WebServerWithNothing.class, BaseConfiguration.class); this.context.refresh(); StandardServletMultipartResolver multipartResolver = this.context diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java index fb64c497b0..f69931bd3c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfigurationTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; @@ -122,9 +122,9 @@ public class ServletWebServerFactoryAutoConfigurationTests { @Test public void initParametersAreConfiguredOnTheServletContext() { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, + TestPropertyValues.of( "server.servlet.context-parameters.a:alpha", - "server.servlet.context-parameters.b:bravo"); + "server.servlet.context-parameters.b:bravo").applyTo(this.context); this.context.register(BaseConfiguration.class); this.context.refresh(); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java index 87f9df050f..b006c54ba5 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfigurationTests.java @@ -45,7 +45,7 @@ import org.springframework.boot.autoconfigure.validation.ValidationAutoConfigura import org.springframework.boot.autoconfigure.validation.ValidatorAdapter; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration.WebMvcAutoConfigurationAdapter; import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration.WelcomePageHandlerMapping; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.server.WebServerFactoryCustomizerBeanPostProcessor; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; import org.springframework.boot.web.servlet.filter.OrderedHttpPutFormContentFilter; @@ -415,8 +415,8 @@ public class WebMvcAutoConfigurationTests { @Test public void overrideIgnoreDefaultModelOnRedirect() throws Exception { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, - "spring.mvc.ignore-default-model-on-redirect:false"); + TestPropertyValues.of( + "spring.mvc.ignore-default-model-on-redirect:false").applyTo(this.context); this.context.register(Config.class, WebMvcAutoConfiguration.class, HttpMessageConvertersAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); @@ -766,7 +766,7 @@ public class WebMvcAutoConfigurationTests { private void load(Class config, Class[] exclude, String... environment) { this.context = new AnnotationConfigServletWebServerApplicationContext(); - EnvironmentTestUtils.addEnvironment(this.context, environment); + TestPropertyValues.of(environment).applyTo(this.context); List> configClasses = new ArrayList<>(); if (config != null) { configClasses.add(config); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfigurationTests.java index 24b65f027e..d549e0d429 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/webservices/WebServicesAutoConfigurationTests.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.beans.factory.BeanCreationException; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.servlet.ServletRegistrationBean; import org.springframework.mock.web.MockServletContext; import org.springframework.test.util.ReflectionTestUtils; @@ -104,7 +104,7 @@ public class WebServicesAutoConfigurationTests { private void load(Class config, String... environment) { AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext(); context.setServletContext(new MockServletContext()); - EnvironmentTestUtils.addEnvironment(context, environment); + TestPropertyValues.of(environment).applyTo(context); context.register(config); context.refresh(); this.context = context; diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfigurationTests.java index f95f1c45a6..e4f3da8be5 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/websocket/servlet/WebSocketMessagingAutoConfigurationTests.java @@ -36,7 +36,7 @@ import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletAutoConfiguration; import org.springframework.boot.autoconfigure.web.servlet.ServletWebServerFactoryAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.context.ServerPortInfoApplicationContextInitializer; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; @@ -140,8 +140,8 @@ public class WebSocketMessagingAutoConfigurationTests { } private Object performStompSubscription(final String topic) throws Throwable { - EnvironmentTestUtils.addEnvironment(this.context, "server.port:0", - "spring.jackson.serialization.indent-output:true"); + TestPropertyValues.of("server.port:0", + "spring.jackson.serialization.indent-output:true").applyTo(this.context); this.context.register(WebSocketMessagingConfiguration.class); new ServerPortInfoApplicationContextInitializer().initialize(this.context); this.context.refresh(); diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java index 33b0bff999..304a75c8f6 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/AbstractDevToolsDataSourceAutoConfigurationTests.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefiniti import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -110,11 +110,11 @@ public abstract class AbstractDevToolsDataSourceAutoConfigurationTests { context.register(classes); context.register(DevToolsDataSourceAutoConfiguration.class); if (driverClassName != null) { - EnvironmentTestUtils.addEnvironment(context, - "spring.datasource.driver-class-name:" + driverClassName); + TestPropertyValues.of( + "spring.datasource.driver-class-name:" + driverClassName).applyTo(context); } if (url != null) { - EnvironmentTestUtils.addEnvironment(context, "spring.datasource.url:" + url); + TestPropertyValues.of("spring.datasource.url:" + url).applyTo(context); } context.refresh(); return context; diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java index 3af5f23ac5..082e75f7f4 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfigurationTests.java @@ -34,7 +34,7 @@ import org.springframework.boot.devtools.tunnel.server.HttpTunnelServer; import org.springframework.boot.devtools.tunnel.server.RemoteDebugPortProvider; import org.springframework.boot.devtools.tunnel.server.SocketTargetServerConnection; import org.springframework.boot.devtools.tunnel.server.TargetServerConnection; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; @@ -231,7 +231,7 @@ public class RemoteDevToolsAutoConfigurationTests { this.context = new AnnotationConfigWebApplicationContext(); this.context.setServletContext(new MockServletContext()); this.context.register(Config.class, PropertyPlaceholderAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(this.context, properties); + TestPropertyValues.of(properties).applyTo(this.context); this.context.refresh(); } diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableConditionTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableConditionTests.java index e912a7989d..7c292de8ea 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableConditionTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/LocalDebugPortAvailableConditionTests.java @@ -23,7 +23,7 @@ import javax.net.ServerSocketFactory; import org.junit.Test; import org.springframework.boot.autoconfigure.condition.ConditionOutcome; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.ConditionContext; import org.springframework.mock.env.MockEnvironment; import org.springframework.util.SocketUtils; @@ -64,8 +64,8 @@ public class LocalDebugPortAvailableConditionTests { private ConditionOutcome getOutcome() { MockEnvironment environment = new MockEnvironment(); - EnvironmentTestUtils.addEnvironment(environment, - "spring.devtools.remote.debug.local-port:" + this.port); + TestPropertyValues.of( + "spring.devtools.remote.debug.local-port:" + this.port).applyTo(environment); ConditionContext context = mock(ConditionContext.class); given(context.getEnvironment()).willReturn(environment); ConditionOutcome outcome = this.condition.getMatchOutcome(context, null); diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java index 22e6524564..4297bd6a3c 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/remote/client/RemoteClientConfigurationTests.java @@ -40,7 +40,7 @@ import org.springframework.boot.devtools.restart.MockRestarter; import org.springframework.boot.devtools.restart.RestartScopeInitializer; import org.springframework.boot.devtools.tunnel.client.TunnelClient; import org.springframework.boot.test.rule.OutputCapture; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.servlet.context.AnnotationConfigServletWebServerApplicationContext; import org.springframework.context.annotation.Bean; @@ -154,11 +154,11 @@ public class RemoteClientConfigurationTests { this.context.register(Config.class, RemoteClientConfiguration.class); String remoteUrlProperty = "remoteUrl:" + remoteUrl + ":" + RemoteClientConfigurationTests.remotePort; - EnvironmentTestUtils.addEnvironment(this.context, remoteUrlProperty); - EnvironmentTestUtils.addEnvironment(this.context, pairs); + TestPropertyValues.of(remoteUrlProperty).applyTo(this.context); + TestPropertyValues.of(pairs).applyTo(this.context); if (setSecret) { - EnvironmentTestUtils.addEnvironment(this.context, - "spring.devtools.remote.secret:secret"); + TestPropertyValues.of( + "spring.devtools.remote.secret:secret").applyTo(this.context); } this.context.refresh(); } diff --git a/spring-boot-samples/spring-boot-sample-property-validation/src/test/java/sample/propertyvalidation/SamplePropertyValidationApplicationTests.java b/spring-boot-samples/spring-boot-sample-property-validation/src/test/java/sample/propertyvalidation/SamplePropertyValidationApplicationTests.java index b77c528fd8..825cae0024 100644 --- a/spring-boot-samples/spring-boot-sample-property-validation/src/test/java/sample/propertyvalidation/SamplePropertyValidationApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-property-validation/src/test/java/sample/propertyvalidation/SamplePropertyValidationApplicationTests.java @@ -23,7 +23,7 @@ import org.junit.rules.ExpectedException; import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.autoconfigure.web.ServerProperties; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.assertj.core.api.Assertions.assertThat; @@ -49,8 +49,8 @@ public class SamplePropertyValidationApplicationTests { @Test public void bindValidProperties() { this.context.register(SamplePropertyValidationApplication.class); - EnvironmentTestUtils.addEnvironment(this.context, "sample.host:192.168.0.1", - "sample.port:9090"); + TestPropertyValues.of("sample.host:192.168.0.1", + "sample.port:9090").applyTo(this.context); this.context.refresh(); SampleProperties properties = this.context.getBean(SampleProperties.class); assertThat(properties.getHost()).isEqualTo("192.168.0.1"); @@ -60,8 +60,8 @@ public class SamplePropertyValidationApplicationTests { @Test public void bindInvalidHost() { this.context.register(SamplePropertyValidationApplication.class); - EnvironmentTestUtils.addEnvironment(this.context, "sample.host:xxxxxx", - "sample.port:9090"); + TestPropertyValues.of("sample.host:xxxxxx", + "sample.port:9090").applyTo(this.context); this.thrown.expect(BeanCreationException.class); this.thrown.expectMessage("Failed to bind properties under 'sample'"); this.context.refresh(); @@ -79,8 +79,8 @@ public class SamplePropertyValidationApplicationTests { public void validatorOnlyCalledOnSupportedClass() { this.context.register(SamplePropertyValidationApplication.class); this.context.register(ServerProperties.class); // our validator will not apply - EnvironmentTestUtils.addEnvironment(this.context, "sample.host:192.168.0.1", - "sample.port:9090"); + TestPropertyValues.of("sample.host:192.168.0.1", + "sample.port:9090").applyTo(this.context); this.context.refresh(); SampleProperties properties = this.context.getBean(SampleProperties.class); assertThat(properties.getHost()).isEqualTo("192.168.0.1"); diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java index f1f6d29719..5e2c8b2036 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/OverrideAutoConfigurationContextCustomizerFactory.java @@ -19,7 +19,7 @@ package org.springframework.boot.test.autoconfigure; import java.util.List; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.test.context.ContextConfigurationAttributes; @@ -56,8 +56,8 @@ class OverrideAutoConfigurationContextCustomizerFactory @Override public void customizeContext(ConfigurableApplicationContext context, MergedContextConfiguration mergedConfig) { - EnvironmentTestUtils.addEnvironment(context, - EnableAutoConfiguration.ENABLED_OVERRIDE_PROPERTY + "=false"); + TestPropertyValues.of( + EnableAutoConfiguration.ENABLED_OVERRIDE_PROPERTY + "=false").applyTo(context); } @Override diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java index 85d2c58efe..7a419d0d57 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfigurationTests.java @@ -21,7 +21,7 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Test; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -79,7 +79,7 @@ public class TestDatabaseAutoConfigurationTests { ctx.register(config); } ctx.register(TestDatabaseAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.refresh(); return ctx; } diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java index bec2e656d8..b75012588b 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; import org.springframework.boot.test.autoconfigure.jdbc.TestDatabaseAutoConfiguration; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -89,7 +89,7 @@ public class TestDatabaseAutoConfigurationNoEmbeddedTests { ctx.register(config); } ctx.register(TestDatabaseAutoConfiguration.class); - EnvironmentTestUtils.addEnvironment(ctx, environment); + TestPropertyValues.of(environment).applyTo(ctx); ctx.refresh(); return ctx; } diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java index 24e6dcd452..d1601b776e 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/context/SpringBootContextLoader.java @@ -31,7 +31,7 @@ import org.springframework.boot.context.properties.bind.Binder; import org.springframework.boot.context.properties.source.ConfigurationPropertySource; import org.springframework.boot.context.properties.source.MapConfigurationPropertySource; import org.springframework.boot.test.mock.web.SpringBootMockServletContext; -import org.springframework.boot.test.util.EnvironmentTestUtils; +import org.springframework.boot.test.util.TestPropertyValues; import org.springframework.boot.web.reactive.context.GenericReactiveWebApplicationContext; import org.springframework.boot.web.servlet.support.ServletContextApplicationContextInitializer; import org.springframework.context.ApplicationContext; @@ -150,8 +150,8 @@ public class SpringBootContextLoader extends AbstractContextLoader { private void setActiveProfiles(ConfigurableEnvironment environment, String[] profiles) { - EnvironmentTestUtils.addEnvironment(environment, "spring.profiles.active=" - + StringUtils.arrayToCommaDelimitedString(profiles)); + TestPropertyValues.of("spring.profiles.active=" + + StringUtils.arrayToCommaDelimitedString(profiles)).applyTo(environment); } protected String[] getInlinedProperties(MergedContextConfiguration config) {