commit bb722e7f9d071d0e66e39acc0ce1f7f8f5f76ad6
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 03 23:27:19 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Oct 03 23:27:19 2022 +0000
tree e90d18e6ceb94d038ecda60dbbede8c6bbc24590
parent 37430b4403f5a64f19b7f198d90b11b7d6e7bd6b
parent 8b1400cb5c4582481433ecf56284fa1e594efd66

Snap for 9133013 from 8b1400cb5c4582481433ecf56284fa1e594efd66 to tm-qpr2-release

Change-Id: I646fe624b84615ae5b8cc4cb107a73bbb721846c

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 {