mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-05-03 04:19:47 +01:00
Sam Brannen
1f017c4acb
Prior to this commit, the Spring TestContext Framework did not support the declaration of both 'locations' and 'classes' within @ContextConfiguration at the same time. This commit addresses this in the following manner: - ContextConfigurationAttributes no longer throws an IllegalArgumentException if both 'locations' and 'classes' are supplied to its constructor. - Concrete SmartContextLoader implementations now validate the supplied MergedContextConfiguration before attempting to load the ApplicationContext. See validateMergedContextConfiguration(). - Introduced tests for hybrid context loaders like the one used in Spring Boot. See HybridContextLoaderTests. - Updated the Testing chapter of the reference manual so that it no longer states that locations and classes cannot be used simultaneously, mentioning Spring Boot as well. - The Javadoc for @ContextConfiguration has been updated accordingly. - Added hasLocations(), hasClasses(), and hasResources() convenience methods to MergedContextConfiguration. Issue: SPR-11634
21 lines
1001 B
XML
21 lines
1001 B
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<beansProjectDescription>
|
|
<version>1</version>
|
|
<pluginVersion><![CDATA[3.5.0.201402030809-M2]]></pluginVersion>
|
|
<configSuffixes>
|
|
<configSuffix><![CDATA[xml]]></configSuffix>
|
|
</configSuffixes>
|
|
<enableImports><![CDATA[false]]></enableImports>
|
|
<configs>
|
|
<config>src/test/java/org/springframework/test/context/junit4/profile/xml/DefaultProfileXmlConfigTests-context.xml</config>
|
|
<config>src/test/java/org/springframework/test/context/junit4/aci/xml/MultipleInitializersXmlConfigTests-context.xml</config>
|
|
<config>src/test/resources/org/springframework/test/context/web/RequestAndSessionScopedBeansWacTests-context.xml</config>
|
|
<config>src/test/resources/org/springframework/test/context/hierarchies/web/DispatcherWacRootWacEarTests-context.xml</config>
|
|
<config>src/test/java/org/springframework/test/context/junit4/hybrid/hybrid-config.xml</config>
|
|
</configs>
|
|
<autoconfigs>
|
|
</autoconfigs>
|
|
<configSets>
|
|
</configSets>
|
|
</beansProjectDescription>
|