ExtendedMessageFormatTest: remove code for java versions below 1.4
This commit is contained in:
parent
cc2d70e2ed
commit
c636539836
|
@ -19,7 +19,6 @@
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import static org.junit.Assert.*;
|
import static org.junit.Assert.*;
|
||||||
import static org.apache.commons.lang3.JavaVersion.JAVA_1_4;
|
|
||||||
|
|
||||||
import java.text.DateFormat;
|
import java.text.DateFormat;
|
||||||
import java.text.FieldPosition;
|
import java.text.FieldPosition;
|
||||||
|
@ -35,8 +34,6 @@
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.apache.commons.lang3.SystemUtils;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test case for {@link ExtendedMessageFormat}.
|
* Test case for {@link ExtendedMessageFormat}.
|
||||||
*
|
*
|
||||||
|
@ -59,7 +56,7 @@ public void setUp() throws Exception {
|
||||||
public void testExtendedFormats() {
|
public void testExtendedFormats() {
|
||||||
final String pattern = "Lower: {0,lower} Upper: {1,upper}";
|
final String pattern = "Lower: {0,lower} Upper: {1,upper}";
|
||||||
final ExtendedMessageFormat emf = new ExtendedMessageFormat(pattern, registry);
|
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"}));
|
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 +139,7 @@ public void testExtendedAndBuiltInFormats() {
|
||||||
expected.append(df.format(args[1]));
|
expected.append(df.format(args[1]));
|
||||||
expected.append(" Salary: ");
|
expected.append(" Salary: ");
|
||||||
expected.append(nf.format(args[2]));
|
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));
|
assertEquals(String.valueOf(locale), expected.toString(), emf.format(args));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -377,14 +374,7 @@ private void checkBuiltInFormat(final String pattern, final Map<String, ?> regis
|
||||||
emf = new ExtendedMessageFormat(pattern, locale);
|
emf = new ExtendedMessageFormat(pattern, locale);
|
||||||
}
|
}
|
||||||
assertEquals("format " + buffer.toString(), mf.format(args), emf.format(args));
|
assertEquals("format " + buffer.toString(), mf.format(args), emf.format(args));
|
||||||
assertPatternsEqual("toPattern " + buffer.toString(), mf.toPattern(), emf.toPattern());
|
assertEquals("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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue