From 7c0c953f81b3ba80c9f26b198cf99b9ed76285c4 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 31 Jul 2015 15:15:27 +0200 Subject: [PATCH] Add value alias for SpringApplicationConfiguration Given that Spring Boot uses java config accross the board, a new `value` attribute is now aliased to the existing `classes` attribute such that one could write the following: @SpringApplicationConfiguration(MyConfig.class) public class MyTest {} Closes gh-3635 --- .../boot/actuate/hypermedia/EndpointDocumentation.java | 2 +- .../actuate/hypermedia/HealthEndpointDocumentation.java | 2 +- .../hypermedia/HypermediaEndpointDocumentation.java | 2 +- .../BrowserPathHypermediaIntegrationTests.java | 2 +- .../autoconfigure/EndpointMvcIntegrationTests.java | 2 +- .../ManagementContextPathHypermediaIntegrationTests.java | 2 +- .../ServerContextPathHypermediaIntegrationTests.java | 2 +- .../ServerPortHypermediaIntegrationTests.java | 2 +- .../autoconfigure/VanillaHypermediaIntegrationTests.java | 2 +- .../endpoint/mvc/EnvironmentMvcEndpointTests.java | 2 +- .../actuate/endpoint/mvc/JolokiaMvcEndpointTests.java | 2 +- .../actuate/endpoint/mvc/MetricsMvcEndpointTests.java | 2 +- .../integration/SpringIntegrationMetricReaderTests.java | 2 +- .../MessageSourceAutoConfigurationIntegrationTests.java | 2 +- .../MessageSourceAutoConfigurationProfileTests.java | 2 +- .../boot/autoconfigure/SpringJUnitTests.java | 2 +- ...seyAutoConfigurationCustomFilterContextPathTests.java | 2 +- .../JerseyAutoConfigurationCustomFilterPathTests.java | 2 +- ...eyAutoConfigurationCustomServletContextPathTests.java | 2 +- .../JerseyAutoConfigurationCustomServletPathTests.java | 2 +- .../JerseyAutoConfigurationDefaultFilterPathTests.java | 2 +- .../JerseyAutoConfigurationDefaultServletPathTests.java | 2 +- .../MustacheAutoConfigurationIntegrationTests.java | 2 +- .../mustache/MustacheStandaloneIntegrationTests.java | 2 +- .../mustache/web/MustacheWebIntegrationTests.java | 2 +- .../autoconfigure/security/jpa/JpaUserDetailsTests.java | 2 +- .../oauth2/sso/BasicOAuth2SsoConfigurationTests.java | 2 +- .../oauth2/sso/CustomOAuth2SsoConfigurationTests.java | 2 +- .../web/BasicErrorControllerIntegrationTests.java | 2 +- .../web/BasicErrorControllerMockMvcTests.java | 2 +- .../web/DefaultErrorViewIntegrationTests.java | 2 +- .../web/RemappedErrorViewIntegrationTests.java | 2 +- spring-boot-cli/test-samples/integration.groovy | 2 +- spring-boot-cli/test-samples/integration_auto.groovy | 2 +- .../test-samples/integration_auto_test.groovy | 2 +- .../integrationtest/HttpTunnelIntegrationTest.java | 2 +- spring-boot-docs/src/main/asciidoc/howto.adoc | 2 +- .../src/main/asciidoc/spring-boot-features.adoc | 6 +++--- .../java/sample/HelloWebSecurityApplicationTests.java | 2 +- .../test/java/sample/activemq/SampleActiveMqTests.java | 2 +- .../actuator/log4j/SampleActuatorApplicationTests.java | 2 +- .../actuator/log4j2/SampleActuatorApplicationTests.java | 2 +- .../noweb/SampleActuatorNoWebApplicationTests.java | 2 +- .../ui/SampleActuatorUiApplicationPortTests.java | 2 +- .../actuator/ui/SampleActuatorUiApplicationTests.java | 2 +- ...ndpointsPropertiesSampleActuatorApplicationTests.java | 2 +- .../ManagementAddressActuatorApplicationTests.java | 2 +- .../ManagementPathSampleActuatorApplicationTests.java | 2 +- .../ManagementPortSampleActuatorApplicationTests.java | 2 +- .../NoManagementSampleActuatorApplicationTests.java | 2 +- .../java/sample/actuator/NonSensitiveHealthTests.java | 2 +- .../sample/actuator/SampleActuatorApplicationTests.java | 2 +- .../ServletPathSampleActuatorApplicationTests.java | 2 +- ...ervletPathUnsecureSampleActuatorApplicationTests.java | 2 +- .../actuator/ShutdownSampleActuatorApplicationTests.java | 2 +- ...UnsecureManagementSampleActuatorApplicationTests.java | 2 +- .../actuator/UnsecureSampleActuatorApplicationTests.java | 2 +- .../atmosphere/SampleAtmosphereApplicationTests.java | 2 +- .../java/sample/cache/SampleCacheApplicationTests.java | 2 +- .../data/gemfire/SampleDataGemFireApplicationTests.java | 2 +- .../sample/data/jpa/SampleDataJpaApplicationTests.java | 2 +- .../data/jpa/service/CityRepositoryIntegrationTests.java | 2 +- .../jpa/service/HotelRepositoryIntegrationTests.java | 2 +- .../sample/data/mongo/SampleMongoApplicationTests.java | 2 +- .../sample/data/rest/SampleDataRestApplicationTests.java | 2 +- .../rest/service/CityRepositoryIntegrationTests.java | 2 +- .../java/sample/flyway/SampleFlywayApplicationTests.java | 2 +- .../sample/hateoas/SampleHateoasApplicationTests.java | 2 +- .../gson/SampleHypermediaGsonApplicationTests.java | 2 +- .../SampleHypermediaJpaApplicationIntegrationTests.java | 2 +- .../jpa/SampleHypermediaJpaApplicationTests.java | 2 +- .../ui/SampleHypermediaUiApplicationTests.java | 2 +- .../SampleHypermediaApplicationHomePageTests.java | 2 +- .../java/sample/jersey/SampleJerseyApplicationTests.java | 2 +- .../sample/jersey1/SampleJersey1ApplicationTests.java | 2 +- .../sample/jetty/ssl/SampleJettySslApplicationTests.java | 2 +- .../java/sample/jetty/SampleJettyApplicationTests.java | 2 +- .../jetty8/ssl/SampleJetty8SslApplicationTests.java | 2 +- .../java/sample/jetty8/SampleJetty8ApplicationTests.java | 2 +- .../sample/jetty93/SampleJetty93ApplicationTests.java | 2 +- .../test/java/sample/jpa/SampleJpaApplicationTests.java | 2 +- .../repository/JpaNoteRepositoryIntegrationTests.java | 2 +- .../jpa/repository/JpaTagRepositoryIntegrationTests.java | 2 +- .../SampleDropwizardMetricsApplicationTests.java | 2 +- .../opentsdb/SampleOpenTsdbExportApplicationTests.java | 2 +- .../metrics/redis/SampleRedisExportApplicationTests.java | 2 +- .../oauth2/SampleSecureOAuth2ApplicationTests.java | 2 +- .../java/sample/secure/SampleSecureApplicationTests.java | 2 +- .../sample/servlet/SampleServletApplicationTests.java | 2 +- .../simple/SpringTestSampleSimpleApplicationTests.java | 2 +- .../java/sample/testng/SampleTestNGApplicationTests.java | 2 +- .../sample/tomcat/jsp/SampleWebJspApplicationTests.java | 2 +- .../SampleTomcatTwoConnectorsApplicationTests.java | 2 +- .../sample/tomcat/SampleTomcatSslApplicationTests.java | 2 +- ...NonAutoConfigurationSampleTomcatApplicationTests.java | 2 +- .../java/sample/tomcat/SampleTomcatApplicationTests.java | 2 +- .../sample/tomcat7/jsp/SampleWebJspApplicationTests.java | 2 +- .../traditional/SampleTraditionalApplicationTests.java | 2 +- .../undertow/ssl/SampleUndertowSslApplicationTests.java | 2 +- .../sample/undertow/SampleUndertowApplicationTests.java | 2 +- .../sample/velocity/SampleVelocityApplicationTests.java | 2 +- .../freemarker/SampleWebFreeMarkerApplicationTests.java | 2 +- .../groovytemplates/MessageControllerWebTests.java | 2 +- .../SampleGroovyTemplateApplicationTests.java | 2 +- .../java/sample/jsp/SampleWebJspApplicationTests.java | 2 +- .../method/SampleMethodSecurityApplicationTests.java | 2 +- .../mustache/SampleWebMustacheApplicationTests.java | 2 +- .../ui/secure/SampleWebSecureCustomApplicationTests.java | 2 +- .../web/secure/github/SampleGithubApplicationTests.java | 2 +- .../jdbc/SampleWebSecureCustomApplicationTests.java | 2 +- .../sample/web/secure/SampleSecureApplicationTests.java | 2 +- .../webstatic/SampleWebStaticApplicationTests.java | 2 +- .../test/java/sample/ui/SampleWebUiApplicationTests.java | 2 +- .../web/velocity/SampleWebVelocityApplicationTests.java | 2 +- .../jetty/SampleWebSocketsApplicationTests.java | 2 +- .../echo/CustomContainerWebSocketsApplicationTests.java | 2 +- .../tomcat/SampleWebSocketsApplicationTests.java | 2 +- .../echo/CustomContainerWebSocketsApplicationTests.java | 2 +- .../undertow/SampleWebSocketsApplicationTests.java | 2 +- .../echo/CustomContainerWebSocketsApplicationTests.java | 2 +- .../test/java/sample/ws/SampleWsApplicationTests.java | 2 +- .../boot/test/SpringApplicationConfiguration.java | 9 ++++++++- .../boot/bind/PropertySourcesBindingTests.java | 2 +- .../boot/bind/SimplerPropertySourcesBindingTests.java | 2 +- .../context/web/ErrorPageFilterIntegrationTests.java | 2 +- .../test/SpringApplicationConfigurationJmxTests.java | 2 +- ...gApplicationIntegrationTestPropertyLocationTests.java | 2 +- .../boot/test/SpringApplicationIntegrationTestTests.java | 2 +- .../test/SpringApplicationWebIntegrationTestTests.java | 2 +- .../boot/test/SpringBootMockServletContextTests.java | 2 +- 130 files changed, 139 insertions(+), 132 deletions(-) diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java index 79b6c925cb8..a11c2a36439 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/EndpointDocumentation.java @@ -58,7 +58,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SpringBootHypermediaApplication.class) +@SpringApplicationConfiguration(SpringBootHypermediaApplication.class) @WebAppConfiguration @TestPropertySource(properties = { "spring.jackson.serialization.indent_output=true", "endpoints.health.sensitive=true", "endpoints.actuator.enabled=false" }) diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java index d8c3a3dd0c5..6b2243c33a6 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HealthEndpointDocumentation.java @@ -40,7 +40,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SpringBootHypermediaApplication.class) +@SpringApplicationConfiguration(SpringBootHypermediaApplication.class) @WebAppConfiguration @TestPropertySource(properties = { "spring.jackson.serialization.indent_output=true", "endpoints.health.sensitive=false" }) diff --git a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java index b343e421d1e..3742bfbf2e6 100644 --- a/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java +++ b/spring-boot-actuator-docs/src/restdoc/java/org/springframework/boot/actuate/hypermedia/HypermediaEndpointDocumentation.java @@ -40,7 +40,7 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SpringBootHypermediaApplication.class) +@SpringApplicationConfiguration(SpringBootHypermediaApplication.class) @WebAppConfiguration @TestPropertySource(properties = "spring.jackson.serialization.indent_output=true") @DirtiesContext diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BrowserPathHypermediaIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BrowserPathHypermediaIntegrationTests.java index 9f662c58567..bc6eddb7602 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BrowserPathHypermediaIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/BrowserPathHypermediaIntegrationTests.java @@ -48,7 +48,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SpringBootHypermediaApplication.class) +@SpringApplicationConfiguration(SpringBootHypermediaApplication.class) @WebAppConfiguration @TestPropertySource(properties = "endpoints.actuator.path=/actuator") @DirtiesContext diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java index eb3c1dff869..a6b679a76fa 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointMvcIntegrationTests.java @@ -72,7 +72,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(Application.class) @IntegrationTest("server.port=0") @WebAppConfiguration @DirtiesContext diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementContextPathHypermediaIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementContextPathHypermediaIntegrationTests.java index 7bef3edcb53..b4e2050c874 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementContextPathHypermediaIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementContextPathHypermediaIntegrationTests.java @@ -51,7 +51,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SpringBootHypermediaApplication.class) +@SpringApplicationConfiguration(SpringBootHypermediaApplication.class) @WebAppConfiguration @TestPropertySource(properties = "management.contextPath:/admin") @DirtiesContext diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ServerContextPathHypermediaIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ServerContextPathHypermediaIntegrationTests.java index a7d9ee1252f..bce0f028d6f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ServerContextPathHypermediaIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ServerContextPathHypermediaIntegrationTests.java @@ -51,7 +51,7 @@ import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SpringBootHypermediaApplication.class) +@SpringApplicationConfiguration(SpringBootHypermediaApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "server.contextPath=/spring" }) @DirtiesContext diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ServerPortHypermediaIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ServerPortHypermediaIntegrationTests.java index 1d4f0620a0a..7affede5a2b 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ServerPortHypermediaIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ServerPortHypermediaIntegrationTests.java @@ -51,7 +51,7 @@ import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SpringBootHypermediaApplication.class) +@SpringApplicationConfiguration(SpringBootHypermediaApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "management.port=0" }) @DirtiesContext diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/VanillaHypermediaIntegrationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/VanillaHypermediaIntegrationTests.java index a7bc48757e5..cd1a1b6a8f5 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/VanillaHypermediaIntegrationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/VanillaHypermediaIntegrationTests.java @@ -48,7 +48,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SpringBootHypermediaApplication.class) +@SpringApplicationConfiguration(SpringBootHypermediaApplication.class) @WebAppConfiguration @DirtiesContext public class VanillaHypermediaIntegrationTests { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java index c7be6db09fb..c6e6d6fc7c1 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/EnvironmentMvcEndpointTests.java @@ -52,7 +52,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { TestConfiguration.class }) +@SpringApplicationConfiguration(TestConfiguration.class) @WebAppConfiguration public class EnvironmentMvcEndpointTests { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointTests.java index 0a3cdd533ae..2200033c02f 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/JolokiaMvcEndpointTests.java @@ -57,7 +57,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { Config.class }) +@SpringApplicationConfiguration(Config.class) @WebAppConfiguration public class JolokiaMvcEndpointTests { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java index df38788d584..fd9dc44d506 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/mvc/MetricsMvcEndpointTests.java @@ -56,7 +56,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Sergei Egorov */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { TestConfiguration.class }) +@SpringApplicationConfiguration(TestConfiguration.class) @WebAppConfiguration public class MetricsMvcEndpointTests { diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java index 8b909ad27c3..d8fa84dd196 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/metrics/integration/SpringIntegrationMetricReaderTests.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = TestConfiguration.class) +@SpringApplicationConfiguration(TestConfiguration.class) @IntegrationTest("spring.jmx.enabled=true") @DirtiesContext public class SpringIntegrationMetricReaderTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java index 2a1829e0af8..065fa7a7c2a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationIntegrationTests.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals; * * @author Dave Syer */ -@SpringApplicationConfiguration(classes = { Config.class, +@SpringApplicationConfiguration({ Config.class, MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) @RunWith(SpringJUnit4ClassRunner.class) @IntegrationTest("spring.messages.basename:test/messages") diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationProfileTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationProfileTests.java index 7201ed5f21f..984c9ac78dc 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationProfileTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/MessageSourceAutoConfigurationProfileTests.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals; * * @author Dave Syer */ -@SpringApplicationConfiguration(classes = { Config.class, +@SpringApplicationConfiguration({ Config.class, MessageSourceAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) @RunWith(SpringJUnit4ClassRunner.class) @ActiveProfiles("switch-messages") diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java index 1b7def4d430..59dcd1b93f7 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/SpringJUnitTests.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertNotNull; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = TestConfiguration.class) +@SpringApplicationConfiguration(TestConfiguration.class) public class SpringJUnitTests { @Autowired diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java index c5494ef3aa4..cdfc81a8881 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterContextPathTests.java @@ -53,7 +53,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(Application.class) @IntegrationTest({ "server.port=0", "spring.jersey.type=filter", "server.contextPath=/app" }) @WebAppConfiguration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java index 224700430cd..66d3aad3e81 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomFilterPathTests.java @@ -53,7 +53,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(Application.class) @IntegrationTest({ "server.port=0", "spring.jersey.type=filter" }) @WebAppConfiguration public class JerseyAutoConfigurationCustomFilterPathTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java index 0fe58547f22..85a8c9facde 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletContextPathTests.java @@ -53,7 +53,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(Application.class) @IntegrationTest({ "server.port=0", "server.contextPath=/app" }) @WebAppConfiguration public class JerseyAutoConfigurationCustomServletContextPathTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java index 3816be662d0..529a9f7fefe 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationCustomServletPathTests.java @@ -53,7 +53,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(Application.class) @IntegrationTest("server.port=0") @WebAppConfiguration public class JerseyAutoConfigurationCustomServletPathTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java index 5fa023f3cf8..09be3545b96 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultFilterPathTests.java @@ -52,7 +52,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(Application.class) @IntegrationTest({ "server.port=0", "spring.jersey.type=filter" }) @WebAppConfiguration public class JerseyAutoConfigurationDefaultFilterPathTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java index e3160fa4e76..9cab0ad9132 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfigurationDefaultServletPathTests.java @@ -52,7 +52,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(Application.class) @IntegrationTest("server.port=0") @WebAppConfiguration public class JerseyAutoConfigurationDefaultServletPathTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java index 49f06aeec2c..db778c6de8a 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfigurationIntegrationTests.java @@ -53,7 +53,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(Application.class) @IntegrationTest({ "server.port:0", "spring.mustache.prefix:classpath:/mustache-templates/" }) @WebAppConfiguration diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java index 56695874bfa..0e1809ed05d 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/MustacheStandaloneIntegrationTests.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(Application.class) @IntegrationTest({ "spring.main.web_environment=false", "env.foo=Heaven", "foo=World" }) public class MustacheStandaloneIntegrationTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java index e63b6e31d1c..34d10d78cd0 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mustache/web/MustacheWebIntegrationTests.java @@ -64,7 +64,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) +@SpringApplicationConfiguration(Application.class) @IntegrationTest("server.port:0") @WebAppConfiguration public class MustacheWebIntegrationTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java index 6c2aa8fb5b1..e7b6c903650 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/jpa/JpaUserDetailsTests.java @@ -40,7 +40,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = JpaUserDetailsTests.Main.class) +@SpringApplicationConfiguration(JpaUserDetailsTests.Main.class) @DirtiesContext public class JpaUserDetailsTests { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/BasicOAuth2SsoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/BasicOAuth2SsoConfigurationTests.java index 7b296126771..186473edb98 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/BasicOAuth2SsoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/BasicOAuth2SsoConfigurationTests.java @@ -46,7 +46,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = TestConfiguration.class) +@SpringApplicationConfiguration(TestConfiguration.class) @WebAppConfiguration @TestPropertySource(properties = { "security.oauth2.client.clientId=client", "security.oauth2.client.clientSecret=secret", diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoConfigurationTests.java index de2a79f774d..9ae5b409f87 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/sso/CustomOAuth2SsoConfigurationTests.java @@ -52,7 +52,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = TestConfiguration.class) +@SpringApplicationConfiguration(TestConfiguration.class) @WebAppConfiguration @TestPropertySource(properties = { "security.oauth2.client.clientId=client", "security.oauth2.client.clientSecret=secret", diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java index 01fcf6225ac..e10ef732e74 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerIntegrationTests.java @@ -59,7 +59,7 @@ import static org.junit.Assert.assertThat; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = TestConfiguration.class) +@SpringApplicationConfiguration(TestConfiguration.class) @WebAppConfiguration @DirtiesContext @IntegrationTest("server.port=0") diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java index 14ff75ea3f5..e5073bf201c 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/BasicErrorControllerMockMvcTests.java @@ -67,7 +67,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * * @author Dave Syer */ -@SpringApplicationConfiguration(classes = TestConfiguration.class) +@SpringApplicationConfiguration(TestConfiguration.class) @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration @DirtiesContext diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java index a798db2d72c..90ed83401d1 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/DefaultErrorViewIntegrationTests.java @@ -48,7 +48,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. /** * @author Dave Syer */ -@SpringApplicationConfiguration(classes = TestConfiguration.class) +@SpringApplicationConfiguration(TestConfiguration.class) @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration @DirtiesContext diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/RemappedErrorViewIntegrationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/RemappedErrorViewIntegrationTests.java index 3223b45e115..5cc6ea452bf 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/RemappedErrorViewIntegrationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/RemappedErrorViewIntegrationTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue; /** * @author Dave Syer */ -@SpringApplicationConfiguration(classes = TestConfiguration.class) +@SpringApplicationConfiguration(TestConfiguration.class) @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration @IntegrationTest({ "server.servletPath:/spring/*", "server.port:0" }) diff --git a/spring-boot-cli/test-samples/integration.groovy b/spring-boot-cli/test-samples/integration.groovy index 6b3e1babf36..1870183d1b3 100644 --- a/spring-boot-cli/test-samples/integration.groovy +++ b/spring-boot-cli/test-samples/integration.groovy @@ -1,4 +1,4 @@ -@SpringApplicationConfiguration(classes=Application) +@SpringApplicationConfiguration(Application) @IntegrationTest class BookTests { @Autowired diff --git a/spring-boot-cli/test-samples/integration_auto.groovy b/spring-boot-cli/test-samples/integration_auto.groovy index 7e0bc8f2bad..a09cab57ae7 100644 --- a/spring-boot-cli/test-samples/integration_auto.groovy +++ b/spring-boot-cli/test-samples/integration_auto.groovy @@ -1,4 +1,4 @@ -@SpringApplicationConfiguration(classes=Application) +@SpringApplicationConfiguration(Application) @IntegrationTest('server.port:0') @WebAppConfiguration @DirtiesContext diff --git a/spring-boot-cli/test-samples/integration_auto_test.groovy b/spring-boot-cli/test-samples/integration_auto_test.groovy index dd340d42434..4da6c670b3d 100644 --- a/spring-boot-cli/test-samples/integration_auto_test.groovy +++ b/spring-boot-cli/test-samples/integration_auto_test.groovy @@ -1,4 +1,4 @@ -@SpringApplicationConfiguration(classes=ReactorApplication) +@SpringApplicationConfiguration(ReactorApplication) @IntegrationTest('server.port:0') class RestTests { diff --git a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java index 54fa6eaaa5d..1c3ec35b68a 100644 --- a/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java +++ b/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/integrationtest/HttpTunnelIntegrationTest.java @@ -61,7 +61,7 @@ import static org.junit.Assert.assertEquals; * @author Phillip Webb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = HttpTunnelIntegrationTest.Config.class) +@SpringApplicationConfiguration(HttpTunnelIntegrationTest.Config.class) @WebIntegrationTest public class HttpTunnelIntegrationTest { diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index 10b03d29335..758efa1a519 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -422,7 +422,7 @@ and then inject the actual ('`local`') port as a `@Value`. For example: [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- @RunWith(SpringJUnit4ClassRunner.class) - @SpringApplicationConfiguration(classes = SampleDataJpaApplication.class) + @SpringApplicationConfiguration(SampleDataJpaApplication.class) @WebIntegrationTest("server.port:0") public class CityRepositoryIntegrationTests { diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index aae8f6e5e06..483ef69c83d 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -3462,7 +3462,7 @@ For example: [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- @RunWith(SpringJUnit4ClassRunner.class) - @SpringApplicationConfiguration(classes = SampleDataJpaApplication.class) + @SpringApplicationConfiguration(SampleDataJpaApplication.class) public class CityRepositoryIntegrationTests { @Autowired @@ -3487,7 +3487,7 @@ interaction. For example: [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- @RunWith(SpringJUnit4ClassRunner.class) - @SpringApplicationConfiguration(classes = SampleDataJpaApplication.class) + @SpringApplicationConfiguration(SampleDataJpaApplication.class) @WebIntegrationTest public class CityRepositoryIntegrationTests { @@ -3514,7 +3514,7 @@ in order to run your integration tests using random ports. For example: [source,java,indent=0,subs="verbatim,quotes,attributes"] ---- @RunWith(SpringJUnit4ClassRunner.class) - @SpringApplicationConfiguration(classes = MyApplication.class) + @SpringApplicationConfiguration(MyApplication.class) @WebIntegrationTest({"server.port=0", "management.port=0"}) public class SomeIntegrationTests { diff --git a/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java index 6a88a9dd09a..7038ce6e6ba 100644 --- a/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java +++ b/spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/src/test/java/sample/HelloWebSecurityApplicationTests.java @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = HelloWebSecurityApplication.class) +@SpringApplicationConfiguration(HelloWebSecurityApplication.class) @WebIntegrationTest(randomPort = true) public class HelloWebSecurityApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-activemq/src/test/java/sample/activemq/SampleActiveMqTests.java b/spring-boot-samples/spring-boot-sample-activemq/src/test/java/sample/activemq/SampleActiveMqTests.java index 70c1102a9c2..baa67e5b430 100644 --- a/spring-boot-samples/spring-boot-sample-activemq/src/test/java/sample/activemq/SampleActiveMqTests.java +++ b/spring-boot-samples/spring-boot-sample-activemq/src/test/java/sample/activemq/SampleActiveMqTests.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertTrue; * @author Eddú Meléndez */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { SampleActiveMQApplication.class }) +@SpringApplicationConfiguration(SampleActiveMQApplication.class) public class SampleActiveMqTests { @Rule diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/sample/actuator/log4j/SampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/sample/actuator/log4j/SampleActuatorApplicationTests.java index 0067af03e56..775c8884faf 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/sample/actuator/log4j/SampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-log4j/src/test/java/sample/actuator/log4j/SampleActuatorApplicationTests.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertNotNull; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorLog4JApplication.class) +@SpringApplicationConfiguration(SampleActuatorLog4JApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/test/java/sample/actuator/log4j2/SampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/test/java/sample/actuator/log4j2/SampleActuatorApplicationTests.java index f9a8c2b6cd1..5b09fe9a16c 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/test/java/sample/actuator/log4j2/SampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-log4j2/src/test/java/sample/actuator/log4j2/SampleActuatorApplicationTests.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorLog4J2Application.class) +@SpringApplicationConfiguration(SampleActuatorLog4J2Application.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/noweb/SampleActuatorNoWebApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/noweb/SampleActuatorNoWebApplicationTests.java index 9281677c7aa..0b14f8a0b78 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/noweb/SampleActuatorNoWebApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-noweb/src/test/java/sample/actuator/noweb/SampleActuatorNoWebApplicationTests.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertNotNull; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorNoWebApplication.class) +@SpringApplicationConfiguration(SampleActuatorNoWebApplication.class) @DirtiesContext public class SampleActuatorNoWebApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java index bfe9339defb..b9167fdd493 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorUiApplication.class) +@SpringApplicationConfiguration(SampleActuatorUiApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "management.port:0" }) @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java index 8e62e1714b3..3b68092c0de 100644 --- a/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator-ui/src/test/java/sample/actuator/ui/SampleActuatorUiApplicationTests.java @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorUiApplication.class) +@SpringApplicationConfiguration(SampleActuatorUiApplication.class) @IntegrationTest("server.port=0") @WebAppConfiguration @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java index bdfc5c096c1..d53d8604904 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressActuatorApplicationTests.java index e236f8fa343..885239c67ee 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementAddressActuatorApplicationTests.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "management.port=0", "management.address=127.0.0.1", "management.context-path:/admin" }) diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPathSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPathSampleActuatorApplicationTests.java index 814a3f55ccc..e4323e7580b 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPathSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPathSampleActuatorApplicationTests.java @@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "management.context_path=/admin" }) @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortSampleActuatorApplicationTests.java index 6ef16a15500..8257ebf46fd 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ManagementPortSampleActuatorApplicationTests.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "management.port=0" }) @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java index c8935a754d7..37a6cdc15ce 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NoManagementSampleActuatorApplicationTests.java @@ -40,7 +40,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "management.port=-1" }) @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NonSensitiveHealthTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NonSensitiveHealthTests.java index c8bcf817207..8dc03f268eb 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NonSensitiveHealthTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/NonSensitiveHealthTests.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertFalse; * @author Phillip Webb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "endpoints.health.sensitive=false" }) @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java index 803c273fb2b..65a49859866 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/SampleActuatorApplicationTests.java @@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ServletPathSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ServletPathSampleActuatorApplicationTests.java index f6fd5bf6a55..8585f2091b8 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ServletPathSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ServletPathSampleActuatorApplicationTests.java @@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "server.servletPath=/spring" }) @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ServletPathUnsecureSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ServletPathUnsecureSampleActuatorApplicationTests.java index 2d6abd7d8aa..1eeb229a18b 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ServletPathUnsecureSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ServletPathUnsecureSampleActuatorApplicationTests.java @@ -40,7 +40,7 @@ import static org.junit.Assert.assertFalse; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port:0", "security.basic.enabled:false", "server.servletPath:/spring" }) diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java index 6cc02a8c07f..d5c4b75d2fa 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/ShutdownSampleActuatorApplicationTests.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java index 8458764f4bb..ed557204d77 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureManagementSampleActuatorApplicationTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port:0", "management.security.enabled:false" }) @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java index 4d5369393d5..b034ad7a380 100644 --- a/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-actuator/src/test/java/sample/actuator/UnsecureSampleActuatorApplicationTests.java @@ -40,7 +40,7 @@ import static org.junit.Assert.assertFalse; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleActuatorApplication.class) +@SpringApplicationConfiguration(SampleActuatorApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port:0", "security.basic.enabled:false" }) @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java b/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java index 2bcaf2b4bdd..0a7b4710d58 100644 --- a/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-atmosphere/src/test/java/sample/atmosphere/SampleAtmosphereApplicationTests.java @@ -47,7 +47,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleAtmosphereApplication.class) +@SpringApplicationConfiguration(SampleAtmosphereApplication.class) @WebIntegrationTest(randomPort = true) @DirtiesContext public class SampleAtmosphereApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-cache/src/test/java/sample/cache/SampleCacheApplicationTests.java b/spring-boot-samples/spring-boot-sample-cache/src/test/java/sample/cache/SampleCacheApplicationTests.java index ea7e990e810..0a54b619145 100644 --- a/spring-boot-samples/spring-boot-sample-cache/src/test/java/sample/cache/SampleCacheApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-cache/src/test/java/sample/cache/SampleCacheApplicationTests.java @@ -33,7 +33,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.core.IsNull.notNullValue; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { SampleCacheApplication.class }) +@SpringApplicationConfiguration(SampleCacheApplication.class) public class SampleCacheApplicationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTests.java index 6c4eb1a7e6b..4c9e0ea960c 100644 --- a/spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-gemfire/src/test/java/sample/data/gemfire/SampleDataGemFireApplicationTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertTrue; * @author John Blum */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleDataGemFireApplication.class) +@SpringApplicationConfiguration(SampleDataGemFireApplication.class) public class SampleDataGemFireApplicationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java index 4d6de813330..f4204bc3e09 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/SampleDataJpaApplicationTests.java @@ -45,7 +45,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleDataJpaApplication.class) +@SpringApplicationConfiguration(SampleDataJpaApplication.class) @WebAppConfiguration // Enable JMX so we can test the MBeans (you can't do this in a properties file) @TestPropertySource(properties = { "spring.jmx.enabled:true", diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java index 0817879eeec..a714ab9dbef 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/CityRepositoryIntegrationTests.java @@ -36,7 +36,7 @@ import static org.junit.Assert.assertThat; * @author Oliver Gierke */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleDataJpaApplication.class) +@SpringApplicationConfiguration(SampleDataJpaApplication.class) public class CityRepositoryIntegrationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java index e53f468fe21..d17fa537367 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/test/java/sample/data/jpa/service/HotelRepositoryIntegrationTests.java @@ -44,7 +44,7 @@ import static org.junit.Assert.assertThat; * @author Oliver Gierke */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleDataJpaApplication.class) +@SpringApplicationConfiguration(SampleDataJpaApplication.class) public class HotelRepositoryIntegrationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java index 85c9480eced..bde7e309475 100644 --- a/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-mongodb/src/test/java/sample/data/mongo/SampleMongoApplicationTests.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertTrue; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleMongoApplication.class) +@SpringApplicationConfiguration(SampleMongoApplication.class) @IntegrationTest public class SampleMongoApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/SampleDataRestApplicationTests.java b/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/SampleDataRestApplicationTests.java index 804f59624d4..2bd7c4dbb44 100644 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/SampleDataRestApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/SampleDataRestApplicationTests.java @@ -44,7 +44,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleDataRestApplication.class) +@SpringApplicationConfiguration(SampleDataRestApplication.class) @WebAppConfiguration @ActiveProfiles("scratch") // Separate profile for web tests to avoid clashing databases diff --git a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/service/CityRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/service/CityRepositoryIntegrationTests.java index 8272b15b158..55a3ba4c7d3 100644 --- a/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/service/CityRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-data-rest/src/test/java/sample/data/rest/service/CityRepositoryIntegrationTests.java @@ -40,7 +40,7 @@ import static org.junit.Assert.assertThat; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleDataRestApplication.class) +@SpringApplicationConfiguration(SampleDataRestApplication.class) public class CityRepositoryIntegrationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-flyway/src/test/java/sample/flyway/SampleFlywayApplicationTests.java b/spring-boot-samples/spring-boot-sample-flyway/src/test/java/sample/flyway/SampleFlywayApplicationTests.java index 6727479ccd2..f782b4dda37 100644 --- a/spring-boot-samples/spring-boot-sample-flyway/src/test/java/sample/flyway/SampleFlywayApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-flyway/src/test/java/sample/flyway/SampleFlywayApplicationTests.java @@ -26,7 +26,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleFlywayApplication.class) +@SpringApplicationConfiguration(SampleFlywayApplication.class) public class SampleFlywayApplicationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java b/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java index 07af34f1cdd..483ad3757f6 100644 --- a/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-hateoas/src/test/java/sample/hateoas/SampleHateoasApplicationTests.java @@ -35,7 +35,7 @@ import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertThat; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleHateoasApplication.class) +@SpringApplicationConfiguration(SampleHateoasApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java b/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java index 82026259a2a..5fb12f520aa 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-hypermedia-gson/src/test/java/sample/hypermedia/gson/SampleHypermediaGsonApplicationTests.java @@ -35,7 +35,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleHypermediaGsonApplication.class) +@SpringApplicationConfiguration(SampleHypermediaGsonApplication.class) @WebAppConfiguration @TestPropertySource(properties = "endpoints.health.sensitive: false") public class SampleHypermediaGsonApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationIntegrationTests.java b/spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationIntegrationTests.java index 46043024480..e2f34f4930b 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationIntegrationTests.java @@ -37,7 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleHypermediaJpaApplication.class) +@SpringApplicationConfiguration(SampleHypermediaJpaApplication.class) @WebAppConfiguration @DirtiesContext public class SampleHypermediaJpaApplicationIntegrationTests { diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationTests.java b/spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationTests.java index b2835e0d01c..f4ebb149426 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-hypermedia-jpa/src/test/java/sample/hypermedia/jpa/SampleHypermediaJpaApplicationTests.java @@ -23,7 +23,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.web.WebAppConfiguration; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleHypermediaJpaApplication.class) +@SpringApplicationConfiguration(SampleHypermediaJpaApplication.class) @WebAppConfiguration public class SampleHypermediaJpaApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-hypermedia-ui/src/test/java/sample/hypermedia/ui/SampleHypermediaUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-hypermedia-ui/src/test/java/sample/hypermedia/ui/SampleHypermediaUiApplicationTests.java index 37a5c07ec62..2d297cde117 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia-ui/src/test/java/sample/hypermedia/ui/SampleHypermediaUiApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-hypermedia-ui/src/test/java/sample/hypermedia/ui/SampleHypermediaUiApplicationTests.java @@ -36,7 +36,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import static org.junit.Assert.assertTrue; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleHypermediaUiApplication.class) +@SpringApplicationConfiguration(SampleHypermediaUiApplication.class) @WebAppConfiguration @IntegrationTest({ "management.context-path=", "server.port=0" }) public class SampleHypermediaUiApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-hypermedia/src/test/java/sample/hypermedia/SampleHypermediaApplicationHomePageTests.java b/spring-boot-samples/spring-boot-sample-hypermedia/src/test/java/sample/hypermedia/SampleHypermediaApplicationHomePageTests.java index 3f67fa45bea..eb7244c91a1 100644 --- a/spring-boot-samples/spring-boot-sample-hypermedia/src/test/java/sample/hypermedia/SampleHypermediaApplicationHomePageTests.java +++ b/spring-boot-samples/spring-boot-sample-hypermedia/src/test/java/sample/hypermedia/SampleHypermediaApplicationHomePageTests.java @@ -36,7 +36,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import static org.junit.Assert.assertTrue; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleHypermediaApplication.class) +@SpringApplicationConfiguration(SampleHypermediaApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") public class SampleHypermediaApplicationHomePageTests { diff --git a/spring-boot-samples/spring-boot-sample-jersey/src/test/java/sample/jersey/SampleJerseyApplicationTests.java b/spring-boot-samples/spring-boot-sample-jersey/src/test/java/sample/jersey/SampleJerseyApplicationTests.java index 724c716dd55..9dbcc718f1c 100644 --- a/spring-boot-samples/spring-boot-sample-jersey/src/test/java/sample/jersey/SampleJerseyApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jersey/src/test/java/sample/jersey/SampleJerseyApplicationTests.java @@ -31,7 +31,7 @@ import org.springframework.web.client.RestTemplate; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJerseyApplication.class) +@SpringApplicationConfiguration(SampleJerseyApplication.class) @IntegrationTest("server.port=0") @WebAppConfiguration public class SampleJerseyApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-jersey1/src/test/java/sample/jersey1/SampleJersey1ApplicationTests.java b/spring-boot-samples/spring-boot-sample-jersey1/src/test/java/sample/jersey1/SampleJersey1ApplicationTests.java index 67e32d5235d..3bc8fa96c2e 100644 --- a/spring-boot-samples/spring-boot-sample-jersey1/src/test/java/sample/jersey1/SampleJersey1ApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jersey1/src/test/java/sample/jersey1/SampleJersey1ApplicationTests.java @@ -28,7 +28,7 @@ import org.springframework.test.context.web.WebAppConfiguration; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJersey1Application.class) +@SpringApplicationConfiguration(SampleJersey1Application.class) @WebAppConfiguration @IntegrationTest("server.port:0") public class SampleJersey1ApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java index 0852dc21c05..a3a3e7db771 100644 --- a/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty-ssl/src/test/java/sample/jetty/ssl/SampleJettySslApplicationTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJettySslApplication.class) +@SpringApplicationConfiguration(SampleJettySslApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java index 25a17d3bbb9..b164a05a470 100644 --- a/spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty/src/test/java/sample/jetty/SampleJettyApplicationTests.java @@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJettyApplication.class) +@SpringApplicationConfiguration(SampleJettyApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/test/java/sample/jetty8/ssl/SampleJetty8SslApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/test/java/sample/jetty8/ssl/SampleJetty8SslApplicationTests.java index 2cbd0b151c1..696fb59af22 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/test/java/sample/jetty8/ssl/SampleJetty8SslApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty8-ssl/src/test/java/sample/jetty8/ssl/SampleJetty8SslApplicationTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJetty8SslApplication.class) +@SpringApplicationConfiguration(SampleJetty8SslApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-jetty8/src/test/java/sample/jetty8/SampleJetty8ApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty8/src/test/java/sample/jetty8/SampleJetty8ApplicationTests.java index 879fe2db0dd..621ffb9a83f 100644 --- a/spring-boot-samples/spring-boot-sample-jetty8/src/test/java/sample/jetty8/SampleJetty8ApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty8/src/test/java/sample/jetty8/SampleJetty8ApplicationTests.java @@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJetty8Application.class) +@SpringApplicationConfiguration(SampleJetty8Application.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-jetty93/src/test/java/sample/jetty93/SampleJetty93ApplicationTests.java b/spring-boot-samples/spring-boot-sample-jetty93/src/test/java/sample/jetty93/SampleJetty93ApplicationTests.java index cd4eca87645..71afbf7af38 100644 --- a/spring-boot-samples/spring-boot-sample-jetty93/src/test/java/sample/jetty93/SampleJetty93ApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jetty93/src/test/java/sample/jetty93/SampleJetty93ApplicationTests.java @@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJetty93Application.class) +@SpringApplicationConfiguration(SampleJetty93Application.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/SampleJpaApplicationTests.java b/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/SampleJpaApplicationTests.java index 1f14e18c214..6b8838526d8 100644 --- a/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/SampleJpaApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/SampleJpaApplicationTests.java @@ -38,7 +38,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJpaApplication.class) +@SpringApplicationConfiguration(SampleJpaApplication.class) @WebAppConfiguration public class SampleJpaApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/repository/JpaNoteRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/repository/JpaNoteRepositoryIntegrationTests.java index d8a5237f126..60b68aa2dde 100644 --- a/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/repository/JpaNoteRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/repository/JpaNoteRepositoryIntegrationTests.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJpaApplication.class) +@SpringApplicationConfiguration(SampleJpaApplication.class) public class JpaNoteRepositoryIntegrationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/repository/JpaTagRepositoryIntegrationTests.java b/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/repository/JpaTagRepositoryIntegrationTests.java index add24b39d0d..5c0c1aeb724 100644 --- a/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/repository/JpaTagRepositoryIntegrationTests.java +++ b/spring-boot-samples/spring-boot-sample-jpa/src/test/java/sample/jpa/repository/JpaTagRepositoryIntegrationTests.java @@ -34,7 +34,7 @@ import static org.junit.Assert.assertEquals; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJpaApplication.class) +@SpringApplicationConfiguration(SampleJpaApplication.class) public class JpaTagRepositoryIntegrationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-metrics-dropwizard/src/test/java/sample/metrics/dropwizard/SampleDropwizardMetricsApplicationTests.java b/spring-boot-samples/spring-boot-sample-metrics-dropwizard/src/test/java/sample/metrics/dropwizard/SampleDropwizardMetricsApplicationTests.java index ec6f70a2c05..41f2009de20 100644 --- a/spring-boot-samples/spring-boot-sample-metrics-dropwizard/src/test/java/sample/metrics/dropwizard/SampleDropwizardMetricsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-metrics-dropwizard/src/test/java/sample/metrics/dropwizard/SampleDropwizardMetricsApplicationTests.java @@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleDropwizardMetricsApplication.class) +@SpringApplicationConfiguration(SampleDropwizardMetricsApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/test/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplicationTests.java b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/test/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplicationTests.java index e617f81591d..4bb3568a8ad 100644 --- a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/test/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/test/java/sample/metrics/opentsdb/SampleOpenTsdbExportApplicationTests.java @@ -30,7 +30,7 @@ import org.springframework.test.context.web.WebAppConfiguration; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleOpenTsdbExportApplication.class) +@SpringApplicationConfiguration(SampleOpenTsdbExportApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-metrics-redis/src/test/java/sample/metrics/redis/SampleRedisExportApplicationTests.java b/spring-boot-samples/spring-boot-sample-metrics-redis/src/test/java/sample/metrics/redis/SampleRedisExportApplicationTests.java index 65180f4c44b..730c0637af1 100644 --- a/spring-boot-samples/spring-boot-sample-metrics-redis/src/test/java/sample/metrics/redis/SampleRedisExportApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-metrics-redis/src/test/java/sample/metrics/redis/SampleRedisExportApplicationTests.java @@ -30,7 +30,7 @@ import org.springframework.test.context.web.WebAppConfiguration; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleRedisExportApplication.class) +@SpringApplicationConfiguration(SampleRedisExportApplication.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "spring.jmx.enabled=true" }) @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-secure-oauth2/src/test/java/sample/secure/oauth2/SampleSecureOAuth2ApplicationTests.java b/spring-boot-samples/spring-boot-sample-secure-oauth2/src/test/java/sample/secure/oauth2/SampleSecureOAuth2ApplicationTests.java index b12a7e087e4..3dcb7a6de6a 100644 --- a/spring-boot-samples/spring-boot-sample-secure-oauth2/src/test/java/sample/secure/oauth2/SampleSecureOAuth2ApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-secure-oauth2/src/test/java/sample/secure/oauth2/SampleSecureOAuth2ApplicationTests.java @@ -41,7 +41,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC */ @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration -@SpringApplicationConfiguration(classes = SampleSecureOAuth2Application.class) +@SpringApplicationConfiguration(SampleSecureOAuth2Application.class) @IntegrationTest("server.port:0") public class SampleSecureOAuth2ApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java index 500fd130499..d96aef57bed 100644 --- a/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-secure/src/test/java/sample/secure/SampleSecureApplicationTests.java @@ -43,7 +43,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { SampleSecureApplication.class, +@SpringApplicationConfiguration({ SampleSecureApplication.class, TestConfiguration.class }) public class SampleSecureApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java b/spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java index 66e644d195a..f374e8c42ff 100644 --- a/spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-servlet/src/test/java/sample/servlet/SampleServletApplicationTests.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleServletApplication.class) +@SpringApplicationConfiguration(SampleServletApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SpringTestSampleSimpleApplicationTests.java b/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SpringTestSampleSimpleApplicationTests.java index 42ebd9db22a..9e653045b00 100644 --- a/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SpringTestSampleSimpleApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SpringTestSampleSimpleApplicationTests.java @@ -32,7 +32,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleSimpleApplication.class) +@SpringApplicationConfiguration(SampleSimpleApplication.class) public class SpringTestSampleSimpleApplicationTests { @Autowired diff --git a/spring-boot-samples/spring-boot-sample-testng/src/test/java/sample/testng/SampleTestNGApplicationTests.java b/spring-boot-samples/spring-boot-sample-testng/src/test/java/sample/testng/SampleTestNGApplicationTests.java index 38ebfe872ec..0d179b71bae 100644 --- a/spring-boot-samples/spring-boot-sample-testng/src/test/java/sample/testng/SampleTestNGApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-testng/src/test/java/sample/testng/SampleTestNGApplicationTests.java @@ -34,7 +34,7 @@ import static org.testng.Assert.assertEquals; * * @author Phillip Webb */ -@SpringApplicationConfiguration(classes = SampleTestNGApplication.class) +@SpringApplicationConfiguration(SampleTestNGApplication.class) @WebIntegrationTest("server.port:0") @DirtiesContext public class SampleTestNGApplicationTests extends AbstractTestNGSpringContextTests { diff --git a/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/test/java/sample/tomcat/jsp/SampleWebJspApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/test/java/sample/tomcat/jsp/SampleWebJspApplicationTests.java index fe365a17a8e..66013ffc280 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/test/java/sample/tomcat/jsp/SampleWebJspApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-jsp/src/test/java/sample/tomcat/jsp/SampleWebJspApplicationTests.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue; * @author Phillip Webb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleTomcatJspApplication.class) +@SpringApplicationConfiguration(SampleTomcatJspApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java index 67f462b7248..4d3b7f84809 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/src/test/java/sample/tomcat/multiconnector/SampleTomcatTwoConnectorsApplicationTests.java @@ -51,7 +51,7 @@ import static org.junit.Assert.assertEquals; * @author Brock Mills */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleTomcatTwoConnectorsApplication.class) +@SpringApplicationConfiguration(SampleTomcatTwoConnectorsApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java index 00eb5fcb81e..713400ba3c3 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat-ssl/src/test/java/sample/tomcat/SampleTomcatSslApplicationTests.java @@ -39,7 +39,7 @@ import sample.tomcat.ssl.SampleTomcatSslApplication; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleTomcatSslApplication.class) +@SpringApplicationConfiguration(SampleTomcatSslApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java index 03475470650..4473cf31c6a 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java @@ -50,7 +50,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = NonAutoConfigurationSampleTomcatApplication.class) +@SpringApplicationConfiguration(NonAutoConfigurationSampleTomcatApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java index f4584ec46c5..3e2a7dc712c 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat/src/test/java/sample/tomcat/SampleTomcatApplicationTests.java @@ -45,7 +45,7 @@ import static org.junit.Assert.assertEquals; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleTomcatApplication.class) +@SpringApplicationConfiguration(SampleTomcatApplication.class) @WebIntegrationTest(randomPort = true) @DirtiesContext public class SampleTomcatApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/test/java/sample/tomcat7/jsp/SampleWebJspApplicationTests.java b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/test/java/sample/tomcat7/jsp/SampleWebJspApplicationTests.java index 31cf2cfd111..518749eff8a 100644 --- a/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/test/java/sample/tomcat7/jsp/SampleWebJspApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-tomcat7-jsp/src/test/java/sample/tomcat7/jsp/SampleWebJspApplicationTests.java @@ -38,7 +38,7 @@ import static org.junit.Assert.assertTrue; * @author Phillip Webb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleTomcat7JspApplication.class) +@SpringApplicationConfiguration(SampleTomcat7JspApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-traditional/src/test/java/sample/traditional/SampleTraditionalApplicationTests.java b/spring-boot-samples/spring-boot-sample-traditional/src/test/java/sample/traditional/SampleTraditionalApplicationTests.java index eb2754460f8..ddfb9b7adde 100644 --- a/spring-boot-samples/spring-boot-sample-traditional/src/test/java/sample/traditional/SampleTraditionalApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-traditional/src/test/java/sample/traditional/SampleTraditionalApplicationTests.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleTraditionalApplication.class) +@SpringApplicationConfiguration(SampleTraditionalApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-undertow-ssl/src/test/java/sample/undertow/ssl/SampleUndertowSslApplicationTests.java b/spring-boot-samples/spring-boot-sample-undertow-ssl/src/test/java/sample/undertow/ssl/SampleUndertowSslApplicationTests.java index 86704bbc1e9..d20a95cb235 100644 --- a/spring-boot-samples/spring-boot-sample-undertow-ssl/src/test/java/sample/undertow/ssl/SampleUndertowSslApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-undertow-ssl/src/test/java/sample/undertow/ssl/SampleUndertowSslApplicationTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertEquals; * @author Ivan Sopov */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleUndertowSslApplication.class) +@SpringApplicationConfiguration(SampleUndertowSslApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-undertow/src/test/java/sample/undertow/SampleUndertowApplicationTests.java b/spring-boot-samples/spring-boot-sample-undertow/src/test/java/sample/undertow/SampleUndertowApplicationTests.java index cc9d15196cb..d639e6d0ca3 100644 --- a/spring-boot-samples/spring-boot-sample-undertow/src/test/java/sample/undertow/SampleUndertowApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-undertow/src/test/java/sample/undertow/SampleUndertowApplicationTests.java @@ -46,7 +46,7 @@ import static org.junit.Assert.assertEquals; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleUndertowApplication.class) +@SpringApplicationConfiguration(SampleUndertowApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-velocity/src/test/java/sample/velocity/SampleVelocityApplicationTests.java b/spring-boot-samples/spring-boot-sample-velocity/src/test/java/sample/velocity/SampleVelocityApplicationTests.java index ad325f46b3d..0cdc0d35155 100644 --- a/spring-boot-samples/spring-boot-sample-velocity/src/test/java/sample/velocity/SampleVelocityApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-velocity/src/test/java/sample/velocity/SampleVelocityApplicationTests.java @@ -31,7 +31,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleVelocityApplication.class) +@SpringApplicationConfiguration(SampleVelocityApplication.class) public class SampleVelocityApplicationTests { @ClassRule diff --git a/spring-boot-samples/spring-boot-sample-web-freemarker/src/test/java/sample/freemarker/SampleWebFreeMarkerApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-freemarker/src/test/java/sample/freemarker/SampleWebFreeMarkerApplicationTests.java index 553ec8526c6..883bbe1340a 100644 --- a/spring-boot-samples/spring-boot-sample-web-freemarker/src/test/java/sample/freemarker/SampleWebFreeMarkerApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-freemarker/src/test/java/sample/freemarker/SampleWebFreeMarkerApplicationTests.java @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleWebFreeMarkerApplication.class) +@SpringApplicationConfiguration(SampleWebFreeMarkerApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/MessageControllerWebTests.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/MessageControllerWebTests.java index 67e119cf0f7..dcdff86ae1b 100755 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/MessageControllerWebTests.java +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/MessageControllerWebTests.java @@ -48,7 +48,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. */ @RunWith(SpringJUnit4ClassRunner.class) @WebAppConfiguration -@SpringApplicationConfiguration(classes = SampleGroovyTemplateApplication.class) +@SpringApplicationConfiguration(SampleGroovyTemplateApplication.class) @DirtiesContext public class MessageControllerWebTests { diff --git a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java index 291a3a9f373..1289dd2d847 100644 --- a/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-groovy-templates/src/test/java/sample/groovytemplates/SampleGroovyTemplateApplicationTests.java @@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleGroovyTemplateApplication.class) +@SpringApplicationConfiguration(SampleGroovyTemplateApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java index 405633255fc..a48397e1eaf 100644 --- a/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-jsp/src/test/java/sample/jsp/SampleWebJspApplicationTests.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue; * @author Phillip Webb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleWebJspApplication.class) +@SpringApplicationConfiguration(SampleWebJspApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java index b0f7eb6523d..95389bb7472 100644 --- a/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/test/java/sample/security/method/SampleMethodSecurityApplicationTests.java @@ -48,7 +48,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleMethodSecurityApplication.class) +@SpringApplicationConfiguration(SampleMethodSecurityApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java index 20e69a1c3f1..af1f364aef5 100644 --- a/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-mustache/src/test/java/sample/mustache/SampleWebMustacheApplicationTests.java @@ -44,7 +44,7 @@ import static org.junit.Assert.assertTrue; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleWebMustacheApplication.class) +@SpringApplicationConfiguration(SampleWebMustacheApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java index dfe00970c8c..b42fa46d4d0 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-custom/src/test/java/sample/ui/secure/SampleWebSecureCustomApplicationTests.java @@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleWebSecureCustomApplication.class) +@SpringApplicationConfiguration(SampleWebSecureCustomApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-web-secure-github/src/test/java/sample/web/secure/github/SampleGithubApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure-github/src/test/java/sample/web/secure/github/SampleGithubApplicationTests.java index 31ea9a4b13a..694b15da340 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-github/src/test/java/sample/web/secure/github/SampleGithubApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-github/src/test/java/sample/web/secure/github/SampleGithubApplicationTests.java @@ -42,7 +42,7 @@ import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppC * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleGithubSecureApplication.class) +@SpringApplicationConfiguration(SampleGithubSecureApplication.class) @WebAppConfiguration @DirtiesContext public class SampleGithubApplicationTests { diff --git a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureCustomApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureCustomApplicationTests.java index a7e70b0ef52..f1a49907c55 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureCustomApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-secure-jdbc/src/test/java/sample/web/secure/jdbc/SampleWebSecureCustomApplicationTests.java @@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleWebSecureCustomApplication.class) +@SpringApplicationConfiguration(SampleWebSecureCustomApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java index 96fbc5aa8e2..3bda58711c8 100644 --- a/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-secure/src/test/java/sample/web/secure/SampleSecureApplicationTests.java @@ -49,7 +49,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleWebSecureApplication.class) +@SpringApplicationConfiguration(SampleWebSecureApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/webstatic/SampleWebStaticApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/webstatic/SampleWebStaticApplicationTests.java index 22fd489bf72..c8f585c9766 100644 --- a/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/webstatic/SampleWebStaticApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-static/src/test/java/sample/webstatic/SampleWebStaticApplicationTests.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleWebStaticApplication.class) +@SpringApplicationConfiguration(SampleWebStaticApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java index 637f3ec059b..652407b8b32 100644 --- a/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-ui/src/test/java/sample/ui/SampleWebUiApplicationTests.java @@ -43,7 +43,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleWebUiApplication.class) +@SpringApplicationConfiguration(SampleWebUiApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-web-velocity/src/test/java/sample/web/velocity/SampleWebVelocityApplicationTests.java b/spring-boot-samples/spring-boot-sample-web-velocity/src/test/java/sample/web/velocity/SampleWebVelocityApplicationTests.java index 79758a57a61..c32284a295e 100644 --- a/spring-boot-samples/spring-boot-sample-web-velocity/src/test/java/sample/web/velocity/SampleWebVelocityApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-web-velocity/src/test/java/sample/web/velocity/SampleWebVelocityApplicationTests.java @@ -45,7 +45,7 @@ import static org.junit.Assert.assertTrue; * @author Andy Wilkinson */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleWebVelocityApplication.class) +@SpringApplicationConfiguration(SampleWebVelocityApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java index 047cad9e723..841687fb7d2 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/SampleWebSocketsApplicationTests.java @@ -46,7 +46,7 @@ import samples.websocket.jetty.client.SimpleGreetingService; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleJettyWebSocketsApplication.class) +@SpringApplicationConfiguration(SampleJettyWebSocketsApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java index 623ac4e1f5a..528a10958d4 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-jetty/src/test/java/samples/websocket/jetty/echo/CustomContainerWebSocketsApplicationTests.java @@ -50,7 +50,7 @@ import samples.websocket.jetty.echo.CustomContainerWebSocketsApplicationTests.Cu import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { SampleJettyWebSocketsApplication.class, +@SpringApplicationConfiguration({ SampleJettyWebSocketsApplication.class, CustomContainerConfiguration.class }) @WebAppConfiguration @IntegrationTest diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java index bd19f3f7090..24312a069cd 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/SampleWebSocketsApplicationTests.java @@ -46,7 +46,7 @@ import samples.websocket.tomcat.client.SimpleGreetingService; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleTomcatWebSocketApplication.class) +@SpringApplicationConfiguration(SampleTomcatWebSocketApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java index f7ccf675e53..98e3109b4d3 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-tomcat/src/test/java/samples/websocket/tomcat/echo/CustomContainerWebSocketsApplicationTests.java @@ -50,7 +50,7 @@ import samples.websocket.tomcat.echo.CustomContainerWebSocketsApplicationTests.C import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { SampleTomcatWebSocketApplication.class, +@SpringApplicationConfiguration({ SampleTomcatWebSocketApplication.class, CustomContainerConfiguration.class }) @WebAppConfiguration @IntegrationTest diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java index 7d48b4a8b92..d903be4ef26 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/SampleWebSocketsApplicationTests.java @@ -46,7 +46,7 @@ import samples.websocket.undertow.client.SimpleGreetingService; import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleUndertowWebSocketsApplication.class) +@SpringApplicationConfiguration(SampleUndertowWebSocketsApplication.class) @WebAppConfiguration @IntegrationTest("server.port:0") @DirtiesContext diff --git a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java index d4fba895fad..cef7ae350e2 100644 --- a/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-websocket-undertow/src/test/java/samples/websocket/undertow/echo/CustomContainerWebSocketsApplicationTests.java @@ -50,7 +50,7 @@ import samples.websocket.undertow.echo.CustomContainerWebSocketsApplicationTests import static org.junit.Assert.assertEquals; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { SampleUndertowWebSocketsApplication.class, +@SpringApplicationConfiguration({ SampleUndertowWebSocketsApplication.class, CustomContainerConfiguration.class }) @WebAppConfiguration @IntegrationTest diff --git a/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java b/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java index 35ce213229b..1aa23721f76 100644 --- a/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java +++ b/spring-boot-samples/spring-boot-sample-ws/src/test/java/sample/ws/SampleWsApplicationTests.java @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SampleWsApplication.class) +@SpringApplicationConfiguration(SampleWsApplication.class) @WebAppConfiguration @IntegrationTest("server.port=0") public class SampleWsApplicationTests { diff --git a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java index 947489e05fc..594e3b9afa0 100644 --- a/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java +++ b/spring-boot/src/main/java/org/springframework/boot/test/SpringApplicationConfiguration.java @@ -47,6 +47,13 @@ import org.springframework.test.context.ContextConfiguration; @Target(ElementType.TYPE) public @interface SpringApplicationConfiguration { + /** + * @see ContextConfiguration#classes() + * @return the context configuration classes + */ + @AliasFor("classes") + Class[] value() default {}; + /** * @see ContextConfiguration#locations() * @return the context configuration locations @@ -58,7 +65,7 @@ public @interface SpringApplicationConfiguration { * @see ContextConfiguration#classes() * @return the context configuration classes */ - @AliasFor(annotation = ContextConfiguration.class, attribute = "classes") + @AliasFor("value") Class[] classes() default {}; /** diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java index d44bbfa9ccb..52012b68678 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/PropertySourcesBindingTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertThat; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = TestConfig.class) +@SpringApplicationConfiguration(TestConfig.class) @IntegrationTest public class PropertySourcesBindingTests { diff --git a/spring-boot/src/test/java/org/springframework/boot/bind/SimplerPropertySourcesBindingTests.java b/spring-boot/src/test/java/org/springframework/boot/bind/SimplerPropertySourcesBindingTests.java index a17f4ef70a8..a7dcb5962df 100644 --- a/spring-boot/src/test/java/org/springframework/boot/bind/SimplerPropertySourcesBindingTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/bind/SimplerPropertySourcesBindingTests.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertThat; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = TestConfig.class) +@SpringApplicationConfiguration(TestConfig.class) @IntegrationTest public class SimplerPropertySourcesBindingTests { diff --git a/spring-boot/src/test/java/org/springframework/boot/context/web/ErrorPageFilterIntegrationTests.java b/spring-boot/src/test/java/org/springframework/boot/context/web/ErrorPageFilterIntegrationTests.java index 66a9a3bfdb2..1034d9a130d 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/web/ErrorPageFilterIntegrationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/web/ErrorPageFilterIntegrationTests.java @@ -60,7 +60,7 @@ import static org.junit.Assert.assertThat; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = TomcatConfig.class) +@SpringApplicationConfiguration(TomcatConfig.class) @IntegrationTest @WebAppConfiguration public class ErrorPageFilterIntegrationTests { diff --git a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationJmxTests.java b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationJmxTests.java index 4ce9cf4dfce..bd85bc5022f 100644 --- a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationJmxTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationConfigurationJmxTests.java @@ -33,7 +33,7 @@ import static org.junit.Assert.assertFalse; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Config.class) +@SpringApplicationConfiguration(Config.class) @IntegrationTest public class SpringApplicationConfigurationJmxTests { diff --git a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestPropertyLocationTests.java b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestPropertyLocationTests.java index fdf1265020a..67ab81d6ace 100644 --- a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestPropertyLocationTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestPropertyLocationTests.java @@ -39,7 +39,7 @@ import static org.junit.Assert.assertThat; * @author Phillip Webb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = { Config.class, MoreConfig.class }) +@SpringApplicationConfiguration({ Config.class, MoreConfig.class }) @WebAppConfiguration @IntegrationTest({ "server.port=0", "value1=123" }) @TestPropertySource(properties = "value2=456", locations = "classpath:/test-property-source-annotation.properties") diff --git a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestTests.java b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestTests.java index 1cf9a767426..b8a62cc5153 100644 --- a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationIntegrationTestTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.assertNotEquals; * @author Dave Syer */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Config.class) +@SpringApplicationConfiguration(Config.class) @WebAppConfiguration @IntegrationTest({ "server.port=0", "value=123" }) public class SpringApplicationIntegrationTestTests { diff --git a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationWebIntegrationTestTests.java b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationWebIntegrationTestTests.java index b4149d762d6..f33c8372ffd 100644 --- a/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationWebIntegrationTestTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/test/SpringApplicationWebIntegrationTestTests.java @@ -41,7 +41,7 @@ import static org.junit.Assert.assertNotEquals; * @author Phillip Webb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Config.class) +@SpringApplicationConfiguration(Config.class) @WebIntegrationTest({ "server.port=0", "value=123" }) public class SpringApplicationWebIntegrationTestTests { diff --git a/spring-boot/src/test/java/org/springframework/boot/test/SpringBootMockServletContextTests.java b/spring-boot/src/test/java/org/springframework/boot/test/SpringBootMockServletContextTests.java index ff1e73c3d47..e5bdf41139f 100644 --- a/spring-boot/src/test/java/org/springframework/boot/test/SpringBootMockServletContextTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/test/SpringBootMockServletContextTests.java @@ -43,7 +43,7 @@ import static org.junit.Assert.assertThat; * @author Phillip Webb */ @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = SpringBootMockServletContextTests.Config.class) +@SpringApplicationConfiguration(SpringBootMockServletContextTests.Config.class) @WebAppConfiguration("src/test/webapp") public class SpringBootMockServletContextTests implements ServletContextAware {