commit 34bb603965524eab48462dca12d14b3348fda7a8
author Victor Chang <vichang@google.com> Fri Mar 12 17:59:42 2021 +0000
committer vichang <vichang@google.com> Tue Mar 16 14:56:31 2021 +0000
tree 3a2e541b120091ac955c4aecb325c262e5d1cab7
parent cf75c903e96aef57c2f318369c86c3a08f3f0ec2

Android patch: Disable a test case in udatatst#TestUDataOpenChoiceDemo1

This test patch is needed due to a patch in libicuuc.
See https://r.android.com/1540731

This patch is required to enable IO test and remove UCONFIG_NO_FILE_IO
flag from cintltst.

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

icu4c/source/test/cintltst/udatatst.c

diff --git a/icu4c/source/test/cintltst/udatatst.c b/icu4c/source/test/cintltst/udatatst.c
index 5c57d5a..4a33650 100644
--- a/icu4c/source/test/cintltst/udatatst.c
+++ b/icu4c/source/test/cintltst/udatatst.c
@@ -707,13 +707,17 @@
     type="typ";
     result=udata_openChoice(fullTestDataPath, type, name[3], isAcceptable1, NULL, &status);
     if(status != U_INVALID_FORMAT_ERROR){
-        log_err("FAIL: udata_openChoice() did not fail as expected. name=%s, type=%s, \n errorcode=%s\n", name[3], type, myErrorName(status));
+        // Android-changed: Android does not try to load ICU data from other files. See  gDataFileAccess = UDATA_NO_FILES in udata.cpp.
+        // log_err("FAIL: udata_openChoice() did not fail as expected. name=%s, type=%s, \n errorcode=%s\n", name[3], type, myErrorName(status));
+        log_data_err("FAIL: udata_openChoice() did not fail as expected. name=%s, type=%s, \n errorcode=%s\n", name[3], type, myErrorName(status));
     }
 
     status=U_USELESS_COLLATOR_ERROR;
     result=udata_openChoice(fullTestDataPath, type, name[3], isAcceptable1, NULL, &status);
     if(status != U_USELESS_COLLATOR_ERROR){
-        log_err("FAIL: udata_openChoice() did not fail as expected. name=%s, type=%s, \n errorcode=%s\n", name[3], type, myErrorName(status));
+        // Android-changed: Android does not try to load ICU data from other files. See  gDataFileAccess = UDATA_NO_FILES in udata.cpp.
+        // log_err("FAIL: udata_openChoice() did not fail as expected. name=%s, type=%s, \n errorcode=%s\n", name[3], type, myErrorName(status));
+        log_data_err("FAIL: udata_openChoice() did not fail as expected. name=%s, type=%s, \n errorcode=%s\n", name[3], type, myErrorName(status));
     }
 }