Repository: commons-lang Updated Branches: refs/heads/master c37a911d3 -> 2dd459003
LANG-1279: Update Java requirement from Java 6 to 7 SystemUtilsTest: remove code run only on java 6 Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/2dd45900 Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/2dd45900 Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/2dd45900 Branch: refs/heads/master Commit: 2dd459003e19e4bbc2811b10d38337f295fc5a19 Parents: c37a911 Author: pascalschumacher <pascalschumac...@gmx.net> Authored: Fri Oct 28 22:14:46 2016 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Fri Oct 28 22:14:46 2016 +0200 ---------------------------------------------------------------------- .../apache/commons/lang3/SystemUtilsTest.java | 23 +------------------- 1 file changed, 1 insertion(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/2dd45900/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 bb6d12b..b1d868e 100644 --- a/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/SystemUtilsTest.java @@ -113,17 +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.6")) { - assertFalse(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); - assertTrue(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.7")) { assertFalse(SystemUtils.IS_JAVA_1_1); assertFalse(SystemUtils.IS_JAVA_1_2); @@ -385,17 +374,7 @@ public class SystemUtilsTest { @Test public void testIsJavaVersionAtLeat() throws Exception { - 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) { + if (SystemUtils.IS_JAVA_1_7) { assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_1)); assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_2)); assertTrue(SystemUtils.isJavaVersionAtLeast(JAVA_1_3));
