Skip to content

Commit 8e497d9

Browse files
committed
[SPR-8387] polishing
1 parent 4aed64e commit 8e497d9

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

org.springframework.test/src/main/java/org/springframework/test/context/ContextLoaderUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ abstract class ContextLoaderUtils {
5050

5151
private static final Log logger = LogFactory.getLog(ContextLoaderUtils.class);
5252

53-
// private static final String DEFAULT_CONTEXT_LOADER_CLASS_NAME =
54-
// "org.springframework.test.context.support.GenericXmlContextLoader";
5553
private static final String DEFAULT_CONTEXT_LOADER_CLASS_NAME = "org.springframework.test.context.support.DelegatingSmartContextLoader";
5654

5755

org.springframework.test/src/main/java/org/springframework/test/context/MergedContextConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ private static String generateContextKey(String[] locations, Class<?>[] classes,
9696
String activeProfilesKey = ObjectUtils.nullSafeToString(activeProfiles);
9797
String contextLoaderKey = contextLoader == null ? "null" : contextLoader.getClass().getName();
9898

99-
return String.format("locations = [%s], classes = [%s], activeProfiles = [%s], contextLoader = [%s]",
100-
locationsKey, classesKey, activeProfilesKey, contextLoaderKey);
99+
return String.format("locations = %s, classes = %s, activeProfiles = %s, contextLoader = %s", locationsKey,
100+
classesKey, activeProfilesKey, contextLoaderKey);
101101
}
102102

103103
/**

org.springframework.test/src/main/java/org/springframework/test/context/support/DelegatingSmartContextLoader.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void processContextConfiguration(ContextConfigurationAttributes configAtt
7070

7171
for (SmartContextLoader loader : candidates) {
7272
if (logger.isDebugEnabled()) {
73-
logger.debug(String.format("Delegating to loader [%s] to process context configuration [%s].",
73+
logger.debug(String.format("Delegating to %s to process context configuration [%s].",
7474
loader.getClass().getName(), configAttributes));
7575
}
7676

@@ -120,8 +120,8 @@ public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) t
120120

121121
for (SmartContextLoader loader : candidates) {
122122
if (logger.isDebugEnabled()) {
123-
logger.debug(String.format("Delegating to loader [%s] to load context from [%s].",
124-
loader.getClass().getName(), mergedConfig));
123+
logger.debug(String.format("Delegating to %s to load context from [%s].", loader.getClass().getName(),
124+
mergedConfig));
125125
}
126126

127127
// Ask each loader if it can load a context from the mergedConfig.
@@ -132,7 +132,7 @@ public ApplicationContext loadContext(MergedContextConfiguration mergedConfig) t
132132
}
133133
}
134134

135-
throw new IllegalStateException(String.format("None of the candidate SmartContextLoaders [%s] "
135+
throw new IllegalStateException(String.format("None of the candidate SmartContextLoaders %s "
136136
+ "was able to load an ApplicationContext from [%s].", candidates, mergedConfig));
137137
}
138138

0 commit comments

Comments
 (0)