Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trim expressions supplied to @DisabledIf

Browse Source 
Prior to this commit, the DisabledIfCondition did not trim whitespace
from expressions configured via @DisabledIf. Consequently, results such
as "  true  " would evaluate to "false".

This commit fixes this problem by trimming all expressions configured
via @DisabledIf.

Issue: SPR-14614
This commit is contained in:
Sam Brannen
2016-08-29 15:47:38 +02:00
parent d6d05e8ca0
commit b6220cc19d
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-test/src/main/java/org/springframework/test/context/junit/jupiter/DisabledIfCondition.java
View File

@@ -82,9 +82,11 @@ public class DisabledIfCondition implements ContainerExecutionCondition, TestExe
Optional<DisabledIf> disabledIf = findMergedAnnotation(element, DisabledIf.class);
Assert.state(disabledIf.isPresent(), () -> "@DisabledIf must be present on " + element);
String expression = disabledIf.map(DisabledIf::expression).filter(StringUtils::hasText).orElseThrow(
() -> new IllegalStateException(
String.format("The expression in @DisabledIf on [%s] must not be blank", element)));
// @formatter:off
String expression = disabledIf.map(DisabledIf::expression).map(String::trim).filter(StringUtils::hasLength)
.orElseThrow(() -> new IllegalStateException(String.format(
"The expression in @DisabledIf on [%s] must not be blank", element)));
// @formatter:on
if (isDisabled(expression, extensionContext)) {
String reason = disabledIf.map(DisabledIf::reason).filter(StringUtils::hasText).orElseGet(

18
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/DisabledIfTestCase.java
View File

@@ -50,6 +50,12 @@ class DisabledIfTestCase {
fail("This test must be disabled");
}
@Test
@DisabledIf(" true ")
void disabledByStringTrueWithSurroundingWhitespace() {
fail("This test must be disabled");
}
@Test
@DisabledIf("TrUe")
void disabledByStringTrueIgnoreCase() {
@@ -62,12 +68,24 @@ class DisabledIfTestCase {
fail("This test must be disabled");
}
@Test
@DisabledIf("\t${foo} ")
void disabledByPropertyPlaceholderWithSurroundingWhitespace() {
fail("This test must be disabled");
}
@Test
@DisabledIf("#{T(java.lang.Boolean).TRUE}")
void disabledBySpelBoolean() {
fail("This test must be disabled");
}
@Test
@DisabledIf(" #{T(java.lang.Boolean).TRUE} ")
void disabledBySpelBooleanWithSurroundingWhitespace() {
fail("This test must be disabled");
}
@Test
@DisabledIf("#{'tr' + 'ue'}")
void disabledBySpelStringConcatenation() {