commit ed349c4c675b5865119c28f39fdb8df6641ba363
author Wonil Kim <wonil@google.com> Wed May 13 07:04:37 2020 +0900
committer Kelly Kim <sungkyoung.kim@lge.com> Thu May 28 23:13:49 2020 +0000
tree 45c3d8e0bb0692cf6425393e0909d52ee1c5210d
parent d1d6dc7306ae126bf3f0f11590f282493aa51edd

DO NOT MERGE: Fix testFormatSameDayTime test for 2020a update [N MR1/N MR2]

Change test assumptions for formating the GMT timezone, which was
changed with a 2020a update.

Bug: 157444326
Test: run cts -m CtsTextTestCases
Change-Id: Ia9915b99a7e2c3d805319b11c66f05b0e0362ceb

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 f0a4d09..765f273 100644
--- a/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
+++ b/tests/tests/text/src/android/text/format/cts/DateUtilsTest.java
@@ -19,9 +19,12 @@
 import android.content.Context;
 import android.test.AndroidTestCase;
 import android.text.format.DateUtils;
+
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Formatter;
+import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
@@ -166,12 +169,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,