Make test auto-configuration classes public

Make test auto-configuration classes public so that they can be used
by others with @AutoConfigureBefore/@AutoConfigureAfter.

Fixes gh-6073
This commit is contained in:
Phillip Webb 2016-05-31 13:30:18 -07:00
parent b84330663d
commit e1d74627f5
9 changed files with 17 additions and 8 deletions

View File

@ -50,11 +50,12 @@ import org.springframework.util.ObjectUtils;
* Auto-configuration for a test database. * Auto-configuration for a test database.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.4.0
* @see AutoConfigureTestDatabase * @see AutoConfigureTestDatabase
*/ */
@Configuration @Configuration
@AutoConfigureBefore(DataSourceAutoConfiguration.class) @AutoConfigureBefore(DataSourceAutoConfiguration.class)
class TestDatabaseAutoConfiguration { public class TestDatabaseAutoConfiguration {
private final Environment environment; private final Environment environment;

View File

@ -29,12 +29,13 @@ import org.springframework.context.annotation.Configuration;
* Auto-configuration for {@link TestEntityManager}. * Auto-configuration for {@link TestEntityManager}.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.4.0
* @see AutoConfigureTestEntityManager * @see AutoConfigureTestEntityManager
*/ */
@Configuration @Configuration
@ConditionalOnClass({ EntityManagerFactory.class }) @ConditionalOnClass({ EntityManagerFactory.class })
@AutoConfigureAfter(HibernateJpaAutoConfiguration.class) @AutoConfigureAfter(HibernateJpaAutoConfiguration.class)
class TestEntityManagerAutoConfiguration { public class TestEntityManagerAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean

View File

@ -33,11 +33,12 @@ import org.springframework.restdocs.mockmvc.RestDocumentationResultHandler;
* {@link EnableAutoConfiguration Auto-configuration} for Spring REST Docs. * {@link EnableAutoConfiguration Auto-configuration} for Spring REST Docs.
* *
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.4.0
*/ */
@Configuration @Configuration
@ConditionalOnWebApplication @ConditionalOnWebApplication
@EnableConfigurationProperties @EnableConfigurationProperties
class RestDocsAutoConfiguration { public class RestDocsAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean(MockMvcRestDocumentationConfigurer.class) @ConditionalOnMissingBean(MockMvcRestDocumentationConfigurer.class)

View File

@ -38,11 +38,12 @@ import org.springframework.web.client.RestTemplate;
* Auto-configuration for {@link MockRestServiceServer} support. * Auto-configuration for {@link MockRestServiceServer} support.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.4.0
* @see AutoConfigureMockRestServiceServer * @see AutoConfigureMockRestServiceServer
*/ */
@Configuration @Configuration
@ConditionalOnProperty(prefix = "spring.test.webclient.mockrestserviceserver", name = "enabled") @ConditionalOnProperty(prefix = "spring.test.webclient.mockrestserviceserver", name = "enabled")
class MockRestServiceServerAutoConfiguration { public class MockRestServiceServerAutoConfiguration {
@Bean @Bean
public MockServerRestTemplateCustomizer mockServerRestTemplateCustomizer() { public MockServerRestTemplateCustomizer mockServerRestTemplateCustomizer() {

View File

@ -29,12 +29,13 @@ import org.springframework.web.client.RestTemplate;
* {@link AutoConfigureWebClient#registerRestTemplate()} is {@code true}. * {@link AutoConfigureWebClient#registerRestTemplate()} is {@code true}.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.4.0
* @see AutoConfigureMockRestServiceServer * @see AutoConfigureMockRestServiceServer
*/ */
@Configuration @Configuration
@ConditionalOnProperty(prefix = "spring.test.webclient", name = "register-rest-template") @ConditionalOnProperty(prefix = "spring.test.webclient", name = "register-rest-template")
@AutoConfigureAfter(WebClientAutoConfiguration.class) @AutoConfigureAfter(WebClientAutoConfiguration.class)
class WebClientRestTemplateAutoConfiguration { public class WebClientRestTemplateAutoConfiguration {
@Bean @Bean
public RestTemplate restTemplate(RestTemplateBuilder builder) { public RestTemplate restTemplate(RestTemplateBuilder builder) {

View File

@ -38,12 +38,13 @@ import org.springframework.web.context.WebApplicationContext;
* @author Phillip Webb * @author Phillip Webb
* @author Andy Wilkinson * @author Andy Wilkinson
* @see AutoConfigureWebMvc * @see AutoConfigureWebMvc
* @since 1.4.0
*/ */
@Configuration @Configuration
@ConditionalOnWebApplication @ConditionalOnWebApplication
@AutoConfigureAfter(WebMvcAutoConfiguration.class) @AutoConfigureAfter(WebMvcAutoConfiguration.class)
@EnableConfigurationProperties @EnableConfigurationProperties
class MockMvcAutoConfiguration { public class MockMvcAutoConfiguration {
private final WebApplicationContext context; private final WebApplicationContext context;

View File

@ -26,6 +26,7 @@ import org.springframework.context.annotation.Import;
* Auto-configuration for Spring Security's testing support. * Auto-configuration for Spring Security's testing support.
* *
* @author Andy Wilkinson * @author Andy Wilkinson
* @since 1.4.0
*/ */
@Configuration @Configuration
@ConditionalOnProperty(prefix = "spring.test.mockmvc", name = "secure", havingValue = "true", matchIfMissing = true) @ConditionalOnProperty(prefix = "spring.test.mockmvc", name = "secure", havingValue = "true", matchIfMissing = true)

View File

@ -34,12 +34,13 @@ import org.springframework.test.web.servlet.htmlunit.MockMvcWebClientBuilder;
* Auto-configuration for HtmlUnit {@link WebClient} MockMVC integration. * Auto-configuration for HtmlUnit {@link WebClient} MockMVC integration.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.4.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(WebClient.class) @ConditionalOnClass(WebClient.class)
@AutoConfigureAfter(MockMvcAutoConfiguration.class) @AutoConfigureAfter(MockMvcAutoConfiguration.class)
@ConditionalOnProperty(prefix = "spring.test.webmvc.webclient", name = "enabled", matchIfMissing = true) @ConditionalOnProperty(prefix = "spring.test.webmvc.webclient", name = "enabled", matchIfMissing = true)
class MockMvcWebClientAutoConfiguration { public class MockMvcWebClientAutoConfiguration {
private final Environment environment; private final Environment environment;

View File

@ -36,12 +36,13 @@ import org.springframework.test.web.servlet.htmlunit.webdriver.MockMvcHtmlUnitDr
* Auto-configuration for Selenium {@link WebDriver} MockMVC integration. * Auto-configuration for Selenium {@link WebDriver} MockMVC integration.
* *
* @author Phillip Webb * @author Phillip Webb
* @since 1.4.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(HtmlUnitDriver.class) @ConditionalOnClass(HtmlUnitDriver.class)
@AutoConfigureAfter(MockMvcAutoConfiguration.class) @AutoConfigureAfter(MockMvcAutoConfiguration.class)
@ConditionalOnProperty(prefix = "spring.test.webmvc.webdriver", name = "enabled", matchIfMissing = true) @ConditionalOnProperty(prefix = "spring.test.webmvc.webdriver", name = "enabled", matchIfMissing = true)
class MockMvcWebDriverAutoConfiguration { public class MockMvcWebDriverAutoConfiguration {
private final Environment environment; private final Environment environment;