root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[SPR-8387] polishing

This commit is contained in:
Sam Brannen 2011-06-26 17:13:09 +00:00
parent 4aed64ea4b
commit 8e497d9627
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java
View File

@ -50,8 +50,6 @@ abstract class ContextLoaderUtils {
private static final Log logger = LogFactory.getLog(ContextLoaderUtils.class); private static final Log logger = LogFactory.getLog(ContextLoaderUtils.class);
// private static final String DEFAULT_CONTEXT_LOADER_CLASS_NAME =
// "org.springframework.test.context.support.GenericXmlContextLoader";
private static final String DEFAULT_CONTEXT_LOADER_CLASS_NAME = "org.springframework.test.context.support.DelegatingSmartContextLoader"; private static final String DEFAULT_CONTEXT_LOADER_CLASS_NAME = "org.springframework.test.context.support.DelegatingSmartContextLoader";

4
org.springframework.test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java
View File

@ -96,8 +96,8 @@ public class MergedContextConfiguration {
String activeProfilesKey = ObjectUtils.nullSafeToString(activeProfiles); String activeProfilesKey = ObjectUtils.nullSafeToString(activeProfiles);
String contextLoaderKey = contextLoader == null ? "null" : contextLoader.getClass().getName(); String contextLoaderKey = contextLoader == null ? "null" : contextLoader.getClass().getName();
return String.format("locations = [%s], classes = [%s], activeProfiles = [%s], contextLoader = [%s]", return String.format("locations = %s, classes = %s, activeProfiles = %s, contextLoader = %s", locationsKey,
locationsKey, classesKey, activeProfilesKey, contextLoaderKey); classesKey, activeProfilesKey, contextLoaderKey);
} }
/** /**

8
org.springframework.test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java
View File

@ -70,7 +70,7 @@ public class DelegatingSmartContextLoader implements SmartContextLoader {
for (SmartContextLoader loader : candidates) { for (SmartContextLoader loader : candidates) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug(String.format("Delegating to loader [%s] to process context configuration [%s].", logger.debug(String.format("Delegating to %s to process context configuration [%s].",
loader.getClass().getName(), configAttributes)); loader.getClass().getName(), configAttributes));
} }
@ -120,8 +120,8 @@ public class DelegatingSmartContextLoader implements SmartContextLoader {
for (SmartContextLoader loader : candidates) { for (SmartContextLoader loader : candidates) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug(String.format("Delegating to loader [%s] to load context from [%s].", logger.debug(String.format("Delegating to %s to load context from [%s].", loader.getClass().getName(),
loader.getClass().getName(), mergedConfig)); mergedConfig));
} }
// Ask each loader if it can load a context from the mergedConfig. // Ask each loader if it can load a context from the mergedConfig.
@ -132,7 +132,7 @@ public class DelegatingSmartContextLoader implements SmartContextLoader {
} }
} }
throw new IllegalStateException(String.format("None of the candidate SmartContextLoaders [%s] " throw new IllegalStateException(String.format("None of the candidate SmartContextLoaders %s "
+ "was able to load an ApplicationContext from [%s].", candidates, mergedConfig)); + "was able to load an ApplicationContext from [%s].", candidates, mergedConfig));
} }