commit 05b6e94ea7444573ee7d78b05b925c42606f2791
author Almaz Mingaleev <mingaleev@google.com> Mon Sep 12 17:05:24 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 12 17:05:24 2022 +0000
tree 08bad361cab5156cdcc48a8f4562e4472e743187
parent 9d05d59307f60d0fe1dd837122e8dcb3efbc7e5f
parent 1781008cf69cc3951b5f5d519c49938c36ac0a77

Merge "DO NOT MERGE Track TZDB 2022a rev. 2 changes. [S]" into sc-mainline-prod

luni/src/test/java/libcore/java/util/TimeZoneTest.java

diff --git a/luni/src/test/java/libcore/java/util/TimeZoneTest.java b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
index 9b8ea47..28a1363 100644
--- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
@@ -99,7 +99,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 {