Forbid pre-17 JREs in execution condition annotations

Author: marcphilipp

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

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

@@ -42,23 +42,16 @@ protected final IntStream validatedVersions(JRE[] jres, int[] versions) {
 		Preconditions.condition(jres.length > 0 || versions.length > 0,
 			() -> "You must declare at least one JRE or version in @" + this.annotationName);
 
-		var allVersions = IntStream.concat(//
+		return IntStream.concat(//
 			Arrays.stream(jres).mapToInt(jre -> {
 				Preconditions.condition(jre != JRE.UNDEFINED,
 					() -> "JRE.UNDEFINED is not supported in @" + this.annotationName);
 				return jre.version();
 			}), //
-			Arrays.stream(versions).peek(version -> Preconditions.condition(version >= JRE.MINIMUM_DECLARED_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_DECLARED_VERSION)))//
-		).sorted().distinct().toArray();
-
-		var max = allVersions[allVersions.length - 1];
-		Preconditions.condition(max >= JRE.MINIMUM_RUNTIME_VERSION,
-			() -> String.format("Versions in @%s must contain at least one value greater than or equal to %d",
-				this.annotationName, JRE.MINIMUM_RUNTIME_VERSION));
-
-		return IntStream.of(allVersions);
+					this.annotationName, JRE.MINIMUM_VERSION)))//
+		).distinct();
 	}
 
 }

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

@@ -48,17 +48,17 @@ protected final boolean isCurrentVersionWithinRange(JRE minJre, JRE maxJre, int
 			this.annotationName));
 
 		// Users must supply valid values for minVersion and maxVersion.
-		Preconditions.condition(!minVersionSet || (minVersion >= JRE.MINIMUM_DECLARED_VERSION),
+		Preconditions.condition(!minVersionSet || (minVersion >= JRE.MINIMUM_VERSION),
 			() -> String.format("@%s's minVersion [%d] must be greater than or equal to %d", this.annotationName,
-				minVersion, JRE.MINIMUM_DECLARED_VERSION));
-		Preconditions.condition(!maxVersionSet || (maxVersion >= JRE.MINIMUM_DECLARED_VERSION),
+				minVersion, JRE.MINIMUM_VERSION));
+		Preconditions.condition(!maxVersionSet || (maxVersion >= JRE.MINIMUM_VERSION),
 			() -> String.format("@%s's maxVersion [%d] must be greater than or equal to %d", this.annotationName,
-				maxVersion, JRE.MINIMUM_DECLARED_VERSION));
+				maxVersion, JRE.MINIMUM_VERSION));
 
 		// 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;
@@ -68,24 +68,16 @@ protected final boolean isCurrentVersionWithinRange(JRE minJre, JRE maxJre, int
 		int max = (maxVersionSet ? maxVersion : maxJre.version());
 
 		// Finally, we need to validate the effective minimum and maximum values.
-		Preconditions.condition((min != JRE.MINIMUM_DECLARED_VERSION || max != Integer.MAX_VALUE),
+		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_DECLARED_VERSION,
+		Preconditions.condition(min >= JRE.MINIMUM_VERSION,
 			() -> String.format("@%s's minimum value [%d] must be greater than or equal to %d", this.annotationName,
-				min, JRE.MINIMUM_DECLARED_VERSION));
+				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));
-		Preconditions.condition(max >= JRE.MINIMUM_RUNTIME_VERSION,
-			() -> String.format("@%s's maximum value [%d] must be greater than or equal to %d", this.annotationName,
-				max, JRE.MINIMUM_RUNTIME_VERSION));
 
 		return JRE.isCurrentVersionWithinRange(min, max);
 	}
 
-	@SuppressWarnings("removal")
-	private static JRE minJre() {
-		return JRE.JAVA_8;
-	}
-
 }

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

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

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

@@ -88,9 +88,7 @@ public enum JRE {
 
 	static final int UNDEFINED_VERSION = -1;
 
-	static final int MINIMUM_DECLARED_VERSION = ${jres.getFirst().getVersion()};
-
-	static final int MINIMUM_RUNTIME_VERSION = ${minRuntimeVersion};
+	static final int MINIMUM_VERSION = ${minRuntimeVersion};
 
 	private static final int CURRENT_VERSION = Runtime.version().feature();
 

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

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

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

@@ -48,12 +48,6 @@ class DisabledOnJreIntegrationTests {
 	void jreUndefined() {
 	}
 
-	@Test
-	@Disabled("Only used in a unit test via reflection")
-	@DisabledOnJre(versions = 7)
-	void version7() {
-	}
-
 	@Test
 	@Disabled("Only used in a unit test via reflection")
 	@DisabledOnJre(versions = 16)

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

@@ -70,24 +70,14 @@ class EnabledOnJreConditionTests extends AbstractExecutionConditionTests {
 				.withMessage("JRE.UNDEFINED is not supported in @EnabledOnJre");
 	}
 
-	/**
-	 * @see EnabledOnJreIntegrationTests#version7()
-	 */
-	@Test
-	void version7() {
-		assertThatExceptionOfType(PreconditionViolationException.class)//
-				.isThrownBy(this::evaluateCondition)//
-				.withMessage("Version [7] in @EnabledOnJre must be greater than or equal to 8");
-	}
-
 	/**
 	 * @see EnabledOnJreIntegrationTests#version16()
 	 */
 	@Test
 	void version16() {
 		assertThatExceptionOfType(PreconditionViolationException.class)//
 				.isThrownBy(this::evaluateCondition)//
-				.withMessage("Versions in @EnabledOnJre must contain at least one value greater than or equal to 17");
+				.withMessage("Version [16] in @EnabledOnJre must be greater than or equal to 17");
 	}
 
 	/**

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

@@ -47,12 +47,6 @@ class EnabledOnJreIntegrationTests {
 	void jreUndefined() {
 	}
 
-	@Test
-	@Disabled("Only used in a unit test via reflection")
-	@EnabledOnJre(versions = 7)
-	void version7() {
-	}
-
 	@Test
 	@Disabled("Only used in a unit test via reflection")
 	@EnabledOnJre(versions = 16)

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

@@ -80,31 +80,21 @@ 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();
 	}
 
-	/**
-	 * @see DisabledForJreRangeIntegrationTests#minVersion8Max11()
-	 */
-	@Test
-	void minVersion8Max11() {
-		assertThatExceptionOfType(PreconditionViolationException.class)//
-				.isThrownBy(this::evaluateCondition)//
-				.withMessage("@DisabledForJreRange's maximum value [11] must be greater than or equal to 17");
-	}
-
 	/**
 	 * @see DisabledForJreRangeIntegrationTests#maxOther()
 	 */
@@ -122,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");
 	}
 
 	/**

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

@@ -47,37 +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() {
-		fail("should result in a configuration exception");
-	}
-
-	@Test
-	@Disabled("Only used in a unit test via reflection")
-	@DisabledForJreRange(minVersion = 8, maxVersion = 11)
-	void minVersion8Max11() {
+	@DisabledForJreRange(minVersion = 17)
+	void minVersion17() {
 		fail("should result in a configuration exception");
 	}
 
@@ -97,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");
 	}