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

org.springframework.test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTests.java

@@ -21,14 +21,21 @@ import static org.springframework.test.transaction.TransactionTestUtils.assertIn
 import static org.springframework.test.transaction.TransactionTestUtils.inTransaction;
 import static org.testng.Assert.assertEquals;
 
+import javax.sql.DataSource;
+
 import org.springframework.beans.Employee;
 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.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
 import org.springframework.test.annotation.NotTransactional;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
+import org.springframework.transaction.PlatformTransactionManager;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
@@ -151,4 +158,37 @@ public class AnnotationConfigTransactionalTestNGSpringContextTests extends
 		assertNumRowsInPersonTable(1, "after a transactional test method");
 	}
 
+
+	@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;
+		}
+
+		@Bean
+		public Pet pet() {
+			return new Pet("Fido");
+		}
+
+		@Bean
+		public PlatformTransactionManager transactionManager() {
+			return new DataSourceTransactionManager(dataSource());
+		}
+
+		@Bean
+		public DataSource dataSource() {
+			return new EmbeddedDatabaseBuilder()//
+			.addScript("classpath:/org/springframework/test/context/testng/schema.sql")//
+			.addScript("classpath:/org/springframework/test/context/testng/data.sql")//
+			.build();
+		}
+
+	}
+
 }

org.springframework.test/src/test/java/org/springframework/test/context/testng/AnnotationConfigTransactionalTestNGSpringContextTestsConfig.java

@@ -1,65 +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.testng;
-
-import javax.sql.DataSource;
-
-import org.springframework.beans.Employee;
-import org.springframework.beans.Pet;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
-import org.springframework.transaction.PlatformTransactionManager;
-
-/**
- * ApplicationContext configuration for {@link AnnotationConfigTransactionalTestNGSpringContextTests}.
- * 
- * @author Sam Brannen
- * @since 3.1
- */
-@Configuration
-public class AnnotationConfigTransactionalTestNGSpringContextTestsConfig {
-
-	@Bean
-	public Employee employee() {
-		Employee employee = new Employee();
-		employee.setName("John Smith");
-		employee.setAge(42);
-		employee.setCompany("Acme Widgets, Inc.");
-		return employee;
-	}
-
-	@Bean
-	public Pet pet() {
-		return new Pet("Fido");
-	}
-
-	@Bean
-	public PlatformTransactionManager transactionManager() {
-		return new DataSourceTransactionManager(dataSource());
-	}
-
-	@Bean
-	public DataSource dataSource() {
-		return new EmbeddedDatabaseBuilder()//
-		.addScript("classpath:/org/springframework/test/context/testng/schema.sql")//
-		.addScript("classpath:/org/springframework/test/context/testng/data.sql")//
-		.build();
-	}
-
-}