Skip to content

Commit 611ae8d

Browse files
committed
Fix tests after cherry-picking changes from main branch
1 parent 499fb2b commit 611ae8d

File tree

4 files changed

+10
-25
lines changed

4 files changed

+10
-25
lines changed

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
2222
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
2323
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
24-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava20;
25-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava21;
26-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava22;
2724
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
2825
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
26+
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
2927

3028
import org.junit.jupiter.api.Test;
3129
import org.junit.jupiter.api.extension.ExecutionCondition;
@@ -115,9 +113,7 @@ void javaMin18() {
115113
@Test
116114
void other() {
117115
evaluateCondition();
118-
assertDisabledOnCurrentJreIf(
119-
!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
120-
|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()));
116+
assertDisabledOnCurrentJreIf(!onKnownVersion());
121117
}
122118

123119
private void assertDisabledOnCurrentJreIf(boolean condition) {

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
2828
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
2929
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
30-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava20;
31-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava21;
32-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava22;
3330
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
3431
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
32+
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
3533

3634
import org.junit.jupiter.api.Disabled;
3735
import org.junit.jupiter.api.Test;
@@ -83,9 +81,7 @@ void javaMin18() {
8381
@Test
8482
@DisabledForJreRange(min = OTHER, max = OTHER)
8583
void other() {
86-
assertTrue(
87-
onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
88-
|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
84+
assertTrue(onKnownVersion());
8985
}
9086

9187
}

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
2222
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
2323
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
24-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava20;
25-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava21;
26-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava22;
2724
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
2825
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
26+
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
2927

3028
import org.junit.jupiter.api.Test;
3129
import org.junit.jupiter.api.extension.ExecutionCondition;
@@ -114,9 +112,7 @@ void javaMin18() {
114112
@Test
115113
void other() {
116114
evaluateCondition();
117-
assertEnabledOnCurrentJreIf(
118-
!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
119-
|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()));
115+
assertEnabledOnCurrentJreIf(!onKnownVersion());
120116
}
121117

122118
private void assertEnabledOnCurrentJreIf(boolean condition) {

junit-jupiter-engine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@
2727
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
2828
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
2929
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
30-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava20;
31-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava21;
32-
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava22;
3330
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
3431
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
32+
import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
3533

3634
import org.junit.jupiter.api.Disabled;
3735
import org.junit.jupiter.api.Test;
@@ -79,16 +77,15 @@ void javaMax18() {
7977
@Test
8078
@EnabledForJreRange(min = JAVA_18)
8179
void javaMin18() {
82-
assertTrue(onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
80+
assertTrue(onKnownVersion());
81+
assertTrue(JRE.currentVersion().compareTo(JAVA_18) >= 0);
8382
assertFalse(onJava17());
8483
}
8584

8685
@Test
8786
@EnabledForJreRange(min = OTHER, max = OTHER)
8887
void other() {
89-
assertFalse(
90-
onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
91-
|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
88+
assertFalse(onKnownVersion());
9289
}
9390

9491
}

0 commit comments

Comments
 (0)