Repository: commons-lang Updated Branches: refs/heads/master 10d2363fc -> 5f4249e2e
Add test for SystemUtils.isJavaVersionAtLeast to make sure it works with Java 9 EA Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/5f4249e2 Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/5f4249e2 Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/5f4249e2 Branch: refs/heads/master Commit: 5f4249e2ec8cccb17b27a7ffd032c4fc237a6927 Parents: 10d2363 Author: Benedikt Ritter <brit...@apache.org> Authored: Sun Sep 25 20:25:57 2016 +0200 Committer: Benedikt Ritter <brit...@apache.org> Committed: Sun Sep 25 20:25:57 2016 +0200 ---------------------------------------------------------------------- .../apache/commons/lang3/SystemUtilsTest.java | 103 +++++++++++++++++++ 1 file changed, 103 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/5f4249e2/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java index 428beda..1c90564 100644 --- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java @@ -19,7 +19,15 @@ package org.apache.commons.lang3; +import static org.apache.commons.lang3.JavaVersion.JAVA_1_1; +import static org.apache.commons.lang3.JavaVersion.JAVA_1_2; +import static org.apache.commons.lang3.JavaVersion.JAVA_1_3; import static org.apache.commons.lang3.JavaVersion.JAVA_1_4; +import static org.apache.commons.lang3.JavaVersion.JAVA_1_5; +import static org.apache.commons.lang3.JavaVersion.JAVA_1_6; +import static org.apache.commons.lang3.JavaVersion.JAVA_1_7; +import static org.apache.commons.lang3.JavaVersion.JAVA_1_8; +import static org.apache.commons.lang3.JavaVersion.JAVA_9; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -432,6 +440,101 @@ public class SystemUtilsTest { } @Test + public void testIsJavaVersionAtLeat() throws Exception { + if (SystemUtils.IS_JAVA_1_1) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_3)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_4)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_5)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_6)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_7)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_8)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_9)); + } else if (SystemUtils.IS_JAVA_1_2) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_3)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_4)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_5)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_6)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_7)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_8)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_9)); + } else if (SystemUtils.IS_JAVA_1_3) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_3)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_4)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_5)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_6)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_7)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_8)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_9)); + } else if (SystemUtils.IS_JAVA_1_4) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_4)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_5)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_6)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_7)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_8)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_9)); + } else if (SystemUtils.IS_JAVA_1_5) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_5)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_6)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_7)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_8)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_9)); + } else if (SystemUtils.IS_JAVA_1_6) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_6)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_7)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_8)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_9)); + } else if (SystemUtils.IS_JAVA_1_7) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_7)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_1_8)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_9)); + } else if (SystemUtils.IS_JAVA_1_8) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_8)); + assertFalse(SystemUtils.isJavaVersionAtLeast(JAVA_9)); + } else if (SystemUtils.IS_JAVA_9) { + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_3)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_4)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_5)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_6)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_7)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_8)); + assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_9)); + } + } + + @Test public void testOSMatchesName() { String osName = null; assertFalse(SystemUtils.isOSNameMatch(osName, "Windows"));
