From b33da670e5304ae44fc0817cebf200a69a5f457e Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 1 Dec 2010 08:36:29 +0000 Subject: [PATCH] Rename EnvironmentBeansTests* -> ProfileXmlBeanDefinitionTests* Earlier naming reflected initial conception of 'environment-specific bean definitions'. This notion has evolved into bean definitions specific to particular profiles, and the new naming more clearly expresses it. --- ...sts.java => ProfileXmlBeanDefinitionTests.java} | 14 +++++++------- ...> ProfileXmlBeanDefinitionTests-devProfile.xml} | 0 ...ProfileXmlBeanDefinitionTests-multiProfile.xml} | 0 ...=> ProfileXmlBeanDefinitionTests-noProfile.xml} | 0 ... ProfileXmlBeanDefinitionTests-prodProfile.xml} | 0 ...ofileXmlBeanDefinitionTests-unknownProfile.xml} | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/{EnvironmentBeansTests.java => ProfileXmlBeanDefinitionTests.java} (88%) rename org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/{environmentBeans-devProfile.xml => ProfileXmlBeanDefinitionTests-devProfile.xml} (100%) rename org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/{environmentBeans-multiProfile.xml => ProfileXmlBeanDefinitionTests-multiProfile.xml} (100%) rename org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/{environmentBeans-noProfile.xml => ProfileXmlBeanDefinitionTests-noProfile.xml} (100%) rename org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/{environmentBeans-prodProfile.xml => ProfileXmlBeanDefinitionTests-prodProfile.xml} (100%) rename org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/{environmentBeans-unknownProfile.xml => ProfileXmlBeanDefinitionTests-unknownProfile.xml} (100%) diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/EnvironmentBeansTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java similarity index 88% rename from org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/EnvironmentBeansTests.java rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java index 7d4a0f00b6..2bd47474f5 100644 --- a/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/EnvironmentBeansTests.java +++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests.java @@ -33,13 +33,13 @@ import org.springframework.core.io.ClassPathResource; * * @author Chris Beams */ -public class EnvironmentBeansTests { +public class ProfileXmlBeanDefinitionTests { - private static final String PROD_ELIGIBLE_XML = "environmentBeans-prodProfile.xml"; - private static final String DEV_ELIGIBLE_XML = "environmentBeans-devProfile.xml"; - private static final String ALL_ELIGIBLE_XML = "environmentBeans-noProfile.xml"; - private static final String MULTI_ELIGIBLE_XML = "environmentBeans-multiProfile.xml"; - private static final String UNKOWN_ELIGIBLE_XML = "environmentBeans-unknownProfile.xml"; + private static final String PROD_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-prodProfile.xml"; + private static final String DEV_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-devProfile.xml"; + private static final String ALL_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-noProfile.xml"; + private static final String MULTI_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-multiProfile.xml"; + private static final String UNKOWN_ELIGIBLE_XML = "ProfileXmlBeanDefinitionTests-unknownProfile.xml"; private static final String PROD_ACTIVE = "prod"; private static final String DEV_ACTIVE = "dev"; @@ -51,7 +51,7 @@ public class EnvironmentBeansTests { private static final String TARGET_BEAN = "foo"; @Test - public void test() { + public void testProfilePermutations() { assertThat(beanFactoryFor(PROD_ELIGIBLE_XML, NONE_ACTIVE), not(containsTargetBean())); assertThat(beanFactoryFor(PROD_ELIGIBLE_XML, NULL_ACTIVE), not(containsTargetBean())); assertThat(beanFactoryFor(PROD_ELIGIBLE_XML, DEV_ACTIVE), not(containsTargetBean())); diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-devProfile.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml similarity index 100% rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-devProfile.xml rename to org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-devProfile.xml diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-multiProfile.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml similarity index 100% rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-multiProfile.xml rename to org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-multiProfile.xml diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-noProfile.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml similarity index 100% rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-noProfile.xml rename to org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-noProfile.xml diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-prodProfile.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml similarity index 100% rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-prodProfile.xml rename to org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-prodProfile.xml diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-unknownProfile.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml similarity index 100% rename from org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/environmentBeans-unknownProfile.xml rename to org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ProfileXmlBeanDefinitionTests-unknownProfile.xml