Fix tests after cherry-picking changes from main branch

junit-team · Sep 23, 2024 · 611ae8d · 611ae8d
1 parent 499fb2b
commit 611ae8d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 25 deletions.
diff --git a/...gine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/...gine/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -21,11 +21,9 @@
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava20;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava21;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava22;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExecutionCondition;
@@ -115,9 +113,7 @@ void javaMin18() {
 	@Test
 	void other() {
 		evaluateCondition();
-		assertDisabledOnCurrentJreIf(
-			!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
-					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()));
+		assertDisabledOnCurrentJreIf(!onKnownVersion());
 	}
 
 	private void assertDisabledOnCurrentJreIf(boolean condition) {

diff --git a/...ne/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/...ne/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -27,11 +27,9 @@
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava20;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava21;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava22;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -83,9 +81,7 @@ void javaMin18() {
 	@Test
 	@DisabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
-		assertTrue(
-			onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
-					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
+		assertTrue(onKnownVersion());
 	}
 
 }
diff --git a/...ngine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/...ngine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -21,11 +21,9 @@
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava20;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava21;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava22;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExecutionCondition;
@@ -114,9 +112,7 @@ void javaMin18() {
 	@Test
 	void other() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(
-			!(onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
-					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()));
+		assertEnabledOnCurrentJreIf(!onKnownVersion());
 	}
 
 	private void assertEnabledOnCurrentJreIf(boolean condition) {

diff --git a/...ine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/...ine/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -27,11 +27,9 @@
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava17;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava18;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava19;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava20;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava21;
-import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava22;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava8;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava9;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -79,16 +77,15 @@ void javaMax18() {
 	@Test
 	@EnabledForJreRange(min = JAVA_18)
 	void javaMin18() {
-		assertTrue(onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
+		assertTrue(onKnownVersion());
+		assertTrue(JRE.currentVersion().compareTo(JAVA_18) >= 0);
 		assertFalse(onJava17());
 	}
 
 	@Test
 	@EnabledForJreRange(min = OTHER, max = OTHER)
 	void other() {
-		assertFalse(
-			onJava8() || onJava9() || onJava10() || onJava11() || onJava12() || onJava13() || onJava14() || onJava15()
-					|| onJava16() || onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22());
+		assertFalse(onKnownVersion());
 	}
 
 }