aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlmaz Mingaleev <mingaleev@google.com>2022-08-24 17:11:20 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-08-24 17:11:20 +0000
commit44704df28d6f745c7de85763eaab5fa5a26dd1b7 (patch)
treec41b552680ff79fd67ce2d7afd255923efa0d77b
parent11474a787978b88dec18e462c17c1a9c7b329689 (diff)
parent0e295f1ee4604a81f2065750168dac06088281d8 (diff)
downloadlibcore-oreo-mr1-dev.tar.gz
Merge "DO NOT MERGE Track TZDB 2022a rev. 2 changes. [O-MR1]" into oreo-mr1-devoreo-mr1-dev
-rw-r--r--luni/src/test/java/libcore/java/util/TimeZoneTest.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/luni/src/test/java/libcore/java/util/TimeZoneTest.java b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
index c819a85d628..baed955ddc5 100644
--- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
@@ -84,7 +84,10 @@ public class TimeZoneTest extends TestCase {
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 {