diff --git a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java index 4adadb4cd65..a1ab5a01052 100644 --- a/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/LocaleUtilsTest.java @@ -42,6 +42,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.junitpioneer.jupiter.DefaultLocale; +import org.junitpioneer.jupiter.ReadsDefaultLocale; /** * Tests for {@link LocaleUtils}. @@ -194,6 +195,7 @@ private static void assertValidToLocale( } @BeforeEach + @ReadsDefaultLocale public void setUp() { // Testing #LANG-304. Must be called before availableLocaleSet is called. LocaleUtils.isAvailableLocale(Locale.getDefault()); @@ -540,6 +542,7 @@ void testToLocale_3Part() { * Test toLocale(Locale) method. */ @Test + @ReadsDefaultLocale void testToLocale_Locale_defaults() { assertNull(LocaleUtils.toLocale((String) null)); assertEquals(Locale.getDefault(), LocaleUtils.toLocale((Locale) null)); diff --git a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java index 61579a9219f..54eab7a8fc0 100644 --- a/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java +++ b/src/test/java/org/apache/commons/lang3/StringUtilsContainsTest.java @@ -238,11 +238,8 @@ void testContainsAnyIgnoreCase_StringStringArray() { @WritesDefaultLocale void testContainsIgnoreCase_LocaleIndependence() { final Locale[] locales = { Locale.ENGLISH, new Locale("tr"), Locale.getDefault() }; - final String[][] tdata = { { "i", "I" }, { "I", "i" }, { "\u03C2", "\u03C3" }, { "\u03A3", "\u03C2" }, { "\u03A3", "\u03C3" }, }; - final String[][] fdata = { { "\u00DF", "SS" }, }; - for (final Locale testLocale : locales) { Locale.setDefault(testLocale); for (int j = 0; j < tdata.length; j++) { diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java index 15895c36367..4023b8e301c 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDateFormatTest.java @@ -46,6 +46,8 @@ import org.junit.jupiter.api.Test; import org.junitpioneer.jupiter.DefaultLocale; import org.junitpioneer.jupiter.DefaultTimeZone; +import org.junitpioneer.jupiter.ReadsDefaultLocale; +import org.junitpioneer.jupiter.ReadsDefaultTimeZone; /** * Tests {@link FastDateFormat}. @@ -218,14 +220,14 @@ void test_getInstance_String_TimeZone_Locale() { } @Test + @ReadsDefaultLocale + @ReadsDefaultTimeZone void testCheckDefaults() { final FastDateFormat format = FastDateFormat.getInstance(); final FastDateFormat medium = FastDateFormat.getDateTimeInstance(FastDateFormat.SHORT, FastDateFormat.SHORT); assertEquals(medium, format); - final SimpleDateFormat sdf = new SimpleDateFormat(); assertEquals(sdf.toPattern(), format.getPattern()); - assertEquals(Locale.getDefault(), format.getLocale()); assertEquals(TimeZone.getDefault(), format.getTimeZone()); } @@ -246,13 +248,13 @@ void testCheckDifferingStyles() { } @Test + @ReadsDefaultLocale + @ReadsDefaultTimeZone void testDateDefaults() { assertEquals(FastDateFormat.getDateInstance(FastDateFormat.LONG, Locale.CANADA), FastDateFormat.getDateInstance(FastDateFormat.LONG, TimeZone.getDefault(), Locale.CANADA)); - assertEquals(FastDateFormat.getDateInstance(FastDateFormat.LONG, TimeZones.getTimeZone("America/New_York")), FastDateFormat.getDateInstance(FastDateFormat.LONG, TimeZones.getTimeZone("America/New_York"), Locale.getDefault())); - assertEquals(FastDateFormat.getDateInstance(FastDateFormat.LONG), FastDateFormat.getDateInstance(FastDateFormat.LONG, TimeZone.getDefault(), Locale.getDefault())); } @@ -424,25 +426,25 @@ void testStandaloneShortMonthForm() { } @Test + @ReadsDefaultLocale + @ReadsDefaultTimeZone void testTimeDateDefaults() { assertEquals(FastDateFormat.getDateTimeInstance(FastDateFormat.LONG, FastDateFormat.MEDIUM, Locale.CANADA), FastDateFormat.getDateTimeInstance(FastDateFormat.LONG, FastDateFormat.MEDIUM, TimeZone.getDefault(), Locale.CANADA)); - assertEquals(FastDateFormat.getDateTimeInstance(FastDateFormat.LONG, FastDateFormat.MEDIUM, TimeZones.getTimeZone("America/New_York")), FastDateFormat.getDateTimeInstance(FastDateFormat.LONG, FastDateFormat.MEDIUM, TimeZones.getTimeZone("America/New_York"), Locale.getDefault())); - assertEquals(FastDateFormat.getDateTimeInstance(FastDateFormat.LONG, FastDateFormat.MEDIUM), FastDateFormat.getDateTimeInstance(FastDateFormat.LONG, FastDateFormat.MEDIUM, TimeZone.getDefault(), Locale.getDefault())); } @Test + @ReadsDefaultLocale + @ReadsDefaultTimeZone void testTimeDefaults() { assertEquals(FastDateFormat.getTimeInstance(FastDateFormat.LONG, Locale.CANADA), FastDateFormat.getTimeInstance(FastDateFormat.LONG, TimeZone.getDefault(), Locale.CANADA)); - assertEquals(FastDateFormat.getTimeInstance(FastDateFormat.LONG, TimeZones.getTimeZone("America/New_York")), FastDateFormat.getTimeInstance(FastDateFormat.LONG, TimeZones.getTimeZone("America/New_York"), Locale.getDefault())); - assertEquals(FastDateFormat.getTimeInstance(FastDateFormat.LONG), FastDateFormat.getTimeInstance(FastDateFormat.LONG, TimeZone.getDefault(), Locale.getDefault())); } diff --git a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java index 04c223ed358..4e07086a64e 100644 --- a/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java +++ b/src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java @@ -253,22 +253,17 @@ void test_Equality_Hash(final TriFunction } @Test + @ReadsDefaultLocale void test1806() throws ParseException { final String formatStub = "yyyy-MM-dd'T'HH:mm:ss.SSS"; final String dateStub = "2001-02-04T12:08:56.235"; - for (final Expected1806 trial : Expected1806.values()) { final Calendar cal = initializeCalendar(trial.zone); - final String message = trial.zone.getDisplayName() + ";"; - DateParser parser = getInstance(formatStub + "X", trial.zone); - assertEquals(cal.getTime().getTime(), parser.parse(dateStub + trial.one).getTime() - trial.offset, - message + trial.one); - + assertEquals(cal.getTime().getTime(), parser.parse(dateStub + trial.one).getTime() - trial.offset, message + trial.one); parser = getInstance(formatStub + "XX", trial.zone); assertEquals(cal.getTime(), parser.parse(dateStub + trial.two), message + trial.two); - parser = getInstance(formatStub + "XXX", trial.zone); assertEquals(cal.getTime(), parser.parse(dateStub + trial.three), message + trial.three); } @@ -442,13 +437,12 @@ void testLang303() throws ParseException { } @Test + @ReadsDefaultLocale void testLang538() throws ParseException { final DateParser parser = getInstance("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", TimeZones.GMT); - final Calendar cal = Calendar.getInstance(TimeZones.getTimeZone("GMT-8")); cal.clear(); cal.set(2009, Calendar.OCTOBER, 16, 8, 42, 16); - assertEquals(cal.getTime(), parser.parse("2009-10-16T16:42:16.000Z")); } @@ -671,6 +665,8 @@ private void testSdfAndFdp(final TriFunction data() { @ParameterizedTest @MethodSource("data") + @ReadsDefaultLocale + @ReadsDefaultTimeZone void testParser(final Calendar vulgar, final String isoForm) { final DateParser parser = new FastDateParser("YYYY-'W'ww-u", TimeZone.getDefault(), Locale.getDefault()); @@ -71,6 +75,8 @@ void testParser(final Calendar vulgar, final String isoForm) { @ParameterizedTest @MethodSource("data") + @ReadsDefaultLocale + @ReadsDefaultTimeZone void testPrinter(final Calendar vulgar, final String isoForm) { final FastDatePrinter printer = new FastDatePrinter("YYYY-'W'ww-u", TimeZone.getDefault(), Locale.getDefault());