commit 0bec02025cdab0b9b563af98f1d8d67eb499966c
author Almaz Mingaleev <mingaleev@google.com> Mon Sep 12 18:57:45 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Sep 12 18:57:45 2022 +0000
tree e90d18e6ceb94d038ecda60dbbede8c6bbc24590
parent aaeb13bb3b331217d3c3d6b848f812e27a45ef13
parent f7264de186d1eef0cbafb7496de395f43b66d501

[automerger skipped] Merge "DO NOT MERGE Track TZDB 2022a rev. 2 changes. [S]" into sc-mainline-prod am: 05b6e94ea7 -s ours am: 849a431296 -s ours am: f7264de186 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/19659831

Change-Id: Iaac35f0b910c0ea79014f2449138bd4c814b06a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 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 {