Tests: Handle epoch date formatters edge cases (#34437)
This commit handles cases testing withLocale and withZone when the zone and locale in question is the same as the special base case. This can happen sometimes since the locale and zoneids are randomized.
This commit is contained in:
parent
79c735a04d
commit
26f1d7fc94
|
@ -23,6 +23,7 @@ import org.elasticsearch.test.ESTestCase;
|
|||
|
||||
import java.time.Instant;
|
||||
import java.time.ZoneId;
|
||||
import java.time.ZoneOffset;
|
||||
import java.time.format.DateTimeParseException;
|
||||
import java.time.temporal.TemporalAccessor;
|
||||
import java.util.Locale;
|
||||
|
@ -81,24 +82,38 @@ public class DateFormattersTests extends ESTestCase {
|
|||
assertThat(DateFormatters.forPattern("strict_date_optional_time").getLocale(), is(Locale.ROOT));
|
||||
Locale locale = randomLocale(random());
|
||||
assertThat(DateFormatters.forPattern("strict_date_optional_time").withLocale(locale).getLocale(), is(locale));
|
||||
if (locale.equals(Locale.ROOT)) {
|
||||
DateFormatter millisFormatter = DateFormatters.forPattern("epoch_millis");
|
||||
assertThat(millisFormatter.withLocale(locale), is(millisFormatter));
|
||||
DateFormatter secondFormatter = DateFormatters.forPattern("epoch_second");
|
||||
assertThat(secondFormatter.withLocale(locale), is(secondFormatter));
|
||||
} else {
|
||||
IllegalArgumentException e =
|
||||
expectThrows(IllegalArgumentException.class, () -> DateFormatters.forPattern("epoch_millis").withLocale(locale));
|
||||
assertThat(e.getMessage(), is("epoch_millis date formatter can only be in locale ROOT"));
|
||||
e = expectThrows(IllegalArgumentException.class, () -> DateFormatters.forPattern("epoch_second").withLocale(locale));
|
||||
assertThat(e.getMessage(), is("epoch_second date formatter can only be in locale ROOT"));
|
||||
}
|
||||
}
|
||||
|
||||
public void testTimeZones() {
|
||||
// zone is null by default due to different behaviours between java8 and above
|
||||
assertThat(DateFormatters.forPattern("strict_date_optional_time").getZone(), is(nullValue()));
|
||||
ZoneId zoneId = randomZone();
|
||||
assertThat(DateFormatters.forPattern("strict_date_optional_time").withZone(zoneId).getZone(), is(zoneId));
|
||||
if (zoneId.equals(ZoneOffset.UTC)) {
|
||||
DateFormatter millisFormatter = DateFormatters.forPattern("epoch_millis");
|
||||
assertThat(millisFormatter.withZone(zoneId), is(millisFormatter));
|
||||
DateFormatter secondFormatter = DateFormatters.forPattern("epoch_second");
|
||||
assertThat(secondFormatter.withZone(zoneId), is(secondFormatter));
|
||||
} else {
|
||||
IllegalArgumentException e =
|
||||
expectThrows(IllegalArgumentException.class, () -> DateFormatters.forPattern("epoch_millis").withZone(zoneId));
|
||||
assertThat(e.getMessage(), is("epoch_millis date formatter can only be in zone offset UTC"));
|
||||
e = expectThrows(IllegalArgumentException.class, () -> DateFormatters.forPattern("epoch_second").withZone(zoneId));
|
||||
assertThat(e.getMessage(), is("epoch_second date formatter can only be in zone offset UTC"));
|
||||
}
|
||||
}
|
||||
|
||||
public void testEqualsAndHashcode() {
|
||||
assertThat(DateFormatters.forPattern("strict_date_optional_time"),
|
||||
|
|
Loading…
Reference in New Issue