Rename test classes previously related only to ContextLoaderUtils

Author: sbrannen

spring-test/src/test/java/org/springframework/test/context/support/AbstractContextLoaderUtilsTests.java renamed to spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java

@@ -41,12 +41,13 @@
 import static org.junit.Assert.*;
 
 /**
- * Abstract base class for tests involving {@link ContextLoaderUtils}.
+ * Abstract base class for tests involving {@link ContextLoaderUtils},
+ * {@link BootstrapTestUtils}, and {@link ActiveProfilesUtils}.
  *
  * @author Sam Brannen
  * @since 3.1
  */
-abstract class AbstractContextLoaderUtilsTests {
+abstract class AbstractContextConfigurationUtilsTests {
 
 	static final Class<?>[] EMPTY_CLASS_ARRAY = new Class<?>[0];
 	static final String[] EMPTY_STRING_ARRAY = new String[0];

spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java

@@ -39,7 +39,7 @@
  * @author Michail Nikolaev
  * @since 3.1
  */
-public class ActiveProfilesUtilsTests extends AbstractContextLoaderUtilsTests {
+public class ActiveProfilesUtilsTests extends AbstractContextConfigurationUtilsTests {
 
 	private void assertResolvedProfiles(Class<?> testClass, String... expected) {
 		assertNotNull(testClass);

spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextInitializerTests.java renamed to spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsContextInitializerTests.java

@@ -23,17 +23,18 @@
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.test.context.BootstrapTestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.MergedContextConfiguration;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 
 /**
- * Unit tests for {@link ContextLoaderUtils} involving {@link ApplicationContextInitializer}s.
+ * Unit tests for {@link BootstrapTestUtils} involving {@link ApplicationContextInitializer}s.
  *
  * @author Sam Brannen
  * @since 3.1
  */
-public class ContextLoaderUtilsContextInitializerTests extends AbstractContextLoaderUtilsTests {
+public class BootstrapTestUtilsContextInitializerTests extends AbstractContextConfigurationUtilsTests {
 
 	@Test
 	public void buildMergedConfigWithLocalInitializer() {

spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsMergedConfigTests.java renamed to spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java

@@ -31,12 +31,12 @@
 import static org.junit.Assert.*;
 
 /**
- * Unit tests for {@link ContextLoaderUtils} involving {@link MergedContextConfiguration}.
+ * Unit tests for {@link BootstrapTestUtils} involving {@link MergedContextConfiguration}.
  *
  * @author Sam Brannen
  * @since 3.1
  */
-public class ContextLoaderUtilsMergedConfigTests extends AbstractContextLoaderUtilsTests {
+public class BootstrapTestUtilsMergedConfigTests extends AbstractContextConfigurationUtilsTests {
 
 	@Test
 	public void buildMergedConfigWithoutAnnotation() {

spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsConfigurationAttributesTests.java

@@ -34,7 +34,7 @@
  * @author Sam Brannen
  * @since 3.1
  */
-public class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextLoaderUtilsTests {
+public class ContextLoaderUtilsConfigurationAttributesTests extends AbstractContextConfigurationUtilsTests {
 
 	private void assertLocationsFooAttributes(ContextConfigurationAttributes attributes) {
 		assertAttributes(attributes, LocationsFoo.class, new String[] { "/foo.xml" }, EMPTY_CLASS_ARRAY,

spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java

@@ -42,7 +42,7 @@
  * @author Sam Brannen
  * @since 3.2.2
  */
-public class ContextLoaderUtilsContextHierarchyTests extends AbstractContextLoaderUtilsTests {
+public class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurationUtilsTests {
 
 	private void debugConfigAttributes(List<ContextConfigurationAttributes> configAttributesList) {
 		// for (ContextConfigurationAttributes configAttributes : configAttributesList) {