[SPR-6184] AnnotationConfigContextLoader now defines "$ContextConfiguration"...

[SPR-6184] AnnotationConfigContextLoader now defines "$ContextConfiguration" as the resource suffix for generated default @Configuration class names.

org.springframework.test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java

@@ -123,14 +123,19 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
 	}
 
 	/**
-	 * Returns &quot;Config</code>&quot;; intended to be used as a suffix
-	 * to append to the name of the test class when generating default
-	 * configuration class names.
+	 * Returns &quot;$ContextConfiguration</code>&quot;; intended to be used
+	 * as a suffix to append to the name of the test class when generating
+	 * default configuration class names.
+	 * 
+	 * <p>Note: the use of a dollar sign ($) signifies that the resulting 
+	 * class name refers to a nested <code>static</code> class within the
+	 * test class.
+	 * 
 	 * @see #generateDefaultLocations(Class)
 	 */
 	@Override
 	protected String getResourceSuffix() {
-		return "Config";
+		return "$ContextConfiguration";
 	}
 
 	/**

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() {

org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/BeanOverridingDefaultConfigClassesInheritedTestsConfig.java

-/*
- * 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;
-	}
-
-}

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

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;
 

org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesBaseTestsConfig.java

-/*
- * 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;
-	}
-
-}

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;
 

org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/DefaultConfigClassesInheritedTestsConfig.java

-/*
- * 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");
-	}
-
-}

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

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

org.springframework.test/src/test/resources/log4j.xml

@@ -24,6 +24,9 @@
 	<logger name="org.springframework.test.context.support.AbstractGenericContextLoader">
 		<level value="warn" />
 	</logger>
+	<logger name="org.springframework.test.context.support.AnnotationConfigContextLoader">
+		<level value="warn" />
+	</logger>
 
 	<!-- Root Logger -->
 	<root>