Revert "Android patch: Disable failing ICU4C tests"androidx-leanback-release

This reverts commit 39491ddeb57b2a1c88af021ce8707dabea7d07af.

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

6 files changed, 0 insertions, 18 deletions

diff --git a/icu4c/source/test/intltest/dtifmtts.cpp b/icu4c/source/test/intltest/dtifmtts.cpp
index 715836dac..224605602 100644
--- a/icu4c/source/test/intltest/dtifmtts.cpp
+++ b/icu4c/source/test/intltest/dtifmtts.cpp
@@ -1080,10 +1080,7 @@ void DateIntervalFormatTest::testFormat() {
 
         // END ANDROID-changed
     };
-    // Android patch: b/145129186 Disable failing tests
-    #ifndef ANDROID
     expect(DATA, UPRV_LENGTHOF(DATA));
-    #endif /* ANDROID */
 }
 
 
diff --git a/icu4c/source/test/intltest/dtptngts.cpp b/icu4c/source/test/intltest/dtptngts.cpp
index a211bfea2..faa850aa8 100644
--- a/icu4c/source/test/intltest/dtptngts.cpp
+++ b/icu4c/source/test/intltest/dtptngts.cpp
@@ -1329,8 +1329,6 @@ void IntlTestDateTimePatternGeneratorAPI::testGetFieldDisplayNames() {
 static const UChar timeCycleChars[] = { (UChar)0x0048, (UChar)0x0068, (UChar)0x004B, (UChar)0x006B, (UChar)0 };
 
 void IntlTestDateTimePatternGeneratorAPI::testJjMapping() {
-    // Android patch: b/145129186 Disable failing tests
-    #ifndef ANDROID
     UErrorCode status = U_ZERO_ERROR;
     UnicodeString jSkeleton("j");
     // First test that j maps correctly by region in a locale for which we do not have data.
@@ -1407,7 +1405,6 @@ void IntlTestDateTimePatternGeneratorAPI::testJjMapping() {
              }
         }
     }
-    #endif /* ANDROID */
 }
 
 void IntlTestDateTimePatternGeneratorAPI::test20640_HourCyclArsEnNH() {
diff --git a/icu4c/source/test/intltest/incaltst.cpp b/icu4c/source/test/intltest/incaltst.cpp
index 2175273ee..a2e343676 100644
--- a/icu4c/source/test/intltest/incaltst.cpp
+++ b/icu4c/source/test/intltest/incaltst.cpp
@@ -433,8 +433,6 @@ void IntlCalendarTest::TestJapanese() {
 
 
 void IntlCalendarTest::TestBuddhistFormat() {
-    // Android patch: b/145129186 Disable failing tests
-    #ifndef ANDROID
     UErrorCode status = U_ZERO_ERROR;
     
     // Test simple parse/format with adopt
@@ -505,7 +503,6 @@ void IntlCalendarTest::TestBuddhistFormat() {
         
         simpleTest(loc, expect, expectDate, status);
     }
-    #endif /* ANDROID */
 }
 
 // TaiwanFormat has been moved to testdata/format.txt
diff --git a/icu4c/source/test/intltest/itspoof.cpp b/icu4c/source/test/intltest/itspoof.cpp
index dc1b8624e..41e00c902 100644
--- a/icu4c/source/test/intltest/itspoof.cpp
+++ b/icu4c/source/test/intltest/itspoof.cpp
@@ -340,8 +340,6 @@ U_DEFINE_LOCAL_OPEN_POINTER(LocalStdioFilePointer, FILE, fclose);
 //                 verify that it transforms correctly in a skeleton.
 //
 void IntlTestSpoof::testConfData() {
-    // Android patch: b/145129186 Disable failing tests
-    #ifndef ANDROID
     char buffer[2000];
     if (getUnidataPath(buffer) == NULL) {
         errln("Skipping test spoof/testConfData. Unable to find path to source/data/unidata/.");
@@ -422,7 +420,6 @@ void IntlTestSpoof::testConfData() {
             break;
         }
     }
-    #endif /* ANDROID */
 }
 
 
diff --git a/icu4c/source/test/intltest/testidna.cpp b/icu4c/source/test/intltest/testidna.cpp
index 97c6241f6..4b4b2d410 100644
--- a/icu4c/source/test/intltest/testidna.cpp
+++ b/icu4c/source/test/intltest/testidna.cpp
@@ -1595,10 +1595,7 @@ void TestIDNA::TestRefIDNA(){
 
 
 void TestIDNA::TestDataFile(){
-    // Android patch: b/145129186 Disable failing tests
-    #ifndef ANDROID
      testData(*this);
-    #endif /* ANDROID */
 }
 
 TestIDNA::~TestIDNA(){
diff --git a/icu4c/source/test/intltest/ucdtest.cpp b/icu4c/source/test/intltest/ucdtest.cpp
index 9f5d414cc..6b784b7b1 100644
--- a/icu4c/source/test/intltest/ucdtest.cpp
+++ b/icu4c/source/test/intltest/ucdtest.cpp
@@ -199,8 +199,6 @@ derivedPropsLineFn(void *context,
 
 void UnicodeTest::TestAdditionalProperties() {
 #if !UCONFIG_NO_NORMALIZATION
-    // Android patch: b/145129186 Disable failing tests
-    #ifndef ANDROID
     // test DerivedCoreProperties.txt and DerivedNormalizationProps.txt
     if(UPRV_LENGTHOF(derivedProps)<UPRV_LENGTHOF(derivedPropsNames)) {
         errln("error: UnicodeTest::derivedProps[] too short, need at least %d UnicodeSets\n",
@@ -281,7 +279,6 @@ void UnicodeTest::TestAdditionalProperties() {
             }
         }
     }
-    #endif /* ANDROID */
 #endif /* !UCONFIG_NO_NORMALIZATION */
 }