commit fe01970c8f91a6b8035b9e6e98d29f031611d48b
author Treehugger Robot <treehugger-gerrit@google.com> Mon May 18 21:03:50 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 18 21:03:50 2020 +0000
tree b83c122bcd390edabbcaa68738abfc9c702ecaa7
parent 40beee2ae245c324af5f9fbea473e7f793238a71
parent 7e33982d99dd62b8b3dd3c9bda150b0ce3629ef2

Merge "DO NOT MERGE: Fix testFormatSameDayTime test for 2020a update [O]" into oreo-cts-dev

tests/tests/text/src/android/text/format/cts/DateUtilsTest.java

diff --git a/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java b/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
index c8739d1..d47735b 100644
--- a/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
+++ b/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
@@ -33,10 +33,12 @@
 import org.junit.runner.RunWith;
 
 import java.text.DateFormat;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Formatter;
 import java.util.GregorianCalendar;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -216,12 +218,25 @@
                 fixedTime, java.text.DateFormat.SHORT, java.text.DateFormat.FULL));
 
         final long HOUR_DURATION = 2 * 60 * 60 * 1000;
-        assertEquals("5:30:15 AM GMT+00:00", DateUtils.formatSameDayTime(fixedTime + HOUR_DURATION,
-                fixedTime, java.text.DateFormat.FULL, java.text.DateFormat.FULL));
+        // The original answer was "GMT+00:00", devices with latest CLDR patches from
+        // the tzdb 2020a patch have "Greenwich Mean Time". http://b/155407785
+        List<String> gmtTimeFullAllowed = Arrays.asList("5:30:15 AM Greenwich Mean Time",
+                "5:30:15 AM GMT+00:00");
+        String gmtTimeFullActual = String.valueOf(DateUtils.formatSameDayTime(
+                fixedTime + HOUR_DURATION, fixedTime, java.text.DateFormat.FULL,
+                java.text.DateFormat.FULL));
+        assertTrue("Expected one of " + gmtTimeFullAllowed,
+                gmtTimeFullAllowed.contains(gmtTimeFullActual));
         assertEquals("5:30:15 AM", DateUtils.formatSameDayTime(fixedTime + HOUR_DURATION,
                 fixedTime, java.text.DateFormat.FULL, java.text.DateFormat.DEFAULT));
-        assertEquals("5:30:15 AM GMT+00:00", DateUtils.formatSameDayTime(fixedTime + HOUR_DURATION,
-                fixedTime, java.text.DateFormat.FULL, java.text.DateFormat.LONG));
+        // The original answer was "GMT+00:00", devices with latest CLDR patches from
+        // the tzdb 2020a patch have "GMT". http://b/155407785
+        List<String> gmtTimeLongAllowed = Arrays.asList("5:30:15 AM GMT", "5:30:15 AM GMT+00:00");
+        String gmtTimeLongActual = String.valueOf(DateUtils.formatSameDayTime(
+                fixedTime + HOUR_DURATION, fixedTime, java.text.DateFormat.FULL,
+                java.text.DateFormat.LONG));
+        assertTrue("Expected one of " + gmtTimeLongAllowed,
+                gmtTimeLongAllowed.contains(gmtTimeLongActual));
         assertEquals("5:30:15 AM", DateUtils.formatSameDayTime(fixedTime + HOUR_DURATION,
                 fixedTime, java.text.DateFormat.FULL, java.text.DateFormat.MEDIUM));
         assertEquals("5:30 AM", DateUtils.formatSameDayTime(fixedTime + HOUR_DURATION,