commit 951ee34afd66e6aeed3bd2a84cf5161350f3153e
author Almaz Mingaleev <mingaleev@google.com> Thu Aug 18 16:05:57 2022 +0100
committer Artur Satayev <satayev@google.com> Wed Aug 31 15:53:07 2022 +0000
tree e90d18e6ceb94d038ecda60dbbede8c6bbc24590
parent fa6c382e06a6bc26b39d4fc5f639d7f27cee8bed

DO NOT MERGE Track TZDB 2022a rev. 2 changes. [T]

This change is associated with tzdb 2022a rev.2 changes
in system/timezone.
Iran is cancelling DST, hence tests are updated.

Bug: 243007869

Test: see tests in system/timezone CL
Change-Id: I46902801b8a6388f7841309547d8d767ee9e95e9
Merged-In: I46902801b8a6388f7841309547d8d767ee9e95e9

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 {