Allow JREs < 17 again

Author: marcphilipp

documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-M1.adoc

@@ -67,8 +67,6 @@ repository on GitHub.
   no longer be used at runtime since `JAVA_17` is the new baseline.
 * `@EnabledForJreRange` and `@DisabledForJreRange` now use `JAVA_17` as their default
   `min` value.
-* `@EnabledOnJre`, `@DisabledOnJre`, `@EnabledForJreRange`, and `@DisabledForJreRange` now
-  fail if a JRE version less than 17 is specified.
 
 [[release-notes-6.0.0-M1-junit-jupiter-new-features-and-improvements]]
 ==== New Features and Improvements

gradle/plugins/code-generator/src/main/kotlin/junitbuild/generator/GenerateJreRelatedSourceCode.kt

@@ -61,7 +61,7 @@ abstract class GenerateJreRelatedSourceCode : DefaultTask() {
             val supportedJres = jres.filter { it.version >= minRuntimeVersion }
             val params = mapOf(
                 "minRuntimeVersion" to minRuntimeVersion,
-                "jres" to jres,
+                "allJres" to jres,
                 "supportedJres" to supportedJres,
                 "supportedJresSortedByStringValue" to supportedJres.sortedBy { it.version.toString() },
                 "licenseHeader" to licenseHeaderFile.asFile.get().readText()

junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractJreRangeCondition.java

@@ -26,6 +26,9 @@
  */
 abstract class AbstractJreRangeCondition<A extends Annotation> extends BooleanExecutionCondition<A> {
 
+	private static final JRE DEFAULT_MINIMUM_JRE = JRE.JAVA_17;
+	private static final JRE DEFAULT_MAXIMUM_JRE = JRE.OTHER;
+
 	private final String annotationName;
 
 	AbstractJreRangeCondition(Class<A> annotationType, Function<A, String> customDisabledReason) {
@@ -58,17 +61,17 @@ protected final boolean isCurrentVersionWithinRange(JRE minJre, JRE maxJre, int
 		// Now that we have checked the basic preconditions, we need to ensure that we are
 		// using valid JRE enum constants.
 		if (!minJreSet) {
-			minJre = JRE.JAVA_17;
+			minJre = DEFAULT_MINIMUM_JRE;
 		}
 		if (!maxJreSet) {
-			maxJre = JRE.OTHER;
+			maxJre = DEFAULT_MAXIMUM_JRE;
 		}
 
 		int min = (minVersionSet ? minVersion : minJre.version());
 		int max = (maxVersionSet ? maxVersion : maxJre.version());
 
 		// Finally, we need to validate the effective minimum and maximum values.
-		Preconditions.condition((min != JRE.MINIMUM_VERSION || max != Integer.MAX_VALUE),
+		Preconditions.condition((min != DEFAULT_MINIMUM_JRE.version() || max != DEFAULT_MAXIMUM_JRE.version()),
 			() -> "You must declare a non-default value for the minimum or maximum value in @" + this.annotationName);
 		Preconditions.condition(min <= max,
 			() -> String.format("@%s's minimum value [%d] must be less than or equal to its maximum value [%d]",

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

@@ -3,7 +3,7 @@
 @import junitbuild.generator.model.JRE
 
 @param int minRuntimeVersion
-@param List<JRE> jres
+@param List<JRE> allJres
 @param String licenseHeader
 ${licenseHeader}
 package org.junit.jupiter.api.condition;
@@ -22,7 +22,7 @@ import org.apiguardian.api.API;
  * {@linkplain #isCurrentVersion current JRE version}.
  *
  * @since 5.1
-@for(JRE jre : jres)<%--
+@for(JRE jre : allJres)<%--
 --%> * @see #JAVA_${jre.getVersion()}
 @endfor<%--
 --%> * @see #OTHER
@@ -46,7 +46,7 @@ public enum JRE {
 	 */
 	@API(status = EXPERIMENTAL, since = "5.12")
 	UNDEFINED(-1),
-@for(var jre : jres)
+@for(var jre : allJres)
 	/**
 	 * Java ${jre.getVersion()}.
 	@if(jre.getSince() != null || jre.getVersion() < minRuntimeVersion)<%--
@@ -69,7 +69,7 @@ public enum JRE {
 @endfor
 	/**
 	 * A JRE version other than <%--
---%>@for(var jre : ForSupport.of(jres))<%--
+--%>@for(var jre : ForSupport.of(allJres))<%--
 	--%>@if(jre.isLast())or @endif<%--
 	--%>{@link #JAVA_${jre.get().getVersion()}}<%--
 	--%>@if(jre.isLast()).@else,@endif<%--
@@ -85,7 +85,7 @@ public enum JRE {
 
 	static final int UNDEFINED_VERSION = -1;
 
-	static final int MINIMUM_VERSION = ${minRuntimeVersion};
+	static final int MINIMUM_VERSION = ${allJres.getFirst().getVersion()};
 
 	private static final int CURRENT_VERSION = Runtime.version().feature();
 
@@ -148,7 +148,7 @@ public enum JRE {
 	@API(status = STABLE, since = "5.12")
 	public static JRE currentJre() {
 		return switch (CURRENT_VERSION) {<%--
-				--%>@for(var jre : jres)
+				--%>@for(var jre : allJres)
 			case ${jre.getVersion()} -> JAVA_${jre.getVersion()};<%--
 				--%>@endfor
 			default -> OTHER;

jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java.jte

@@ -74,10 +74,10 @@ class DisabledOnJreConditionTests extends AbstractExecutionConditionTests {
 	 * @see DisabledOnJreIntegrationTests#version7()
 	 */
 	@Test
-	void version16() {
+	void version7() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("Version [16] in @DisabledOnJre must be greater than or equal to 17");
+				.withMessage("Version [7] in @DisabledOnJre must be greater than or equal to 8");
 	}
 
 	/**

jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java.jte

@@ -1,6 +1,7 @@
 @import java.util.List
 @import junitbuild.generator.model.JRE
 
+@param List<JRE> allJres
 @param List<JRE> supportedJres
 @param List<JRE> supportedJresSortedByStringValue
 @param String licenseHeader
@@ -11,11 +12,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 @for(var jre : supportedJresSortedByStringValue)<%--
---%>import static org.junit.jupiter.api.condition.JRE.JAVA_${jre.getVersion()};
-@endfor<%--
---%>import static org.junit.jupiter.api.condition.JRE.OTHER;
-import static org.junit.jupiter.api.condition.JRE.UNDEFINED;
-@for(var jre : supportedJresSortedByStringValue)<%--
 --%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava${jre.getVersion()};
 @endfor<%--
 --%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
@@ -44,29 +40,30 @@ class DisabledOnJreIntegrationTests {
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledOnJre(UNDEFINED)
+	@DisabledOnJre(JRE.UNDEFINED)
 	void jreUndefined() {
 	}
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledOnJre(value = JAVA_17, versions = { 21, 16 })
-	void version16() {
+	@DisabledOnJre(value = JRE.JAVA_17, versions = { 21, 7 })
+	void version7() {
 	}
 
+	@SuppressWarnings("removal")
 	@Test
 	@DisabledOnJre(disabledReason = "Disabled on every JRE", value = { //
-@for(var jre : supportedJres)<%--
---%>			JAVA_${jre.getVersion()}, //
+@for(var jre : allJres)<%--
+--%>			JRE.JAVA_${jre.getVersion()}, //
 @endfor<%--
---%>			OTHER //
+--%>			JRE.OTHER //
 	})
 	void disabledOnAllJavaVersions() {
 		fail("should be disabled");
 	}
 @for(var jre : supportedJres)
 	@Test
-	@DisabledOnJre(JAVA_${jre.getVersion()})
+	@DisabledOnJre(JRE.JAVA_${jre.getVersion()})
 	void jre${jre.getVersion()}() {
 		assertFalse(onJava${jre.getVersion()}());
 	}
@@ -79,7 +76,7 @@ class DisabledOnJreIntegrationTests {
 	}
 @endfor
 	@Test
-	@DisabledOnJre(OTHER)
+	@DisabledOnJre(JRE.OTHER)
 	void other() {
 		assertTrue(onKnownVersion());
 	}

jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java.jte

@@ -71,13 +71,13 @@ class EnabledOnJreConditionTests extends AbstractExecutionConditionTests {
 	}
 
 	/**
-	 * @see EnabledOnJreIntegrationTests#version16()
+	 * @see EnabledOnJreIntegrationTests#version7()
 	 */
 	@Test
-	void version16() {
+	void version7() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("Version [16] in @EnabledOnJre must be greater than or equal to 17");
+				.withMessage("Version [7] in @EnabledOnJre must be greater than or equal to 8");
 	}
 
 	/**

jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java.jte

@@ -1,6 +1,7 @@
 @import java.util.List
 @import junitbuild.generator.model.JRE
 
+@param List<JRE> allJres
 @param List<JRE> supportedJres
 @param List<JRE> supportedJresSortedByStringValue
 @param String licenseHeader
@@ -10,11 +11,6 @@ package org.junit.jupiter.api.condition;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 @for(var jre : supportedJresSortedByStringValue)<%--
---%>import static org.junit.jupiter.api.condition.JRE.JAVA_${jre.getVersion()};
-@endfor<%--
---%>import static org.junit.jupiter.api.condition.JRE.OTHER;
-import static org.junit.jupiter.api.condition.JRE.UNDEFINED;
-@for(var jre : supportedJresSortedByStringValue)<%--
 --%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onJava${jre.getVersion()};
 @endfor<%--
 --%>import static org.junit.jupiter.api.condition.JavaVersionPredicates.onKnownVersion;
@@ -43,28 +39,29 @@ class EnabledOnJreIntegrationTests {
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@EnabledOnJre(UNDEFINED)
+	@EnabledOnJre(JRE.UNDEFINED)
 	void jreUndefined() {
 	}
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@EnabledOnJre(value = JAVA_17, versions = { 21, 16 })
-	void version16() {
+	@EnabledOnJre(value = JRE.JAVA_17, versions = { 21, 7 })
+	void version7() {
 	}
 
+	@SuppressWarnings("removal")
 	@Test
 	@EnabledOnJre({ //
-@for(var jre : supportedJres)<%--
---%>			JAVA_${jre.getVersion()}, //
+@for(var jre : allJres)<%--
+--%>			JRE.JAVA_${jre.getVersion()}, //
 @endfor<%--
---%>			OTHER //
+--%>			JRE.OTHER //
 	})
 	void enabledOnAllJavaVersions() {
 	}
 @for(var jre : supportedJres)
 	@Test
-	@EnabledOnJre(JAVA_${jre.getVersion()})
+	@EnabledOnJre(JRE.JAVA_${jre.getVersion()})
 	void jre${jre.getVersion()}() {
 		assertTrue(onJava${jre.getVersion()}());
 	}
@@ -77,7 +74,7 @@ class EnabledOnJreIntegrationTests {
 	}
 @endfor
 	@Test
-	@EnabledOnJre(value = OTHER, disabledReason = "Disabled on almost every JRE")
+	@EnabledOnJre(value = JRE.OTHER, disabledReason = "Disabled on almost every JRE")
 	void other() {
 		assertFalse(onKnownVersion());
 	}

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

@@ -112,13 +112,13 @@ void maxVersionMaxInteger() {
 	}
 
 	/**
-	 * @see DisabledForJreRangeIntegrationTests#minVersion16()
+	 * @see DisabledForJreRangeIntegrationTests#minVersion7()
 	 */
 	@Test
-	void minVersion16() {
+	void minVersion7() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("@DisabledForJreRange's minVersion [16] must be greater than or equal to 17");
+				.withMessage("@DisabledForJreRange's minVersion [7] must be greater than or equal to 8");
 	}
 
 	/**
@@ -128,7 +128,8 @@ void minVersion16() {
 	void maxVersion16() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("@DisabledForJreRange's maxVersion [16] must be greater than or equal to 17");
+				.withMessage(
+					"@DisabledForJreRange's minimum value [17] must be less than or equal to its maximum value [16]");
 	}
 
 	/**

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

@@ -44,10 +44,9 @@ void defaultValues() {
 		fail("should result in a configuration exception");
 	}
 
-	@SuppressWarnings("removal")
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledForJreRange(min = JRE.JAVA_17, max = OTHER)
+	@DisabledForJreRange(min = JAVA_17, max = OTHER)
 	void effectiveJreDefaultValues() {
 		fail("should result in a configuration exception");
 	}
@@ -59,7 +58,6 @@ void effectiveVersionDefaultValues() {
 		fail("should result in a configuration exception");
 	}
 
-	@SuppressWarnings("removal")
 	@Test
 	@Disabled("Only used in a unit test via reflection")
 	@DisabledForJreRange(min = JAVA_17)
@@ -90,8 +88,8 @@ void maxVersionMaxInteger() {
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledForJreRange(minVersion = 16)
-	void minVersion16() {
+	@DisabledForJreRange(minVersion = 7)
+	void minVersion7() {
 		fail("should result in a configuration exception");
 	}
 

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

@@ -118,13 +118,13 @@ void maxVersionMaxInteger() {
 	}
 
 	/**
-	 * @see EnabledForJreRangeIntegrationTests#minVersion16()
+	 * @see EnabledForJreRangeIntegrationTests#minVersion7()
 	 */
 	@Test
-	void minVersion16() {
+	void minVersion7() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("@EnabledForJreRange's minVersion [16] must be greater than or equal to 17");
+				.withMessage("@EnabledForJreRange's minVersion [7] must be greater than or equal to 8");
 	}
 
 	/**
@@ -134,7 +134,8 @@ void minVersion16() {
 	void maxVersion16() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("@EnabledForJreRange's maxVersion [16] must be greater than or equal to 17");
+				.withMessage(
+					"@EnabledForJreRange's minimum value [17] must be less than or equal to its maximum value [16]");
 	}
 
 	/**

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

@@ -95,8 +95,8 @@ void maxVersionMaxInteger() {
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@EnabledForJreRange(minVersion = 16)
-	void minVersion16() {
+	@EnabledForJreRange(minVersion = 7)
+	void minVersion7() {
 		fail("should result in a configuration exception");
 	}