Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to fix HG build

This commit is contained in:
Gary Gregory 2023-08-11 17:21:23 -04:00
parent 0df58255f1
commit 971efec0e1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/test/java/org/apache/commons/lang3/time/FastDateParser_TimeZoneStrategyTest.java
View File

@ -53,8 +53,8 @@ public class FastDateParser_TimeZoneStrategyTest extends AbstractLangTest {
@ParameterizedTest @ParameterizedTest
@MethodSource("java.util.Locale#getAvailableLocales") @MethodSource("java.util.Locale#getAvailableLocales")
public void testTimeZoneStrategyPattern(final Locale locale) { public void testTimeZoneStrategy(final Locale locale) {
testTimeZoneStrategyPattern(locale, TimeZones.GMT); testTimeZoneStrategyPattern(locale);
} }
/** /**
@ -62,26 +62,25 @@ public class FastDateParser_TimeZoneStrategyTest extends AbstractLangTest {
* *
* @throws ParseException * @throws ParseException
*/ */
private void testTimeZoneStrategyPattern(final Locale locale, final TimeZone tzDefault) { private void testTimeZoneStrategyPattern(final Locale locale) {
Objects.requireNonNull(locale, "locale"); Objects.requireNonNull(locale, "locale");
Objects.requireNonNull(tzDefault, "tzDefault");
assumeFalse(LocaleUtils.isLanguageUndetermined(locale), () -> toFailureMessage(locale, null)); assumeFalse(LocaleUtils.isLanguageUndetermined(locale), () -> toFailureMessage(locale, null));
assumeTrue(LocaleUtils.isAvailableLocale(locale), () -> toFailureMessage(locale, null)); assumeTrue(LocaleUtils.isAvailableLocale(locale), () -> toFailureMessage(locale, null));
final FastDateParser parser = new FastDateParser("z", tzDefault, locale);
for (final String id : TimeZone.getAvailableIDs()) { for (final String id : TimeZone.getAvailableIDs()) {
final TimeZone timeZone = TimeZone.getTimeZone(id); final TimeZone timeZone = TimeZone.getTimeZone(id);
final FastDateParser parser = new FastDateParser("z", timeZone, locale);
final String displayName = timeZone.getDisplayName(locale); final String displayName = timeZone.getDisplayName(locale);
try { try {
parser.parse(displayName); parser.parse(displayName);
} catch (ParseException e) { } catch (ParseException e) {
// Missing "Zulu" or something else in broken JDK's GH builds? // Missing "Zulu" or something else in broken JDK's GH builds?
fail(String.format("%s: with tzDefault = %s, locale = %s, id = %s, timeZone = %s, displayName = %s, parser = '%s'", e, tzDefault, locale, fail(String.format("%s: with locale = %s, id = '%s', timeZone = %s, displayName = '%s', parser = '%s'", e, locale, displayName, id, timeZone,
displayName, id, timeZone, displayName, parser.toStringAll()), e); displayName, parser.toStringAll()), e);
} }
} }
// The above replaces what's below. // The above replaces what's below and fails on certain locale/time zones on GH.
// //
// Calling getZoneStrings() is not recommended in the Javadoc but not deprecated. // Calling getZoneStrings() is not recommended in the Javadoc but not deprecated.
// //
@ -116,7 +115,7 @@ public class FastDateParser_TimeZoneStrategyTest extends AbstractLangTest {
final TimeZone tzDefault = TimeZone.getTimeZone("Etc/UTC"); final TimeZone tzDefault = TimeZone.getTimeZone("Etc/UTC");
final FastDateParser parser = new FastDateParser("z", tzDefault, locale); final FastDateParser parser = new FastDateParser("z", tzDefault, locale);
parser.parse(source); parser.parse(source);
testTimeZoneStrategyPattern(locale, tzDefault); testTimeZoneStrategyPattern(locale);
} }
private String toFailureMessage(final Locale locale, final String languageTag) { private String toFailureMessage(final Locale locale, final String languageTag) {