SystemUtilsTest: remove code run only on java 1.5 and below
Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/8232c096 Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/8232c096 Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/8232c096 Branch: refs/heads/master Commit: 8232c096cef785a2ba88a7324b882a7badb0af44 Parents: 5f4249e Author: pascalschumacher <pascalschumac...@gmx.net> Authored: Sun Sep 25 20:25:53 2016 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Sun Sep 25 21:00:46 2016 +0200 ---------------------------------------------------------------------- .../apache/commons/lang3/SystemUtilsTest.java | 123 +------------------ 1 file changed, 5 insertions(+), 118 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/8232c096/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 1c90564..bb6d12b 100644 --- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java @@ -31,7 +31,6 @@ 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; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.io.File; @@ -114,61 +113,6 @@ public class SystemUtilsTest { assertFalse(SystemUtils.IS_JAVA_1_8); assertFalse(SystemUtils.IS_JAVA_1_9); assertFalse(SystemUtils.IS_JAVA_9); - } else if (javaVersion.startsWith("1.1")) { - assertTrue(SystemUtils.IS_JAVA_1_1); - assertFalse(SystemUtils.IS_JAVA_1_2); - assertFalse(SystemUtils.IS_JAVA_1_3); - assertFalse(SystemUtils.IS_JAVA_1_4); - assertFalse(SystemUtils.IS_JAVA_1_5); - assertFalse(SystemUtils.IS_JAVA_1_6); - assertFalse(SystemUtils.IS_JAVA_1_7); - assertFalse(SystemUtils.IS_JAVA_1_8); - assertFalse(SystemUtils.IS_JAVA_1_9); - assertFalse(SystemUtils.IS_JAVA_9); - } else if (javaVersion.startsWith("1.2")) { - assertFalse(SystemUtils.IS_JAVA_1_1); - assertTrue(SystemUtils.IS_JAVA_1_2); - assertFalse(SystemUtils.IS_JAVA_1_3); - assertFalse(SystemUtils.IS_JAVA_1_4); - assertFalse(SystemUtils.IS_JAVA_1_5); - assertFalse(SystemUtils.IS_JAVA_1_6); - assertFalse(SystemUtils.IS_JAVA_1_7); - assertFalse(SystemUtils.IS_JAVA_1_8); - assertFalse(SystemUtils.IS_JAVA_1_9); - assertFalse(SystemUtils.IS_JAVA_9); - } else if (javaVersion.startsWith("1.3")) { - assertFalse(SystemUtils.IS_JAVA_1_1); - assertFalse(SystemUtils.IS_JAVA_1_2); - assertTrue(SystemUtils.IS_JAVA_1_3); - assertFalse(SystemUtils.IS_JAVA_1_4); - assertFalse(SystemUtils.IS_JAVA_1_5); - assertFalse(SystemUtils.IS_JAVA_1_6); - assertFalse(SystemUtils.IS_JAVA_1_7); - assertFalse(SystemUtils.IS_JAVA_1_8); - assertFalse(SystemUtils.IS_JAVA_1_9); - assertFalse(SystemUtils.IS_JAVA_9); - } else if (javaVersion.startsWith("1.4")) { - assertFalse(SystemUtils.IS_JAVA_1_1); - assertFalse(SystemUtils.IS_JAVA_1_2); - assertFalse(SystemUtils.IS_JAVA_1_3); - assertTrue(SystemUtils.IS_JAVA_1_4); - assertFalse(SystemUtils.IS_JAVA_1_5); - assertFalse(SystemUtils.IS_JAVA_1_6); - assertFalse(SystemUtils.IS_JAVA_1_7); - assertFalse(SystemUtils.IS_JAVA_1_8); - assertFalse(SystemUtils.IS_JAVA_1_9); - assertFalse(SystemUtils.IS_JAVA_9); - } else if (javaVersion.startsWith("1.5")) { - assertFalse(SystemUtils.IS_JAVA_1_1); - assertFalse(SystemUtils.IS_JAVA_1_2); - assertFalse(SystemUtils.IS_JAVA_1_3); - assertFalse(SystemUtils.IS_JAVA_1_4); - assertTrue(SystemUtils.IS_JAVA_1_5); - assertFalse(SystemUtils.IS_JAVA_1_6); - assertFalse(SystemUtils.IS_JAVA_1_7); - assertFalse(SystemUtils.IS_JAVA_1_8); - assertFalse(SystemUtils.IS_JAVA_1_9); - assertFalse(SystemUtils.IS_JAVA_9); } else if (javaVersion.startsWith("1.6")) { assertFalse(SystemUtils.IS_JAVA_1_1); assertFalse(SystemUtils.IS_JAVA_1_2); @@ -441,57 +385,7 @@ 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) { + if (SystemUtils.IS_JAVA_1_6) { assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_3)); @@ -614,21 +508,14 @@ public class SystemUtilsTest { @Test public void testJavaAwtHeadless() { - final boolean atLeastJava14 = SystemUtils.isJavaVersionAtLeast(JAVA_1_4); final String expectedStringValue = System.getProperty("java.awt.headless"); final String expectedStringValueWithDefault = System.getProperty("java.awt.headless", "false"); assertNotNull(expectedStringValueWithDefault); - if (atLeastJava14) { - final boolean expectedValue = Boolean.valueOf(expectedStringValue).booleanValue(); - if (expectedStringValue != null) { - assertEquals(expectedStringValue, SystemUtils.JAVA_AWT_HEADLESS); - } - assertEquals(expectedValue, SystemUtils.isJavaAwtHeadless()); - } else { - assertNull(expectedStringValue); - assertNull(SystemUtils.JAVA_AWT_HEADLESS); - assertEquals(expectedStringValueWithDefault, "" + SystemUtils.isJavaAwtHeadless()); + final boolean expectedValue = Boolean.valueOf(expectedStringValue).booleanValue(); + if (expectedStringValue != null) { + assertEquals(expectedStringValue, SystemUtils.JAVA_AWT_HEADLESS); } + assertEquals(expectedValue, SystemUtils.isJavaAwtHeadless()); assertEquals(expectedStringValueWithDefault, "" + SystemUtils.isJavaAwtHeadless()); } }