Merge "[automerger skipped] Merge "Disable IPv6 Multicast test on interface" into android12L-tests-dev am: 56aa652af0 -s ours" into android13-tests-dev am: 76214dbe97 am: 5d0d904278 am: bad3397724
Original change: https://android-review.googlesource.com/c/platform/libcore/+/2457393
Change-Id: I75bf716433e556a00cbd91c6c1f9372269a896cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/luni/src/test/java/libcore/java/util/TimeZoneTest.java b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
index 145c2d1..f871da1 100644
--- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
@@ -108,7 +108,10 @@
public void testGetDisplayNameShort_nonHourOffsets() {
TimeZone iranTz = TimeZone.getTimeZone("Asia/Tehran");
assertEquals("GMT+03:30", iranTz.getDisplayName(false, TimeZone.SHORT, Locale.UK));
- assertEquals("GMT+04:30", iranTz.getDisplayName(true, TimeZone.SHORT, Locale.UK));
+
+ TimeZone chathamTz = TimeZone.getTimeZone("Pacific/Chatham");
+ assertEquals("GMT+12:45", chathamTz.getDisplayName(false, TimeZone.SHORT, Locale.UK));
+ assertEquals("GMT+13:45", chathamTz.getDisplayName(true, TimeZone.SHORT, Locale.UK));
}
public void testPreHistoricOffsets() throws Exception {