Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[SPR-6184] Introduced ResourceTypeAwareContextLoader interface and removed dependency on AnnotationConfigContextLoader in TestContext.

Browse Source
This commit is contained in:
Sam Brannen
2011-04-03 16:37:24 +00:00
parent a60487655c
commit ad9c858bd2
7 changed files with 92 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.java
View File

@@ -26,7 +26,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
* @author Sam Brannen
* @since 3.1
*/
@ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = AnnotationConfigSpringJUnit4ClassRunnerAppCtxTestsConfig.class, inheritLocations = false)
@ContextConfiguration(loader = AnnotationConfigContextLoader.class, classes = PojoAndStringConfig.class)
public class AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests extends SpringJUnit4ClassRunnerAppCtxTests {
/* all tests are in the parent class. */
}

2
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSpringJUnit4ClassRunnerAppCtxTestsConfig.java → org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/PojoAndStringConfig.java
View File

@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Configuration;
* @since 3.1
*/
@Configuration
public class AnnotationConfigSpringJUnit4ClassRunnerAppCtxTestsConfig {
public class PojoAndStringConfig {
@Bean
public Employee employee() {