commit 89ae8474b373be44bd61f5359802ee21d185701c
author Victor Chang <vichang@google.com> Tue Mar 16 18:05:01 2021 +0000
committer vichang <vichang@google.com> Thu Mar 18 12:07:28 2021 +0000
tree 94fa4f124350248dc13e06c34875aa51d4923bfd
parent eba43c63c416256584e633254123d18653a30b01

Android patch: Patch intltest due to using Gregorian calendar by default on Android

It's a patch in  ICU4C test extended from the other https://r.android.com/1556355

Bug: 145129186
Test: atest CtsIcu4cTestCases
Change-Id: Ieb4258a1838691d4899d52222d2b4e43df84c327

icu4c/source/test/intltest/dtifmtts.cpp

diff --git a/icu4c/source/test/intltest/dtifmtts.cpp b/icu4c/source/test/intltest/dtifmtts.cpp
index ea077df..715836d 100644
--- a/icu4c/source/test/intltest/dtifmtts.cpp
+++ b/icu4c/source/test/intltest/dtifmtts.cpp
@@ -1042,9 +1042,9 @@
         // "th", "BE 2550 10 10 10:10:10", "BE 2550 11 10 10:10:10", "My", "10/2550 \\u2013 11/2550",
 
 
-        "th", "BE 2550 10 10 10:10:10", "BE 2550 11 10 10:10:10", "d", "10/10 \\u2013 10/11",
+        // "th", "BE 2550 10 10 10:10:10", "BE 2550 11 10 10:10:10", "d", "10/10 \\u2013 10/11",
 
-        "th", "BE 2550 10 10 10:10:10", "BE 2550 11 10 10:10:10", "y", "\\u0E1E.\\u0E28. 2550",
+        // "th", "BE 2550 10 10 10:10:10", "BE 2550 11 10 10:10:10", "y", "\\u0E1E.\\u0E28. 2550",
 
 
         // "th", "BE 2550 10 10 10:10:10", "BE 2550 11 10 10:10:10", "MMM", "\\u0E15.\\u0E04.\\u2013\\u0E1E.\\u0E22.",

icu4c/source/test/intltest/incaltst.cpp

diff --git a/icu4c/source/test/intltest/incaltst.cpp b/icu4c/source/test/intltest/incaltst.cpp
index db6bfce..2175273 100644
--- a/icu4c/source/test/intltest/incaltst.cpp
+++ b/icu4c/source/test/intltest/incaltst.cpp
@@ -472,7 +472,9 @@
         UnicodeString expect = CharsToUnicodeString("\\u0E27\\u0E31\\u0E19\\u0E40\\u0E2A\\u0E32\\u0E23\\u0E4C\\u0E17\\u0E35\\u0E48"
             " 8 \\u0E01\\u0E31\\u0e19\\u0e22\\u0e32\\u0e22\\u0e19 \\u0e1e.\\u0e28. 2544");
         UDate         expectDate = 999932400000.0;
-        Locale        loc("th_TH_TRADITIONAL"); // legacy
+        // Android-changed: Default calendar on Android is Gregorian.
+        // Locale        loc("th_TH_TRADITIONAL"); // legacy
+        Locale        loc("th_TH_TRADITIONAL@calendar=buddhist"); // legacy
         
         simpleTest(loc, expect, expectDate, status);
     }