Forbid pre-17 JREs in execution condition annotations

marcphilipp · marcphilipp · commit 71c3d64ace27 · 2025-05-06T16:38:26.000+02:00
diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-M1.adoc
@@ -65,6 +65,10 @@ repository on GitHub.
 
 * The `JRE` enum constants for `JAVA_8` to `JAVA_16` have been deprecated because they can
   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
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractJreCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractJreCondition.java
@@ -48,12 +48,9 @@ protected final IntStream validatedVersions(JRE[] jres, int[] versions) {
 					() -> "JRE.UNDEFINED is not supported in @" + this.annotationName);
 				return jre.version();
 			}), //
-			Arrays.stream(versions).map(version -> {
-				Preconditions.condition(version >= JRE.MINIMUM_VERSION,
-					() -> String.format("Version [%d] in @%s must be greater than or equal to %d", version,
-						this.annotationName, JRE.MINIMUM_VERSION));
-				return version;
-			})//
+			Arrays.stream(versions).peek(version -> Preconditions.condition(version >= JRE.MINIMUM_VERSION,
+				() -> String.format("Version [%d] in @%s must be greater than or equal to %d", version,
+					this.annotationName, JRE.MINIMUM_VERSION)))//
 		).distinct();
 	}
 
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractJreRangeCondition.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/AbstractJreRangeCondition.java
@@ -58,7 +58,7 @@ 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 = minJre();
+			minJre = JRE.JAVA_17;
 		}
 		if (!maxJreSet) {
 			maxJre = JRE.OTHER;
@@ -71,18 +71,13 @@ protected final boolean isCurrentVersionWithinRange(JRE minJre, JRE maxJre, int
 		Preconditions.condition((min != JRE.MINIMUM_VERSION || max != Integer.MAX_VALUE),
 			() -> "You must declare a non-default value for the minimum or maximum value in @" + this.annotationName);
 		Preconditions.condition(min >= JRE.MINIMUM_VERSION,
-			() -> String.format("@%s's minimum value [%d] must greater than or equal to %d", this.annotationName, min,
-				JRE.MINIMUM_VERSION));
+			() -> String.format("@%s's minimum value [%d] must be greater than or equal to %d", this.annotationName,
+				min, JRE.MINIMUM_VERSION));
 		Preconditions.condition(min <= max,
 			() -> String.format("@%s's minimum value [%d] must be less than or equal to its maximum value [%d]",
 				this.annotationName, min, max));
 
 		return JRE.isCurrentVersionWithinRange(min, max);
 	}
 
-	@SuppressWarnings("removal")
-	private static JRE minJre() {
-		return JRE.JAVA_8;
-	}
-
 }
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/DisabledForJreRange.java
@@ -96,7 +96,7 @@
 	 * {@link #minVersion() minVersion} instead.
 	 *
 	 * <p>Defaults to {@link JRE#UNDEFINED UNDEFINED}, which will be interpreted
-	 * as {@link JRE#JAVA_8 JAVA_8} if the {@link #minVersion() minVersion} is
+	 * as {@link JRE#JAVA_17 JAVA_17} if the {@link #minVersion() minVersion} is
 	 * not set.
 	 *
 	 * @see JRE
diff --git a/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java b/junit-jupiter-api/src/main/java/org/junit/jupiter/api/condition/EnabledForJreRange.java
@@ -96,7 +96,7 @@
 	 * {@link #minVersion() minVersion} instead.
 	 *
 	 * <p>Defaults to {@link JRE#UNDEFINED UNDEFINED}, which will be interpreted
-	 * as {@link JRE#JAVA_8 JAVA_8} if the {@link #minVersion() minVersion} is
+	 * as {@link JRE#JAVA_17 JAVA_17} if the {@link #minVersion() minVersion} is
 	 * not set.
 	 *
 	 * @see JRE
diff --git a/junit-jupiter-api/src/templates/resources/main/org/junit/jupiter/api/condition/JRE.java.jte b/junit-jupiter-api/src/templates/resources/main/org/junit/jupiter/api/condition/JRE.java.jte
@@ -88,7 +88,7 @@ public enum JRE {
 
 	static final int UNDEFINED_VERSION = -1;
 
-	static final int MINIMUM_VERSION = ${jres.getFirst().getVersion()};
+	static final int MINIMUM_VERSION = ${minRuntimeVersion};
 
 	private static final int CURRENT_VERSION = Runtime.version().feature();
 
diff --git a/jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreConditionTests.java.jte b/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 version7() {
+	void version16() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("Version [7] in @DisabledOnJre must be greater than or equal to 8");
+				.withMessage("Version [16] in @DisabledOnJre must be greater than or equal to 17");
 	}
 
 	/**
diff --git a/jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java.jte b/jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/DisabledOnJreIntegrationTests.java.jte
@@ -50,8 +50,8 @@ class DisabledOnJreIntegrationTests {
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledOnJre(versions = 7)
-	void version7() {
+	@DisabledOnJre(versions = 16)
+	void version16() {
 	}
 
 	@Test
diff --git a/jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java.jte b/jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreConditionTests.java.jte
@@ -71,13 +71,13 @@ class EnabledOnJreConditionTests extends AbstractExecutionConditionTests {
 	}
 
 	/**
-	 * @see EnabledOnJreIntegrationTests#version7()
+	 * @see EnabledOnJreIntegrationTests#version16()
 	 */
 	@Test
-	void version7() {
+	void version16() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("Version [7] in @EnabledOnJre must be greater than or equal to 8");
+				.withMessage("Version [16] in @EnabledOnJre must be greater than or equal to 17");
 	}
 
 	/**
diff --git a/jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java.jte b/jupiter-tests/src/templates/resources/test/org/junit/jupiter/api/condition/EnabledOnJreIntegrationTests.java.jte
@@ -49,8 +49,8 @@ class EnabledOnJreIntegrationTests {
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@EnabledOnJre(versions = 7)
-	void version7() {
+	@EnabledOnJre(versions = 16)
+	void version16() {
 	}
 
 	@Test
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeConditionTests.java
@@ -80,18 +80,18 @@ void effectiveVersionDefaultValues() {
 	}
 
 	/**
-	 * @see DisabledForJreRangeIntegrationTests#min8()
+	 * @see DisabledForJreRangeIntegrationTests#min17()
 	 */
 	@Test
-	void min8() {
+	void min17() {
 		defaultValues();
 	}
 
 	/**
-	 * @see DisabledForJreRangeIntegrationTests#minVersion8()
+	 * @see DisabledForJreRangeIntegrationTests#minVersion17()
 	 */
 	@Test
-	void minVersion8() {
+	void minVersion17() {
 		defaultValues();
 	}
 
@@ -112,23 +112,23 @@ void maxVersionMaxInteger() {
 	}
 
 	/**
-	 * @see DisabledForJreRangeIntegrationTests#minVersion7()
+	 * @see DisabledForJreRangeIntegrationTests#minVersion16()
 	 */
 	@Test
-	void minVersion7() {
+	void minVersion16() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("@DisabledForJreRange's minVersion [7] must be greater than or equal to 8");
+				.withMessage("@DisabledForJreRange's minVersion [16] must be greater than or equal to 17");
 	}
 
 	/**
-	 * @see DisabledForJreRangeIntegrationTests#maxVersion7()
+	 * @see DisabledForJreRangeIntegrationTests#maxVersion16()
 	 */
 	@Test
-	void maxVersion7() {
+	void maxVersion16() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("@DisabledForJreRange's maxVersion [7] must be greater than or equal to 8");
+				.withMessage("@DisabledForJreRange's maxVersion [16] must be greater than or equal to 17");
 	}
 
 	/**
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/condition/DisabledForJreRangeIntegrationTests.java
@@ -47,30 +47,30 @@ void defaultValues() {
 	@SuppressWarnings("removal")
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledForJreRange(min = JRE.JAVA_8, max = OTHER)
+	@DisabledForJreRange(min = JRE.JAVA_17, max = OTHER)
 	void effectiveJreDefaultValues() {
 		fail("should result in a configuration exception");
 	}
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledForJreRange(minVersion = 8, maxVersion = Integer.MAX_VALUE)
+	@DisabledForJreRange(minVersion = 17, maxVersion = Integer.MAX_VALUE)
 	void effectiveVersionDefaultValues() {
 		fail("should result in a configuration exception");
 	}
 
 	@SuppressWarnings("removal")
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledForJreRange(min = JRE.JAVA_8)
-	void min8() {
+	@DisabledForJreRange(min = JAVA_17)
+	void min17() {
 		fail("should result in a configuration exception");
 	}
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledForJreRange(minVersion = 8)
-	void minVersion8() {
+	@DisabledForJreRange(minVersion = 17)
+	void minVersion17() {
 		fail("should result in a configuration exception");
 	}
 
@@ -90,15 +90,15 @@ void maxVersionMaxInteger() {
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledForJreRange(minVersion = 7)
-	void minVersion7() {
+	@DisabledForJreRange(minVersion = 16)
+	void minVersion16() {
 		fail("should result in a configuration exception");
 	}
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@DisabledForJreRange(maxVersion = 7)
-	void maxVersion7() {
+	@DisabledForJreRange(maxVersion = 16)
+	void maxVersion16() {
 		fail("should result in a configuration exception");
 	}
 
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeConditionTests.java
@@ -86,18 +86,18 @@ void effectiveVersionDefaultValues() {
 	}
 
 	/**
-	 * @see EnabledForJreRangeIntegrationTests#min8()
+	 * @see EnabledForJreRangeIntegrationTests#min17()
 	 */
 	@Test
-	void min8() {
+	void min17() {
 		defaultValues();
 	}
 
 	/**
-	 * @see EnabledForJreRangeIntegrationTests#minVersion8()
+	 * @see EnabledForJreRangeIntegrationTests#minVersion17()
 	 */
 	@Test
-	void minVersion8() {
+	void minVersion17() {
 		defaultValues();
 	}
 
@@ -118,23 +118,23 @@ void maxVersionMaxInteger() {
 	}
 
 	/**
-	 * @see EnabledForJreRangeIntegrationTests#minVersion7()
+	 * @see EnabledForJreRangeIntegrationTests#minVersion16()
 	 */
 	@Test
-	void minVersion7() {
+	void minVersion16() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("@EnabledForJreRange's minVersion [7] must be greater than or equal to 8");
+				.withMessage("@EnabledForJreRange's minVersion [16] must be greater than or equal to 17");
 	}
 
 	/**
-	 * @see EnabledForJreRangeIntegrationTests#maxVersion7()
+	 * @see EnabledForJreRangeIntegrationTests#maxVersion16()
 	 */
 	@Test
-	void maxVersion7() {
+	void maxVersion16() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("@EnabledForJreRange's maxVersion [7] must be greater than or equal to 8");
+				.withMessage("@EnabledForJreRange's maxVersion [16] must be greater than or equal to 17");
 	}
 
 	/**
@@ -303,10 +303,10 @@ void minVersion20MaxVersion21() {
 	}
 
 	/**
-	 * @see EnabledForJreRangeIntegrationTests#minVersion17MaxVersionMaxInteger()
+	 * @see EnabledForJreRangeIntegrationTests#minVersion21MaxVersionMaxInteger()
 	 */
 	@Test
-	void minVersion17MaxVersionMaxInteger() {
+	void minVersion21MaxVersionMaxInteger() {
 		evaluateCondition();
 		assertEnabledOnCurrentJreIf(onJava17() || onJava18() || onJava19() || onJava20() || onJava21() || onJava22()
 				|| onJava23() || onJava24() || onJava25());
diff --git a/jupiter-tests/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java b/jupiter-tests/src/test/java/org/junit/jupiter/api/condition/EnabledForJreRangeIntegrationTests.java
@@ -51,33 +51,31 @@ void defaultValues() {
 		fail("should result in a configuration exception");
 	}
 
-	@SuppressWarnings("removal")
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@EnabledForJreRange(min = JRE.JAVA_8, max = OTHER)
+	@EnabledForJreRange(min = JAVA_17, max = OTHER)
 	void effectiveJreDefaultValues() {
 		fail("should result in a configuration exception");
 	}
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@EnabledForJreRange(minVersion = 8, maxVersion = Integer.MAX_VALUE)
+	@EnabledForJreRange(minVersion = 17, maxVersion = Integer.MAX_VALUE)
 	void effectiveVersionDefaultValues() {
 		fail("should result in a configuration exception");
 	}
 
-	@SuppressWarnings("removal")
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@EnabledForJreRange(min = JRE.JAVA_8)
-	void min8() {
+	@EnabledForJreRange(min = JAVA_17)
+	void min17() {
 		fail("should result in a configuration exception");
 	}
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@EnabledForJreRange(minVersion = 8)
-	void minVersion8() {
+	@EnabledForJreRange(minVersion = 17)
+	void minVersion17() {
 		fail("should result in a configuration exception");
 	}
 
@@ -97,15 +95,15 @@ void maxVersionMaxInteger() {
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@EnabledForJreRange(minVersion = 7)
-	void minVersion7() {
+	@EnabledForJreRange(minVersion = 16)
+	void minVersion16() {
 		fail("should result in a configuration exception");
 	}
 
 	@Test
 	@Disabled("Only used in a unit test via reflection")
-	@EnabledForJreRange(maxVersion = 7)
-	void maxVersion7() {
+	@EnabledForJreRange(maxVersion = 16)
+	void maxVersion16() {
 		fail("should result in a configuration exception");
 	}
 
@@ -241,8 +239,8 @@ void minVersion20MaxVersion21() {
 	}
 
 	@Test
-	@EnabledForJreRange(minVersion = 17, maxVersion = Integer.MAX_VALUE)
-	void minVersion17MaxVersionMaxInteger() {
+	@EnabledForJreRange(minVersion = 21, maxVersion = Integer.MAX_VALUE)
+	void minVersion21MaxVersionMaxInteger() {
 		assertTrue(onKnownVersion());
 		assertTrue(JRE.currentVersionNumber() >= 17);
 	}

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@`
`96`	`96`	`* {@link #minVersion() minVersion} instead.`
`97`	`97`	`*`
`98`	`98`	`* <p>Defaults to {@link JRE#UNDEFINED UNDEFINED}, which will be interpreted`
`99`		`- * as {@link JRE#JAVA_8 JAVA_8} if the {@link #minVersion() minVersion} is`
	`99`	`+ * as {@link JRE#JAVA_17 JAVA_17} if the {@link #minVersion() minVersion} is`
`100`	`100`	`* not set.`
`101`	`101`	`*`
`102`	`102`	`* @see JRE`
Original file line number	Diff line number	Diff line change
`@@ -50,8 +50,8 @@ class DisabledOnJreIntegrationTests {`
`50`	`50`
`51`	`51`	`@Test`
`52`	`52`	`@Disabled("Only used in a unit test via reflection")`
`53`		`- @DisabledOnJre(versions = 7)`
`54`		`- void version7() {`
	`53`	`+ @DisabledOnJre(versions = 16)`
	`54`	`+ void version16() {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ class EnabledOnJreIntegrationTests {`
`49`	`49`
`50`	`50`	`@Test`
`51`	`51`	`@Disabled("Only used in a unit test via reflection")`
`52`		`- @EnabledOnJre(versions = 7)`
`53`		`- void version7() {`
	`52`	`+ @EnabledOnJre(versions = 16)`
	`53`	`+ void version16() {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Test`