Reliably support JRE.OTHER with @⁠EnabledOnJre and @⁠DisabledOnJre

In JUnit Jupiter 5.12, I added support for arbitrary Java versions with
JRE conditions; however, I accidentally introduced a regression
regarding support for JRE.OTHER. Specifically, prior to this commit,
JRE.OTHER no longer worked reliably when used with @⁠EnabledOnJre or
@⁠DisabledOnJre.

To address that, this commit revises the logic in
JRE.isCurrentVersion(int) to account for situations where the supplied
version value is Integer.MAX_VALUE (representing @⁠EnabledOnJre(OTHER)
or @⁠DisabledOnJre(OTHER)), and the current version of the JVM is
greater than the version of the last JRE.JAVA_* enum constant — for
example, when running on Java 27 and the last JRE enum constant is
JAVA_26.

See #3930
Closes #5341

Author: sbrannen

documentation/modules/ROOT/pages/release-notes.adoc

@@ -5,6 +5,8 @@
 
 This document contains the change log for all JUnit releases since 5.14 GA.
 
+include::partial$release-notes/release-notes-6.0.3.adoc[]
+
 include::partial$release-notes/release-notes-6.0.2.adoc[]
 
 include::partial$release-notes/release-notes-6.0.1.adoc[]

documentation/modules/ROOT/partials/release-notes/release-notes-6.0.3.adoc

@@ -0,0 +1,69 @@
+[[v6.0.3]]
+== 6.0.3
+
+*Date of Release:* ❓
+
+*Scope:* Bug fixes and enhancements since 6.0.2
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit-framework-repo}+/milestone/116?closed=1+[6.0.3] milestone page in the JUnit
+repository on GitHub.
+
+
+[[v6.0.3-junit-platform]]
+=== JUnit Platform
+
+[[v6.0.3-junit-platform-bug-fixes]]
+==== Bug Fixes
+
+* ❓
+
+[[v6.0.3-junit-platform-deprecations-and-breaking-changes]]
+==== Deprecations and Breaking Changes
+
+* ❓
+
+[[v6.0.3-junit-platform-new-features-and-improvements]]
+==== New Features and Improvements
+
+* ❓
+
+
+[[v6.0.3-junit-jupiter]]
+=== JUnit Jupiter
+
+[[v6.0.3-junit-jupiter-bug-fixes]]
+==== Bug Fixes
+
+* `@EnabledOnJre` and `@DisabledOnJre` once again work reliably when used with `JRE.OTHER`
+  in a test running on a Java runtime whose version is higher than the version of the last
+  `JAVA_*` constant in the `JRE` enum.
+
+[[v6.0.3-junit-jupiter-deprecations-and-breaking-changes]]
+==== Deprecations and Breaking Changes
+
+* ❓
+
+[[v6.0.3-junit-jupiter-new-features-and-improvements]]
+==== New Features and Improvements
+
+* ❓
+
+
+[[v6.0.3-junit-vintage]]
+=== JUnit Vintage
+
+[[v6.0.3-junit-vintage-bug-fixes]]
+==== Bug Fixes
+
+* ❓
+
+[[v6.0.3-junit-vintage-deprecations-and-breaking-changes]]
+==== Deprecations and Breaking Changes
+
+* ❓
+
+[[v6.0.3-junit-vintage-new-features-and-improvements]]
+==== New Features and Improvements
+
+* ❓

junit-jupiter-api/src/templates/resources/main/org/junit/jupiter/api/condition/JRE.java.jte

@@ -169,17 +169,28 @@ public enum JRE {
 	}
 
 	/**
-	 * {@return {@code true} if the supplied version number is known to be the
-	 * Java Runtime Environment version for the currently executing JVM or if
-	 * the supplied version number is {@code -1} and the current JVM version
-	 * could not be determined}
+	 * Determine if the supplied version number is considered to be the current
+	 * JRE version.
+	 *
+	 * <p>Returns {@code true} if either of the following is {@code true}.
 	 *
+	 * <ul>
+	 * <li>The supplied version number is known to be the Java Runtime Environment
+	 * version for the currently executing JVM.</li>
+	 * <li>The supplied version number is {@link Integer#MAX_VALUE} and the current
+	 * {@code JRE} is {@link JRE#OTHER OTHER}.</li>
+	 * </ul>
+	 *
+	 * @return {@code true} if the supplied version number is considered to be
+	 * the current JRE version
 	 * @since 5.12
 	 * @see Runtime.Version#feature()
+	 * @see #isCurrentVersion()
+	 * @see #currentJre()
 	 */
 	@API(status = MAINTAINED, since = "5.13.3")
 	public static boolean isCurrentVersion(int version) {
-		return version == CURRENT_VERSION;
+		return (version == CURRENT_VERSION) || (version == JRE.currentJre().version);
 	}
 
 	static boolean isCurrentVersionWithinRange(int min, int max) {

junit-jupiter-api/src/templates/resources/testFixtures/org/junit/jupiter/api/condition/JavaVersionPredicates.java.jte

@@ -19,4 +19,9 @@ public class JavaVersionPredicates {
 		return @for(var jre : ForSupport.of(supportedJres))onJava${jre.get().getVersion()}()@if(!jre.isLast()) //
 				|| @endif@endfor;
 	}
+
+	static boolean onOtherVersion() {
+		return JRE.OTHER.isCurrentVersion();
+	}
+
 }

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

@@ -14,6 +14,7 @@
 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.onKnownVersion;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onOtherVersion;
 import static org.junit.platform.commons.test.PreconditionAssertions.assertPreconditionViolationFor;
 
 import org.junit.jupiter.api.Test;
@@ -257,7 +258,7 @@ void minVersion18MaxVersion19() {
 	@Test
 	void minOtherMaxOther() {
 		evaluateCondition();
-		assertDisabledOnCurrentJreIf(!onKnownVersion());
+		assertDisabledOnCurrentJreIf(!(onKnownVersion() || onOtherVersion()));
 	}
 
 	/**

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

@@ -22,6 +22,7 @@
 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.onKnownVersion;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onOtherVersion;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -194,7 +195,7 @@ void minVersion18MaxVersion19() {
 	@Test
 	@DisabledForJreRange(min = OTHER, max = OTHER)
 	void minOtherMaxOther() {
-		assertTrue(onKnownVersion());
+		assertTrue(onKnownVersion() || onOtherVersion());
 	}
 
 	@Test

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

@@ -21,6 +21,7 @@
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava25;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava26;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onOtherVersion;
 import static org.junit.platform.commons.test.PreconditionAssertions.assertPreconditionViolationFor;
 
 import org.junit.jupiter.api.Test;
@@ -195,8 +196,8 @@ void minVersionGreaterThanMax() {
 	@Test
 	void min20() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(
-			onJava20() || onJava21() || onJava22() || onJava23() || onJava24() || onJava25() || onJava26());
+		assertEnabledOnCurrentJreIf(onJava20() || onJava21() || onJava22() || onJava23() || onJava24() || onJava25()
+				|| onJava26() || onOtherVersion());
 	}
 
 	/**
@@ -304,7 +305,8 @@ void minVersion20MaxVersion21() {
 	@Test
 	void minVersion21MaxVersionMaxInteger() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(onJava21() || onJava22() || onJava23() || onJava24() || onJava25() || onJava26());
+		assertEnabledOnCurrentJreIf(
+			onJava21() || onJava22() || onJava23() || onJava24() || onJava25() || onJava26() || onOtherVersion());
 	}
 
 	/**
@@ -313,7 +315,7 @@ void minVersion21MaxVersionMaxInteger() {
 	@Test
 	void minOtherMaxOther() {
 		evaluateCondition();
-		assertEnabledOnCurrentJreIf(!onKnownVersion());
+		assertEnabledOnCurrentJreIf(!(onKnownVersion() || onOtherVersion()));
 	}
 
 	/**

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

@@ -26,6 +26,7 @@
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava22;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava23;
 import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
+import static org.junit.jupiter.api.condition.JavaVersionPredicates.onOtherVersion;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -152,7 +153,7 @@ void minVersionGreaterThanMax() {
 	@Test
 	@EnabledForJreRange(min = JAVA_20)
 	void min20() {
-		assertTrue(onKnownVersion());
+		assertTrue(onKnownVersion() || onOtherVersion());
 		assertTrue(JRE.currentVersionNumber() >= 20);
 		assertTrue(CURRENT_JRE.compareTo(JAVA_20) >= 0);
 		assertTrue(CURRENT_JRE.version() >= 20);
@@ -241,7 +242,7 @@ void minVersion20MaxVersion21() {
 	@Test
 	@EnabledForJreRange(minVersion = 21, maxVersion = Integer.MAX_VALUE)
 	void minVersion21MaxVersionMaxInteger() {
-		assertTrue(onKnownVersion());
+		assertTrue(onKnownVersion() || onOtherVersion());
 		assertTrue(JRE.currentVersionNumber() >= 21);
 	}