Repository: commons-lang Updated Branches: refs/heads/master 6cfce2a09 -> 10d2363fc
CharEncodingTest: remove tests for java versions below 1.3.1 Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/10d2363f Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/10d2363f Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/10d2363f Branch: refs/heads/master Commit: 10d2363fcdd6e15568f765ba0dfd5f0cfa0b04eb Parents: 6cfce2a Author: pascalschumacher <pascalschumac...@gmx.net> Authored: Sun Sep 25 20:21:01 2016 +0200 Committer: pascalschumacher <pascalschumac...@gmx.net> Committed: Sun Sep 25 20:21:01 2016 +0200 ---------------------------------------------------------------------- .../apache/commons/lang3/CharEncodingTest.java | 55 +++----------------- 1 file changed, 7 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/10d2363f/src/test/java/org/apache/commons/lang3/CharEncodingTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/lang3/CharEncodingTest.java b/src/test/java/org/apache/commons/lang3/CharEncodingTest.java index 35557f3..4324c6f 100644 --- a/src/test/java/org/apache/commons/lang3/CharEncodingTest.java +++ b/src/test/java/org/apache/commons/lang3/CharEncodingTest.java @@ -17,9 +17,6 @@ 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.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -45,17 +42,13 @@ public class CharEncodingTest { } @Test - public void testMustBeSupportedJava1_3_1() { - if (SystemUtils.isJavaVersionAtLeast(JAVA_1_3)) { - this.assertSupportedEncoding(CharEncoding.ISO_8859_1); - this.assertSupportedEncoding(CharEncoding.US_ASCII); - this.assertSupportedEncoding(CharEncoding.UTF_16); - this.assertSupportedEncoding(CharEncoding.UTF_16BE); - this.assertSupportedEncoding(CharEncoding.UTF_16LE); - this.assertSupportedEncoding(CharEncoding.UTF_8); - } else { - this.warn("Java 1.3 tests not run since the current version is " + SystemUtils.JAVA_SPECIFICATION_VERSION); - } + public void testMustBeSupportedJava1_3_1_and_above() { + this.assertSupportedEncoding(CharEncoding.ISO_8859_1); + this.assertSupportedEncoding(CharEncoding.US_ASCII); + this.assertSupportedEncoding(CharEncoding.UTF_16); + this.assertSupportedEncoding(CharEncoding.UTF_16BE); + this.assertSupportedEncoding(CharEncoding.UTF_16LE); + this.assertSupportedEncoding(CharEncoding.UTF_8); } @Test @@ -74,38 +67,4 @@ public class CharEncodingTest { assertFalse(CharEncoding.isSupported("DOESNOTEXIST")); assertFalse(CharEncoding.isSupported("this is not a valid encoding name")); } - - @Test - public void testWorksOnJava1_1_8() { - // - // In this test, I simply deleted the encodings from the 1.3.1 list. - // The Javadoc do not specify which encodings are required. - // - if (SystemUtils.isJavaVersionAtLeast(JAVA_1_1)) { - this.assertSupportedEncoding(CharEncoding.ISO_8859_1); - this.assertSupportedEncoding(CharEncoding.US_ASCII); - this.assertSupportedEncoding(CharEncoding.UTF_8); - } else { - this.warn("Java 1.1 tests not run since the current version is " + SystemUtils.JAVA_SPECIFICATION_VERSION); - } - } - - @Test - public void testWorksOnJava1_2_2() { - // - // In this test, I simply deleted the encodings from the 1.3.1 list. - // The Javadoc do not specify which encodings are required. - // - if (SystemUtils.isJavaVersionAtLeast(JAVA_1_2)) { - this.assertSupportedEncoding(CharEncoding.ISO_8859_1); - this.assertSupportedEncoding(CharEncoding.US_ASCII); - this.assertSupportedEncoding(CharEncoding.UTF_8); - } else { - this.warn("Java 1.2 tests not run since the current version is " + SystemUtils.JAVA_SPECIFICATION_VERSION); - } - } - - void warn(final String msg) { - System.err.println(msg); - } }
