Skip to content

Commit f4c202b

Browse files
committed
Strip reasons when concatenating them in ConditionEvaluationResult
Prior to this commit, invoking: ConditionEvaluationResult.disabled(" x ", " y ") Resulted in: "x ==> y" With this change, the result is now: "x ==> y" See: #4698 Closes: #4715 (cherry picked from commit fd6b40b)
1 parent e5d0e0b commit f4c202b

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

junit-jupiter-api/src/main/java/org/junit/jupiter/api/extension/ConditionEvaluationResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public static ConditionEvaluationResult disabled(String reason, String customRea
7676
if (StringUtils.isBlank(customReason)) {
7777
return disabled(reason);
7878
}
79-
return disabled(String.format("%s ==> %s", reason, customReason));
79+
return disabled(String.format("%s ==> %s", reason.trim(), customReason.trim()));
8080
}
8181

8282
private final boolean enabled;

jupiter-tests/src/test/java/org/junit/jupiter/api/condition/ConditionEvaluationResultTests.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,16 @@ void disabledWithBlankDefaultReasonAndBlankCustomReason(String reason) {
100100

101101
@Test
102102
void disabledWithDefaultReasonAndCustomReason() {
103-
var result = ConditionEvaluationResult.disabled("default", "custom");
103+
disabledWithDefaultReasonAndCustomReason("default", "custom");
104+
}
105+
106+
@Test
107+
void disabledWithDefaultReasonAndCustomReasonWithLeadingAndTrailingWhitespace() {
108+
disabledWithDefaultReasonAndCustomReason(" default ", " custom ");
109+
}
110+
111+
private static void disabledWithDefaultReasonAndCustomReason(String defaultReason, String customReason) {
112+
var result = ConditionEvaluationResult.disabled(defaultReason, customReason);
104113

105114
assertThat(result.isDisabled()).isTrue();
106115
assertThat(result.getReason()).contains("default ==> custom");

0 commit comments

Comments
 (0)