ICU-13283 Skip DecimalFormat_ICU58 test code when run in Android.

X-SVN-Rev: 40271

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java
index dd1ecaf7a4325f4e28fb56b450be48e3041d271a..c1c5bf07890c86f60c5432a100d952c3f212d092 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatDataDrivenTest.java
@@ -9,6 +9,7 @@ import java.text.ParsePosition;
 
 import org.junit.Test;
 
+import com.ibm.icu.dev.test.TestUtil;
 import com.ibm.icu.impl.number.Endpoint;
 import com.ibm.icu.impl.number.Format;
 import com.ibm.icu.impl.number.FormatQuantity;
@@ -778,6 +779,9 @@ public class NumberFormatDataDrivenTest {
 
   @Test
   public void TestDataDrivenICU58() {
+    // Android can't access DecimalFormat_ICU58 for testing (ticket #13283).
+    if (TestUtil.getJavaVendor() == TestUtil.JavaVendor.Android) return;
+
     DataDrivenNumberFormatTestUtility.runFormatSuiteIncludingKnownFailures(
         "numberformattestspecification.txt", ICU58);
   }

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
index 928bb66595d5bb09fed83ddd6bdaa69a56ee29f0..c5b5e33fbbc561a60d1dbb0ebcea10f049f5df5a 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
@@ -1653,6 +1653,9 @@ public class NumberFormatTest extends TestFmwk {
             assertEquals("toLocalizedPattern should match on standardPattern instance",
                     localizedPattern, df1.toLocalizedPattern());
 
+            // Android can't access DecimalFormat_ICU58 for testing (ticket #13283).
+            if (TestUtil.getJavaVendor() == TestUtil.JavaVendor.Android) continue;
+
             // Note: ICU 58 does not support plus signs in patterns
             // Note: ICU 58 always prints the negative part of scientific notation patterns,
             //       even when the negative part is not necessary