Browse Source

Polishing

pull/1070/merge
Sam Brannen 9 years ago
parent
commit
5f176f50d3
  1. 2
      spring-test/src/main/java/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.java
  2. 7
      spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java
  3. 2
      spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java

2
spring-test/src/main/java/org/springframework/test/context/support/AbstractDelegatingSmartContextLoader.java

@ -151,7 +151,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte @@ -151,7 +151,7 @@ public abstract class AbstractDelegatingSmartContextLoader implements SmartConte
@Override
public void processContextConfiguration(final ContextConfigurationAttributes configAttributes) {
Assert.notNull(configAttributes, "configAttributes must not be null");
Assert.isTrue(!(configAttributes.hasLocations() && configAttributes.hasClasses()), String.format(
Assert.isTrue(!(configAttributes.hasLocations() && configAttributes.hasClasses()), () -> String.format(
"Cannot process locations AND classes for context configuration %s: "
+ "configure one or the other, but not both.", configAttributes));

7
spring-test/src/main/java/org/springframework/test/context/support/AbstractTestContextBootstrapper.java

@ -555,12 +555,7 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot @@ -555,12 +555,7 @@ public abstract class AbstractTestContextBootstrapper implements TestContextBoot
private static boolean areAllEmpty(Collection<?>... collections) {
for (Collection<?> collection : collections) {
if (!collection.isEmpty()) {
return false;
}
}
return true;
return Arrays.stream(collections).allMatch(Collection::isEmpty);
}
}

2
spring-test/src/main/java/org/springframework/test/context/support/TestPropertySourceUtils.java

@ -118,7 +118,7 @@ public abstract class TestPropertySourceUtils { @@ -118,7 +118,7 @@ public abstract class TestPropertySourceUtils {
}
String[] locationsArray = TestContextResourceUtils.convertToClasspathResourcePaths(
attrs.getDeclaringClass(), attrs.getLocations());
locations.addAll(0, Arrays.<String> asList(locationsArray));
locations.addAll(0, Arrays.asList(locationsArray));
if (!attrs.isInheritLocations()) {
break;
}

Loading…
Cancel
Save