This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit c64c414cc20caf9f112deff9a53bcec7d96611ee Author: Gary D. Gregory <garydgreg...@gmail.com> AuthorDate: Sun Jun 15 08:59:23 2025 -0400 Add missing assertions --- .../org/apache/commons/lang3/SystemUtilsTest.java | 368 ++++++++++++++++++++- 1 file changed, 367 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java index 194740df8..7cfe3e324 100644 --- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java @@ -513,7 +513,281 @@ void testIsJavaVersionAtLeast() { assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + } else if (SystemUtils.IS_JAVA_14) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); + } else if (SystemUtils.IS_JAVA_15) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); + } else if (SystemUtils.IS_JAVA_16) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); + } else if (SystemUtils.IS_JAVA_17) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); + } else if (SystemUtils.IS_JAVA_18) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); + } else if (SystemUtils.IS_JAVA_19) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); + } else if (SystemUtils.IS_JAVA_20) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); + } else if (SystemUtils.IS_JAVA_21) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); + } else if (SystemUtils.IS_JAVA_22) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); + } else if (SystemUtils.IS_JAVA_23) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); + } else if (SystemUtils.IS_JAVA_24) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_10)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_11)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_12)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_13)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_14)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_15)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_16)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_17)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_18)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_19)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_20)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_21)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_22)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_23)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_24)); } } @@ -986,6 +1260,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = ""; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1010,6 +1286,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.0"; assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1034,6 +1312,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.1"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1058,6 +1338,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.2"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1082,6 +1364,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.3.0"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1106,6 +1390,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.3.1"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1130,6 +1416,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.4.0"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1154,6 +1442,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.4.1"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1178,6 +1468,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.4.2"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1202,6 +1494,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.5.0"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1226,6 +1520,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.6.0"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1250,6 +1546,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.7.0"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1274,6 +1572,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "1.8.0"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1298,6 +1598,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "9"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1322,6 +1624,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "10"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1346,6 +1650,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "11"; // LTS assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1370,6 +1676,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "17"; // LTS assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1394,6 +1702,8 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); javaVersion = "21"; // LTS assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); @@ -1418,7 +1728,9 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); - javaVersion = "22"; // Current + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); + javaVersion = "22"; assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); @@ -1442,6 +1754,60 @@ void testJavaVersionMatches() { assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); + javaVersion = "23"; + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.3")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.4")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.5")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.6")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.7")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.8")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "9")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "10")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "11")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "12")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "13")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "14")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "15")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "16")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "17")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "18")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "19")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "24")); + javaVersion = "24"; + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.3")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.4")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.5")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.6")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.7")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.8")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "9")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "10")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "11")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "12")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "13")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "14")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "15")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "16")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "17")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "18")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "19")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "20")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "21")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "22")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "23")); + assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "24")); } @Test