From 91c9bad12eed47c8eb6e55b91bf0bd57a4d46585 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Wed, 16 Jul 2014 21:49:29 +0200 Subject: [PATCH] Rename test classes previously related only to ContextLoaderUtils --- ...ests.java => AbstractContextConfigurationUtilsTests.java} | 5 +++-- .../test/context/support/ActiveProfilesUtilsTests.java | 2 +- ...s.java => BootstrapTestUtilsContextInitializerTests.java} | 5 +++-- ...igTests.java => BootstrapTestUtilsMergedConfigTests.java} | 4 ++-- .../ContextLoaderUtilsConfigurationAttributesTests.java | 2 +- .../support/ContextLoaderUtilsContextHierarchyTests.java | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) rename spring-test/src/test/java/org/springframework/test/context/support/{AbstractContextLoaderUtilsTests.java => AbstractContextConfigurationUtilsTests.java} (98%) rename spring-test/src/test/java/org/springframework/test/context/support/{ContextLoaderUtilsContextInitializerTests.java => BootstrapTestUtilsContextInitializerTests.java} (95%) rename spring-test/src/test/java/org/springframework/test/context/support/{ContextLoaderUtilsMergedConfigTests.java => BootstrapTestUtilsMergedConfigTests.java} (97%) diff --git a/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextLoaderUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java similarity index 98% rename from spring-test/src/test/java/org/springframework/test/context/support/AbstractContextLoaderUtilsTests.java rename to spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java index 7224cdc0b11..02af164539f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextLoaderUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/AbstractContextConfigurationUtilsTests.java @@ -41,12 +41,13 @@ import org.springframework.test.context.web.WebAppConfiguration; 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]; diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java b/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java index f9f98b7c73c..f19b12aaf0f 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java @@ -39,7 +39,7 @@ import static org.springframework.test.context.support.ActiveProfilesUtils.*; * @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); diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextInitializerTests.java b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsContextInitializerTests.java similarity index 95% rename from spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextInitializerTests.java rename to spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsContextInitializerTests.java index 03be7bd2567..a7b67a31f6a 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextInitializerTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsContextInitializerTests.java @@ -23,17 +23,18 @@ import org.junit.Test; 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() { diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsMergedConfigTests.java b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java similarity index 97% rename from spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsMergedConfigTests.java rename to spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java index eb4fce5aba2..406dbe911f5 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsMergedConfigTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/BootstrapTestUtilsMergedConfigTests.java @@ -31,12 +31,12 @@ import org.springframework.test.context.web.WebMergedContextConfiguration; 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() { diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsConfigurationAttributesTests.java b/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsConfigurationAttributesTests.java index a7f9a08ffa3..fcb87004481 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsConfigurationAttributesTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsConfigurationAttributesTests.java @@ -34,7 +34,7 @@ import static org.junit.Assert.*; * @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, diff --git a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java b/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java index 052128f3931..c47c3e0af52 100644 --- a/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java +++ b/spring-test/src/test/java/org/springframework/test/context/support/ContextLoaderUtilsContextHierarchyTests.java @@ -42,7 +42,7 @@ import static org.junit.Assert.*; * @author Sam Brannen * @since 3.2.2 */ -public class ContextLoaderUtilsContextHierarchyTests extends AbstractContextLoaderUtilsTests { +public class ContextLoaderUtilsContextHierarchyTests extends AbstractContextConfigurationUtilsTests { private void debugConfigAttributes(List configAttributesList) { // for (ContextConfigurationAttributes configAttributes : configAttributesList) {