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

Polish ActiveProfilesUtils

This commit is contained in:
Sam Brannen 2020-11-03 14:46:17 +01:00
parent 0f6038af70
commit 5628c8cd63
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
spring-test/src/main/java/org/springframework/test/context/support/ActiveProfilesUtils.java
View File

@ -17,7 +17,6 @@
package org.springframework.test.context.support; package org.springframework.test.context.support;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
@ -110,15 +109,15 @@ abstract class ActiveProfilesUtils {
String[] profiles = resolver.resolve(rootDeclaringClass); String[] profiles = resolver.resolve(rootDeclaringClass);
if (!ObjectUtils.isEmpty(profiles)) { if (!ObjectUtils.isEmpty(profiles)) {
profileArrays.add(profiles); // Prepend to the list so that we can later traverse "down" the hierarchy
// to ensure that we retain the top-down profile registration order
// within a test class hierarchy.
profileArrays.add(0, profiles);
} }
descriptor = (annotation.inheritProfiles() ? descriptor.next() : null); descriptor = (annotation.inheritProfiles() ? descriptor.next() : null);
} }
// Reverse the list so that we can traverse "down" the hierarchy.
Collections.reverse(profileArrays);
Set<String> activeProfiles = new LinkedHashSet<>(); Set<String> activeProfiles = new LinkedHashSet<>();
for (String[] profiles : profileArrays) { for (String[] profiles : profileArrays) {
for (String profile : profiles) { for (String profile : profiles) {