This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See https://gitlab.nuiton.org/nuiton/i18n.git commit f233b23f63d9c71b0b71c5770cf17366f6e72371 Author: Arnaud Thimel <thimel@codelutin.com> Date: Thu May 16 18:15:35 2019 +0200 Make I18nTest compatible with Java9+ at runtime --- nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java b/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java index 6751bff..7afafe6 100644 --- a/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java +++ b/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nTest.java @@ -31,9 +31,12 @@ import org.junit.Test; import org.nuiton.i18n.format.MessageFormatI18nMessageFormatter; import org.nuiton.i18n.init.DefaultI18nInitializer; +import java.util.Arrays; import java.util.Date; import java.util.GregorianCalendar; +import java.util.HashSet; import java.util.Locale; +import java.util.Set; /** * Test the class {@link I18n}. @@ -210,11 +213,15 @@ public class I18nTest { Date date = new GregorianCalendar(2011, 4, 5).getTime(); - String expected = "Key with 05-May-2011"; + // From Java9, the default locale provider is CLDR : https://openjdk.java.net/jeps/252 + // This the expected output depends on the JRE you are using + String expectedBeforeJava9 = "Key with 05-May-2011"; + String expectedAfterJava8 = "Key with 5 May 2011"; + Set<String> expectedSet = new HashSet<>(Arrays.asList(expectedBeforeJava9, expectedAfterJava8)); String actual = I18n.l(Locale.UK, "key.with.date", date); - Assert.assertEquals(expected, actual); + Assert.assertTrue(actual + " is not one of " + expectedSet, expectedSet.contains(actual)); - expected = "とキー 2011/05/05"; + String expected = "とキー 2011/05/05"; actual = I18n.l(Locale.JAPAN, "key.with.date", date); Assert.assertEquals(expected, actual); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.