Repository: commons-text Updated Branches: refs/heads/master 98d62f36f -> 8d3711162
ExtendedMessageFormatTest: remove code for java versions below 1.4 Project: http://git-wip-us.apache.org/repos/asf/commons-text/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-text/commit/144ee0ec Tree: http://git-wip-us.apache.org/repos/asf/commons-text/tree/144ee0ec Diff: http://git-wip-us.apache.org/repos/asf/commons-text/diff/144ee0ec Branch: refs/heads/master Commit: 144ee0ecfcfa32e4a2618997f05eeb96b85d9cda Parents: 98d62f3 Author: Pascal Schumacher <pascalschumac...@gmx.net> Authored: Sun Dec 18 17:51:16 2016 +0100 Committer: Pascal Schumacher <pascalschumac...@gmx.net> Committed: Sun Dec 18 17:51:16 2016 +0100 ---------------------------------------------------------------------- .../commons/text/ExtendedMessageFormatTest.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-text/blob/144ee0ec/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java b/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java index 36c6faa..fe9281a 100644 --- a/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java +++ b/src/test/java/org/apache/commons/text/ExtendedMessageFormatTest.java @@ -19,7 +19,6 @@ package org.apache.commons.text; import org.junit.Test; import org.junit.Before; import static org.junit.Assert.*; -import static org.apache.commons.lang3.JavaVersion.JAVA_1_4; import java.text.DateFormat; import java.text.FieldPosition; @@ -35,12 +34,8 @@ import java.util.HashSet; import java.util.Locale; import java.util.Map; -import org.apache.commons.lang3.SystemUtils; - /** * Test case for {@link ExtendedMessageFormat}. - * - * @since 2.4 */ public class ExtendedMessageFormatTest { @@ -59,7 +54,7 @@ public class ExtendedMessageFormatTest { public void testExtendedFormats() { final String pattern = "Lower: {0,lower} Upper: {1,upper}"; final ExtendedMessageFormat emf = new ExtendedMessageFormat(pattern, registry); - assertPatternsEqual("TOPATTERN", pattern, emf.toPattern()); + assertEquals("TOPATTERN", pattern, emf.toPattern()); assertEquals("Lower: foo Upper: BAR", emf.format(new Object[] {"foo", "bar"})); assertEquals("Lower: foo Upper: BAR", emf.format(new Object[] {"Foo", "Bar"})); assertEquals("Lower: foo Upper: BAR", emf.format(new Object[] {"FOO", "BAR"})); @@ -142,7 +137,7 @@ public class ExtendedMessageFormatTest { expected.append(df.format(args[1])); expected.append(" Salary: "); expected.append(nf.format(args[2])); - assertPatternsEqual("pattern comparison for locale " + locale, expectedPattern, emf.toPattern()); + assertEquals("pattern comparison for locale " + locale, expectedPattern, emf.toPattern()); assertEquals(String.valueOf(locale), expected.toString(), emf.format(args)); } } @@ -377,14 +372,7 @@ public class ExtendedMessageFormatTest { emf = new ExtendedMessageFormat(pattern, locale); } assertEquals("format " + buffer.toString(), mf.format(args), emf.format(args)); - assertPatternsEqual("toPattern " + buffer.toString(), mf.toPattern(), emf.toPattern()); - } - - //can't trust what MessageFormat does with toPattern() pre 1.4: - private void assertPatternsEqual(final String message, final String expected, final String actual) { - if (SystemUtils.isJavaVersionAtLeast(JAVA_1_4)) { - assertEquals(message, expected, actual); - } + assertEquals("toPattern " + buffer.toString(), mf.toPattern(), emf.toPattern()); } /**
