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

[SPR-8387] Initial draft of the new DelegatingSmartContextLoader.

Browse Source
This commit is contained in:
Sam Brannen
2011-06-26 15:39:58 +00:00
parent b49d11f84a
commit 4ef895a018
3 changed files with 149 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.test/src/test/java/org/springframework/test/context/ContextLoaderUtilsTests.java
View File

@@ -27,8 +27,8 @@ import java.util.List;
import org.junit.Test;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.support.AnnotationConfigContextLoader;
import org.springframework.test.context.support.DelegatingSmartContextLoader;
import org.springframework.test.context.support.GenericPropertiesContextLoader;
import org.springframework.test.context.support.GenericXmlContextLoader;
/**
* Unit tests for {@link ContextLoaderUtils}.
@@ -120,7 +120,7 @@ public class ContextLoaderUtilsTests {
mergedConfig,
testClass,
new String[] { "classpath:/org/springframework/test/context/ContextLoaderUtilsTests$BareAnnotations-context.xml" },
EMPTY_CLASS_ARRAY, GenericXmlContextLoader.class);
EMPTY_CLASS_ARRAY, DelegatingSmartContextLoader.class);
}
@Test
@@ -129,7 +129,7 @@ public class ContextLoaderUtilsTests {
MergedContextConfiguration mergedConfig = ContextLoaderUtils.buildMergedContextConfiguration(testClass, null);
assertMergedContextConfiguration(mergedConfig, testClass, new String[] { "classpath:/foo.xml" },
new Class<?>[] { FooConfig.class }, GenericXmlContextLoader.class);
new Class<?>[] { FooConfig.class }, DelegatingSmartContextLoader.class);
}
@Test