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

[SPR-6184] Refactored internals of ContextLoaderUtils; @Ignore'd broken test.

Browse Source
This commit is contained in:
Sam Brannen
2011-04-03 17:45:20 +00:00
parent 293baeeb88
commit f3d125626d
4 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.test/src/test/java/org/springframework/test/context/junit4/annotation/AnnotationConfigSuiteTests.java
View File

@@ -32,13 +32,9 @@ import org.junit.runners.Suite.SuiteClasses;
AnnotationConfigSpringJUnit4ClassRunnerAppCtxTests.class,
DefaultConfigClassBaseTests.class
DefaultConfigClassBaseTests.class,
// TODO Uncomment once working. Note that JUnit's Suite runner apparently
// does not heed the presence of @Ignore on a suite class, at least not
// when run within STS 2.6.0.
//
// DefaultConfigClassInheritedTests.class
DefaultConfigClassInheritedTests.class
})
public class AnnotationConfigSuiteTests {

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

@@ -19,7 +19,6 @@ package org.springframework.test.context.junit4.annotation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.Employee;
@@ -34,7 +33,6 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
* @author Sam Brannen
* @since 3.1
*/
@Ignore("[SPR-6184] Disabled until ContextLoaderUtils supports recursive search for configuration classes")
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
public class DefaultConfigClassBaseTests {

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

@@ -19,6 +19,7 @@ package org.springframework.test.context.junit4.annotation;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.beans.Pet;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,7 @@ import org.springframework.test.context.ContextConfiguration;
* @author Sam Brannen
* @since 3.1
*/
@Ignore("[SPR-6184] Disabled until ContextLoaderUtils supports recursive search for configuration classes")
@ContextConfiguration
public class DefaultConfigClassInheritedTests extends DefaultConfigClassBaseTests {