Add additional validation for minimum runtime version

Author: marcphilipp

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

@@ -42,19 +42,23 @@ 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);
 
-		return IntStream.concat(//
+		var allVersions = 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).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;
-			})//
-		).distinct();
+			Arrays.stream(versions).peek(version -> Preconditions.condition(version >= JRE.MINIMUM_DECLARED_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);
 	}
 
 }

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

@@ -48,12 +48,12 @@ 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_VERSION),
+		Preconditions.condition(!minVersionSet || (minVersion >= JRE.MINIMUM_DECLARED_VERSION),
 			() -> String.format("@%s's minVersion [%d] must be greater than or equal to %d", this.annotationName,
-				minVersion, JRE.MINIMUM_VERSION));
-		Preconditions.condition(!maxVersionSet || (maxVersion >= JRE.MINIMUM_VERSION),
+				minVersion, JRE.MINIMUM_DECLARED_VERSION));
+		Preconditions.condition(!maxVersionSet || (maxVersion >= JRE.MINIMUM_DECLARED_VERSION),
 			() -> String.format("@%s's maxVersion [%d] must be greater than or equal to %d", this.annotationName,
-				maxVersion, JRE.MINIMUM_VERSION));
+				maxVersion, JRE.MINIMUM_DECLARED_VERSION));
 
 		// Now that we have checked the basic preconditions, we need to ensure that we are
 		// using valid JRE enum constants.
@@ -68,14 +68,17 @@ 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_VERSION || max != Integer.MAX_VALUE),
+		Preconditions.condition((min != JRE.MINIMUM_DECLARED_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));
+		Preconditions.condition(min >= JRE.MINIMUM_DECLARED_VERSION,
+			() -> String.format("@%s's minimum value [%d] must be greater than or equal to %d", this.annotationName,
+				min, JRE.MINIMUM_DECLARED_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);
 	}

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

@@ -88,7 +88,9 @@ public enum JRE {
 
 	static final int UNDEFINED_VERSION = -1;
 
-	static final int MINIMUM_VERSION = ${jres.getFirst().getVersion()};
+	static final int MINIMUM_DECLARED_VERSION = ${jres.getFirst().getVersion()};
+
+	static final int MINIMUM_RUNTIME_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

@@ -80,6 +80,16 @@ class DisabledOnJreConditionTests extends AbstractExecutionConditionTests {
 				.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");
+	}
+
 	/**
 	 * @see DisabledOnJreIntegrationTests#disabledOnAllJavaVersions()
 	 */

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

@@ -54,6 +54,12 @@ class DisabledOnJreIntegrationTests {
 	void version7() {
 	}
 
+	@Test
+	@Disabled("Only used in a unit test via reflection")
+	@DisabledOnJre(versions = 16)
+	void version16() {
+	}
+
 	@Test
 	@DisabledOnJre(disabledReason = "Disabled on every JRE", value = { //
 @for(var jre : supportedJres)<%--

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

@@ -80,6 +80,16 @@ class EnabledOnJreConditionTests extends AbstractExecutionConditionTests {
 				.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");
+	}
+
 	/**
 	 * @see EnabledOnJreIntegrationTests#enabledOnAllJavaVersions()
 	 */

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

@@ -53,6 +53,12 @@ class EnabledOnJreIntegrationTests {
 	void version7() {
 	}
 
+	@Test
+	@Disabled("Only used in a unit test via reflection")
+	@EnabledOnJre(versions = 16)
+	void version16() {
+	}
+
 	@Test
 	@EnabledOnJre({ //
 @for(var jre : supportedJres)<%--

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

@@ -95,6 +95,16 @@ void minVersion8() {
 		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()
 	 */

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

@@ -74,6 +74,13 @@ 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() {
+		fail("should result in a configuration exception");
+	}
+
 	@Test
 	@Disabled("Only used in a unit test via reflection")
 	@DisabledForJreRange(max = OTHER)

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

@@ -101,6 +101,16 @@ void minVersion8() {
 		defaultValues();
 	}
 
+	/**
+	 * @see EnabledForJreRangeIntegrationTests#minVersion8Max11()
+	 */
+	@Test
+	void minVersion8Max11() {
+		assertThatExceptionOfType(PreconditionViolationException.class)//
+				.isThrownBy(this::evaluateCondition)//
+				.withMessage("@EnabledForJreRange's maximum value [11] must be greater than or equal to 17");
+	}
+
 	/**
 	 * @see EnabledForJreRangeIntegrationTests#maxOther()
 	 */

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

@@ -81,6 +81,13 @@ void minVersion8() {
 		fail("should result in a configuration exception");
 	}
 
+	@Test
+	@Disabled("Only used in a unit test via reflection")
+	@EnabledForJreRange(minVersion = 8, maxVersion = 11)
+	void minVersion8Max11() {
+		fail("should result in a configuration exception");
+	}
+
 	@Test
 	@Disabled("Only used in a unit test via reflection")
 	@EnabledForJreRange(max = OTHER)