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 5e5af7a02bce3f216e1343b8274196afaf44d73a Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Sun Mar 28 08:45:13 2021 -0400 Sort members. --- .../org/apache/commons/lang3/SystemUtilsTest.java | 364 ++++++++++----------- 1 file changed, 182 insertions(+), 182 deletions(-) diff --git a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java index 85aa59b..4e18625 100644 --- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java @@ -349,175 +349,6 @@ public class SystemUtilsTest { } @Test - public void testJavaVersionMatches() { - String javaVersion = null; - 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")); - javaVersion = ""; - 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")); - javaVersion = "1.0"; - assertTrue(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")); - javaVersion = "1.1"; - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); - assertTrue(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")); - javaVersion = "1.2"; - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); - assertTrue(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")); - javaVersion = "1.3.0"; - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); - assertTrue(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")); - javaVersion = "1.3.1"; - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); - assertTrue(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")); - javaVersion = "1.4.0"; - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.3")); - assertTrue(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")); - javaVersion = "1.4.1"; - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.3")); - assertTrue(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")); - javaVersion = "1.4.2"; - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.3")); - assertTrue(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")); - javaVersion = "1.5.0"; - 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")); - assertTrue(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")); - javaVersion = "1.6.0"; - 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")); - assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "1.6")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.7")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.8")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "9")); - javaVersion = "1.7.0"; - 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")); - assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "1.7")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.8")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "9")); - javaVersion = "1.8.0"; - 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")); - assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "1.8")); - assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "9")); - javaVersion = "9"; - 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")); - assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "9")); - } - - @Test public void testIsJavaVersionAtLeast() { if (SystemUtils.IS_JAVA_1_8) { assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); @@ -696,6 +527,188 @@ public class SystemUtilsTest { } @Test + public void testJavaAwtHeadless() { + final String expectedStringValue = System.getProperty("java.awt.headless"); + final String expectedStringValueWithDefault = System.getProperty("java.awt.headless", "false"); + assertNotNull(expectedStringValueWithDefault); + final boolean expectedValue = Boolean.valueOf(expectedStringValue).booleanValue(); + if (expectedStringValue != null) { + assertEquals(expectedStringValue, SystemUtils.JAVA_AWT_HEADLESS); + } + assertEquals(expectedValue, SystemUtils.isJavaAwtHeadless()); + assertEquals(expectedStringValueWithDefault, "" + SystemUtils.isJavaAwtHeadless()); + } + + @Test + public void testJavaVersionMatches() { + String javaVersion = null; + 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")); + javaVersion = ""; + 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")); + javaVersion = "1.0"; + assertTrue(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")); + javaVersion = "1.1"; + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); + assertTrue(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")); + javaVersion = "1.2"; + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); + assertTrue(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")); + javaVersion = "1.3.0"; + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); + assertTrue(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")); + javaVersion = "1.3.1"; + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); + assertTrue(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")); + javaVersion = "1.4.0"; + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.3")); + assertTrue(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")); + javaVersion = "1.4.1"; + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.3")); + assertTrue(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")); + javaVersion = "1.4.2"; + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.0")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.1")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.2")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.3")); + assertTrue(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")); + javaVersion = "1.5.0"; + 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")); + assertTrue(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")); + javaVersion = "1.6.0"; + 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")); + assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "1.6")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.7")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.8")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "9")); + javaVersion = "1.7.0"; + 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")); + assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "1.7")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "1.8")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "9")); + javaVersion = "1.8.0"; + 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")); + assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "1.8")); + assertFalse(SystemUtils.isJavaVersionMatch(javaVersion, "9")); + javaVersion = "9"; + 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")); + assertTrue(SystemUtils.isJavaVersionMatch(javaVersion, "9")); + } + + @Test public void testOSMatchesName() { String osName = null; assertFalse(SystemUtils.isOSNameMatch(osName, "Windows")); @@ -772,17 +785,4 @@ public class SystemUtilsTest { assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.10")); assertTrue(SystemUtils.isOSVersionMatch(osVersion, "10.10.1")); } - - @Test - public void testJavaAwtHeadless() { - final String expectedStringValue = System.getProperty("java.awt.headless"); - final String expectedStringValueWithDefault = System.getProperty("java.awt.headless", "false"); - assertNotNull(expectedStringValueWithDefault); - final boolean expectedValue = Boolean.valueOf(expectedStringValue).booleanValue(); - if (expectedStringValue != null) { - assertEquals(expectedStringValue, SystemUtils.JAVA_AWT_HEADLESS); - } - assertEquals(expectedValue, SystemUtils.isJavaAwtHeadless()); - assertEquals(expectedStringValueWithDefault, "" + SystemUtils.isJavaAwtHeadless()); - } }