Skip to content

Commit 960082d

Browse files
committed
[SPR-8541] Oops! Fixed a minor logic error in DelegatingSmartContextLoader.
1 parent 8ccedd4 commit 960082d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private static boolean supports(SmartContextLoader loader, MergedContextConfigur
123123
public void processContextConfiguration(final ContextConfigurationAttributes configAttributes) {
124124

125125
Assert.notNull(configAttributes, "configAttributes must not be null");
126-
Assert.isTrue(configAttributes.hasLocations() && configAttributes.hasClasses(), String.format(
126+
Assert.isTrue(!(configAttributes.hasLocations() && configAttributes.hasClasses()), String.format(
127127
"Cannot process locations AND configuration classes for context "
128128
+ "configuration %s; configure one or the other, but not both.", configAttributes));
129129

0 commit comments

Comments
 (0)