diff options
| author | Justin Klaassen <justinklaassen@google.com> | 2017-11-17 16:38:15 -0500 |
|---|---|---|
| committer | Justin Klaassen <justinklaassen@google.com> | 2017-11-17 16:38:15 -0500 |
| commit | 6a65f2da209bff03cb0eb6da309710ac6ee5026d (patch) | |
| tree | 48e2090e716d4178378cb0599fc5d9cffbcf3f63 /tck | |
| parent | 46c77c203439b3b37c99d09e326df4b1fe08c10b (diff) | |
| download | android-28-6a65f2da209bff03cb0eb6da309710ac6ee5026d.tar.gz | |
Import Android SDK Platform P [4456821]
/google/data/ro/projects/android/fetch_artifact \
--bid 4456821 \
--target sdk_phone_armv7-win_sdk \
sdk-repo-linux-sources-4456821.zip
AndroidVersion.ApiLevel has been modified to appear as 28
Change-Id: I2d206b200d7952f899a5d1647ab532638cc8dd43
Diffstat (limited to 'tck')
| -rw-r--r-- | tck/java/time/zone/TCKZoneRules.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tck/java/time/zone/TCKZoneRules.java b/tck/java/time/zone/TCKZoneRules.java index 67a10c04..2781ca54 100644 --- a/tck/java/time/zone/TCKZoneRules.java +++ b/tck/java/time/zone/TCKZoneRules.java @@ -943,21 +943,23 @@ public class TCKZoneRules { } public void test_Apia_jumpForwardOverInternationalDateLine_P12_to_M12() { - // transition occurred at 1879-07-04T00:00+12:33:04 + // Android-changed: 1879 changed to 1892 in this test due to 2017c IANA update. Upstream + // will probably do the same. See https://bugs.openjdk.java.net/browse/JDK-8190259 + // transition occurred at 1892-07-04T00:00+12:33:04 ZoneRules test = pacificApia(); - Instant instantBefore = LocalDate.of(1879, 7, 2).atStartOfDay(ZoneOffset.UTC).toInstant(); + Instant instantBefore = LocalDate.of(1892, 7, 2).atStartOfDay(ZoneOffset.UTC).toInstant(); ZoneOffsetTransition trans = test.nextTransition(instantBefore); - assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(1879, 7, 5, 0, 0)); - assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(1879, 7, 4, 0, 0)); + assertEquals(trans.getDateTimeBefore(), LocalDateTime.of(1892, 7, 5, 0, 0)); + assertEquals(trans.getDateTimeAfter(), LocalDateTime.of(1892, 7, 4, 0, 0)); assertEquals(trans.isGap(), false); assertEquals(trans.isOverlap(), true); assertEquals(trans.isValidOffset(ZoneOffset.ofHoursMinutesSeconds(+12, 33, 4)), true); assertEquals(trans.isValidOffset(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56)), true); assertEquals(trans.getDuration(), Duration.ofHours(-24)); - assertEquals(trans.getInstant(), LocalDateTime.of(1879, 7, 4, 0, 0).toInstant(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56))); + assertEquals(trans.getInstant(), LocalDateTime.of(1892, 7, 4, 0, 0).toInstant(ZoneOffset.ofHoursMinutesSeconds(-11, -26, -56))); - ZonedDateTime zdt = ZonedDateTime.of(1879, 7, 4, 23, 0, 0, 0, ZoneId.of("Pacific/Apia")); - assertEquals(zdt.plusHours(2).toLocalDateTime(), LocalDateTime.of(1879, 7, 4, 1, 0, 0)); + ZonedDateTime zdt = ZonedDateTime.of(1892, 7, 4, 23, 0, 0, 0, ZoneId.of("Pacific/Apia")); + assertEquals(zdt.plusHours(2).toLocalDateTime(), LocalDateTime.of(1892, 7, 4, 1, 0, 0)); } //------------------------------------------------------------------------- |