Delete @SpringApplicationConfiguration

Remove the @SpringApplicationConfiguration annotation since it offers
little value over @SpringApplicationTest.

See gh-5562

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationContextLoaderMockMvcTests.java

@@ -23,9 +23,9 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringApplicationConfigurationMockMvcTests.Config;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
@@ -48,9 +48,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
-@SpringApplicationConfiguration(classes = Config.class)
+@ContextConfiguration(loader = SpringApplicationContextLoader.class)
 @WebAppConfiguration
-public class SpringApplicationConfigurationMockMvcTests {
+public class SpringApplicationContextLoaderMockMvcTests {
 
 	@Autowired
 	private WebApplicationContext context;

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationTestActiveProfileTests.java

@@ -29,16 +29,15 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SpringApplicationContextLoader} with active profiles. See gh-1469.
+ * Tests for {@link SpringApplicationTest} with active profiles. See gh-1469.
  *
  * @author Phillip Webb
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
-@SpringApplicationConfiguration
 @SpringApplicationTest("spring.config.name=enableother")
 @ActiveProfiles("override")
-public class SpringApplicationConfigurationActiveProfileTests {
+public class SpringApplicationTestActiveProfileTests {
 
 	@Autowired
 	private ApplicationContext context;

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationTestDefaultConfigurationTests.java

@@ -27,14 +27,13 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SpringApplicationContextLoader} (detectDefaultConfigurationClasses).
+ * Tests for {@link SpringApplicationTest} (detectDefaultConfigurationClasses).
  *
  * @author Dave Syer
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
-@SpringApplicationConfiguration
-public class SpringApplicationConfigurationDefaultConfigurationTests {
+public class SpringApplicationTestDefaultConfigurationTests {
 
 	@Autowired
 	private Config config;

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationTestGroovyConfigurationTests.java

@@ -21,19 +21,21 @@ import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SpringApplicationContextLoader} (detectDefaultConfigurationClasses).
+ * Tests for {@link SpringApplicationTest} (detectDefaultConfigurationClasses).
  *
  * @author Dave Syer
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
-@SpringApplicationConfiguration(locations = "classpath:test.groovy")
-public class SpringApplicationConfigurationGroovyConfigurationTests {
+@SpringApplicationTest
+@ContextConfiguration(locations = "classpath:test.groovy")
+public class SpringApplicationTestGroovyConfigurationTests {
 
 	@Autowired
 	private String foo;

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationTestGroovyConventionConfigurationTests.java

@@ -26,14 +26,14 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SpringApplicationContextLoader} finding groovy config.
+ * Tests for {@link SpringApplicationTest} finding groovy config.
  *
  * @author Phillip Webb
  */
 @RunWith(SpringRunner.class)
+@SpringApplicationTest
 @DirtiesContext
-@SpringApplicationConfiguration
-public class SpringApplicationConfigurationGroovyConventionConfigurationTests {
+public class SpringApplicationTestGroovyConventionConfigurationTests {
 
 	@Autowired
 	private String foo;

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationTestJmxTests.java

@@ -20,7 +20,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.test.context.SpringApplicationConfigurationJmxTests.Config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
@@ -37,8 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @RunWith(SpringRunner.class)
 @DirtiesContext
 @SpringApplicationTest
-@SpringApplicationConfiguration(Config.class)
-public class SpringApplicationConfigurationJmxTests {
+public class SpringApplicationTestJmxTests {
 
 	@Value("${spring.jmx.enabled}")
 	private boolean jmx;

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationTestMixedConfigurationTests.java

@@ -20,22 +20,24 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringApplicationConfigurationMixedConfigurationTests.Config;
+import org.springframework.boot.test.context.SpringApplicationTestMixedConfigurationTests.Config;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SpringApplicationContextLoader}.
+ * Tests for {@link SpringApplicationTest}.
  *
  * @author Dave Syer
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
-@SpringApplicationConfiguration(classes = Config.class, locations = "classpath:test.groovy")
-public class SpringApplicationConfigurationMixedConfigurationTests {
+@SpringApplicationTest
+@ContextConfiguration(classes = Config.class, locations = "classpath:test.groovy")
+public class SpringApplicationTestMixedConfigurationTests {
 
 	@Autowired
 	private String foo;

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationTestPropertyLocationTests.java

@@ -24,7 +24,6 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.test.context.SpringApplicationTest.WebEnvironment;
-import org.springframework.boot.test.context.SpringApplicationTestPropertyLocationTests.Config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
@@ -42,7 +41,6 @@ import static org.assertj.core.api.Assertions.assertThat;
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
-@SpringApplicationConfiguration(Config.class)
 @SpringApplicationTest(webEnvironment = WebEnvironment.NONE, properties = "value1=123")
 @TestPropertySource(properties = "value2=456", locations = "classpath:/test-property-source-annotation.properties")
 public class SpringApplicationTestPropertyLocationTests {

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationTestWithClassesIntegrationTests.java

@@ -0,0 +1,66 @@
+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.test.context;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link SpringApplicationTest} configured with specific classes.
+ *
+ * @author Phillip Webb
+ */
+@RunWith(SpringRunner.class)
+@DirtiesContext
+@SpringApplicationTest(classes = SpringApplicationTestWithClassesIntegrationTests.Config.class)
+public class SpringApplicationTestWithClassesIntegrationTests {
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	@Autowired
+	private ApplicationContext context;
+
+	@Test
+	public void injectsOnlyConfig() throws Exception {
+		assertThat(this.context.getBean(Config.class)).isNotNull();
+		this.thrown.expect(NoSuchBeanDefinitionException.class);
+		this.context.getBean(AdditionalConfig.class);
+	}
+
+	@Configuration
+	static class Config {
+
+	}
+
+	@Configuration
+	static class AdditionalConfig {
+
+	}
+
+}

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationTestWithContextConfigurationIntegrationTests.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.test.context;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.NoSuchBeanDefinitionException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link SpringApplicationTest} configured with {@link ContextConfiguration}.
+ *
+ * @author Phillip Webb
+ */
+@RunWith(SpringRunner.class)
+@DirtiesContext
+@SpringApplicationTest
+@ContextConfiguration(classes = SpringApplicationTestWithContextConfigurationIntegrationTests.Config.class)
+public class SpringApplicationTestWithContextConfigurationIntegrationTests {
+
+	@Rule
+	public ExpectedException thrown = ExpectedException.none();
+
+	@Autowired
+	private ApplicationContext context;
+
+	@Test
+	public void injectsOnlyConfig() throws Exception {
+		assertThat(this.context.getBean(Config.class)).isNotNull();
+		this.thrown.expect(NoSuchBeanDefinitionException.class);
+		this.context.getBean(AdditionalConfig.class);
+	}
+
+	@Configuration
+	static class Config {
+
+	}
+
+	@Configuration
+	static class AdditionalConfig {
+
+	}
+
+}

spring-boot-test/src/test/java/org/springframework/boot/test/context/SpringApplicationTestXmlConventionConfigurationTests.java

@@ -26,14 +26,14 @@ import org.springframework.test.context.junit4.SpringRunner;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
- * Tests for {@link SpringApplicationContextLoader} finding XML config.
+ * Tests for {@link SpringApplicationTest} finding XML config.
  *
  * @author Phillip Webb
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
-@SpringApplicationConfiguration
-public class SpringApplicationConfigurationXmlConventionConfigurationTests {
+@SpringApplicationTest
+public class SpringApplicationTestXmlConventionConfigurationTests {
 
 	@Autowired
 	private String foo;

spring-boot-test/src/test/java/org/springframework/boot/test/mock/web/SpringBootMockServletContextTests.java

@@ -27,10 +27,10 @@ import javax.servlet.ServletContext;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import org.springframework.boot.test.context.SpringApplicationConfiguration;
-import org.springframework.boot.test.mock.web.SpringBootMockServletContextTests.Config;
+import org.springframework.boot.test.context.SpringApplicationContextLoader;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.context.ServletContextAware;
@@ -45,7 +45,7 @@ import static org.hamcrest.Matchers.nullValue;
  */
 @RunWith(SpringRunner.class)
 @DirtiesContext
-@SpringApplicationConfiguration(Config.class)
+@ContextConfiguration(loader = SpringApplicationContextLoader.class)
 @WebAppConfiguration("src/test/webapp")
 public class SpringBootMockServletContextTests implements ServletContextAware {