diff --git a/org.springframework.test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java b/org.springframework.test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java index b5eb4426867..5a166357593 100644 --- a/org.springframework.test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java +++ b/org.springframework.test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java @@ -123,14 +123,19 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader } /** - * Returns "Config"; intended to be used as a suffix - * to append to the name of the test class when generating default - * configuration class names. + * Returns "$ContextConfiguration"; intended to be used + * as a suffix to append to the name of the test class when generating + * default configuration class names. + * + *

Note: the use of a dollar sign ($) signifies that the resulting + * class name refers to a nested static class within the + * test class. + * * @see #generateDefaultLocations(Class) */ @Override protected String getResourceSuffix() { - return "Config"; + return "$ContextConfiguration"; } /** diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java index bb75b3d4519..3bd2fea8ae1 100644 --- a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java +++ b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTests.java @@ -20,6 +20,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.junit.Test; +import org.springframework.beans.Employee; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; /** @@ -35,6 +38,20 @@ import org.springframework.test.context.ContextConfiguration; @ContextConfiguration public class BeanOverridingDefaultConfigClassesInheritedTests extends DefaultConfigClassesBaseTests { + @Configuration + static class ContextConfiguration { + + @Bean + public Employee employee() { + Employee employee = new Employee(); + employee.setName("Yoda"); + employee.setAge(900); + employee.setCompany("The Force"); + return employee; + } + } + + @Test @Override public void verifyEmployeeSetFromBaseContextConfig() { diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTestsConfig.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTestsConfig.java deleted file mode 100644 index 5ca5f0fdb09..00000000000 --- a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTestsConfig.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2002-2011 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.test.context.junit4.annotation; - -import org.springframework.beans.Employee; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * ApplicationContext configuration class for - * {@link BeanOverridingDefaultConfigClassesInheritedTests} and - * {@link BeanOverridingExplicitConfigClassesInheritedTests}. - * - * @author Sam Brannen - * @since 3.1 - */ -@Configuration -public class BeanOverridingDefaultConfigClassesInheritedTestsConfig { - - @Bean - public Employee employee() { - Employee employee = new Employee(); - employee.setName("Yoda"); - employee.setAge(900); - employee.setCompany("The Force"); - return employee; - } - -} diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java index 81a49410d26..c0cc2721d03 100644 --- a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java +++ b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingExplicitConfigClassesInheritedTests.java @@ -32,7 +32,7 @@ import org.springframework.test.context.ContextConfiguration; * @author Sam Brannen * @since 3.1 */ -@ContextConfiguration(classes = BeanOverridingDefaultConfigClassesInheritedTestsConfig.class) +@ContextConfiguration(classes = BeanOverridingDefaultConfigClassesInheritedTests.ContextConfiguration.class) public class BeanOverridingExplicitConfigClassesInheritedTests extends ExplicitConfigClassesBaseTests { @Test diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java index a1765a3291b..046d95954b5 100644 --- a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java +++ b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTests.java @@ -23,6 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.Employee; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; @@ -40,6 +42,20 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; @ContextConfiguration(loader = AnnotationConfigContextLoader.class) public class DefaultConfigClassesBaseTests { + @Configuration + static class ContextConfiguration { + + @Bean + public Employee employee() { + Employee employee = new Employee(); + employee.setName("John Smith"); + employee.setAge(42); + employee.setCompany("Acme Widgets, Inc."); + return employee; + } + } + + @Autowired protected Employee employee; diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTestsConfig.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTestsConfig.java deleted file mode 100644 index d9617d64c84..00000000000 --- a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTestsConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2002-2011 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.test.context.junit4.annotation; - -import org.springframework.beans.Employee; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * ApplicationContext configuration class for {@link DefaultConfigClassesBaseTests}. - * - * @author Sam Brannen - * @since 3.1 - */ -@Configuration -public class DefaultConfigClassesBaseTestsConfig { - - @Bean - public Employee employee() { - Employee employee = new Employee(); - employee.setName("John Smith"); - employee.setAge(42); - employee.setCompany("Acme Widgets, Inc."); - return employee; - } - -} diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java index cd3fc1fcfcd..6351e0c71d0 100644 --- a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java +++ b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTests.java @@ -22,6 +22,8 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.springframework.beans.Pet; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import org.springframework.test.context.ContextConfiguration; /** @@ -37,6 +39,16 @@ import org.springframework.test.context.ContextConfiguration; @ContextConfiguration public class DefaultConfigClassesInheritedTests extends DefaultConfigClassesBaseTests { + @Configuration + static class ContextConfiguration { + + @Bean + public Pet pet() { + return new Pet("Fido"); + } + } + + @Autowired private Pet pet; diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTestsConfig.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTestsConfig.java deleted file mode 100644 index 359f36a8e2f..00000000000 --- a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTestsConfig.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2002-2011 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.test.context.junit4.annotation; - -import org.springframework.beans.Pet; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * ApplicationContext configuration class for {@link DefaultConfigClassesInheritedTests}. - * - * @author Sam Brannen - * @since 3.1 - */ -@Configuration -public class DefaultConfigClassesInheritedTestsConfig { - - @Bean - public Pet pet() { - return new Pet("Fido"); - } - -} diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java index 968025791c2..e45bc3d0331 100644 --- a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java +++ b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesBaseTests.java @@ -37,7 +37,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; * @since 3.1 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = DefaultConfigClassesBaseTestsConfig.class) +@ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = DefaultConfigClassesBaseTests.ContextConfiguration.class) public class ExplicitConfigClassesBaseTests { @Autowired diff --git a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java index dc8b1d657f0..21b19c31b26 100644 --- a/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java +++ b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/ExplicitConfigClassesInheritedTests.java @@ -38,7 +38,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader; * @since 3.1 */ @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = DefaultConfigClassesInheritedTestsConfig.class) +@ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = DefaultConfigClassesInheritedTests.ContextConfiguration.class) public class ExplicitConfigClassesInheritedTests extends ExplicitConfigClassesBaseTests { @Autowired diff --git a/org.springframework.test/src/test/resources/log4j.xml b/org.springframework.test/src/test/resources/log4j.xml index 39e2017abb2..e5aee2dde7f 100644 --- a/org.springframework.test/src/test/resources/log4j.xml +++ b/org.springframework.test/src/test/resources/log4j.xml @@ -24,6 +24,9 @@ + + +