admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid unnecessary list creation & processing in AbstractTestContextBootstrapper

Browse Source 
Closes gh-35995
This commit is contained in:
Sam Brannen
2025-12-10 18:51:43 +01:00
parent ea7a1d789e
commit 658775b914
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
+18 -6
View File
@@ -152,7 +152,9 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot
listeners.addAll(getDefaultTestExecutionListeners());
}
listeners.addAll(0, instantiateListeners(testExecutionListeners.listeners()));
if (testExecutionListeners.listeners().length > 0) {
listeners.addAll(0, instantiateListeners(testExecutionListeners.listeners()));
}
descriptor = (inheritListeners ? parentDescriptor : null);
}
@@ -316,17 +318,25 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot
}
if (contextLoader instanceof SmartContextLoader smartContextLoader) {
smartContextLoader.processContextConfiguration(configAttributes);
locations.addAll(0, Arrays.asList(configAttributes.getLocations()));
classes.addAll(0, Arrays.asList(configAttributes.getClasses()));
if (configAttributes.getLocations().length > 0) {
locations.addAll(0, Arrays.asList(configAttributes.getLocations()));
}
if (configAttributes.getClasses().length > 0) {
classes.addAll(0, Arrays.asList(configAttributes.getClasses()));
}
}
else {
@SuppressWarnings("deprecation")
String[] processedLocations = contextLoader.processLocations(
configAttributes.getDeclaringClass(), configAttributes.getLocations());
locations.addAll(0, Arrays.asList(processedLocations));
if (processedLocations.length > 0) {
locations.addAll(0, Arrays.asList(processedLocations));
}
// Legacy ContextLoaders don't know how to process classes
}
initializers.addAll(0, Arrays.asList(configAttributes.getInitializers()));
if (configAttributes.getInitializers().length > 0) {
initializers.addAll(0, Arrays.asList(configAttributes.getInitializers()));
}
if (!configAttributes.isInheritLocations()) {
break;
}
@@ -401,7 +411,9 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot
boolean inheritFactories = annotation.inheritFactories();
AnnotationDescriptor<ContextCustomizerFactories> parentDescriptor = descriptor.next();
factories.addAll(0, instantiateCustomizerFactories(annotation.factories()));
if (annotation.factories().length > 0) {
factories.addAll(0, instantiateCustomizerFactories(annotation.factories()));
}
// If there are no factories to inherit, we might need to merge the
// locally declared factories with the defaults.