commit 5d219b975656e2c6ababb940a07e7b8d1c8439fd
author Victor Chang <vichang@google.com> Fri Jun 14 17:29:48 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 14 17:29:48 2024 +0000
tree e2a982e378d5019ff1eb4e8ae9815a1f0a175a9c
parent 1117be9642d93093e7e1bdc2a4bb19699b97a1ce
parent 63e274aff3fded27eb0a8cafea4ad33e0d9aa928

Skip NumberFormatTest#testMonetarySeparator on U or below am: 6d2364d5ea am: 921400dd8d am: 63e274aff3

Original change: https://android-review.googlesource.com/c/platform/external/icu/+/3125253

Change-Id: I487743619745b995de1e6b8926713dc1ad920a84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android_icu4j/testing/src/com/android/libcore/java/text/NumberFormatTest.java

diff --git a/android_icu4j/testing/src/com/android/libcore/java/text/NumberFormatTest.java b/android_icu4j/testing/src/com/android/libcore/java/text/NumberFormatTest.java
index 1005b43..ffd8dc0 100644
--- a/android_icu4j/testing/src/com/android/libcore/java/text/NumberFormatTest.java
+++ b/android_icu4j/testing/src/com/android/libcore/java/text/NumberFormatTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 
 import android.icu.testsharding.MainTestShard;
+import android.icu.util.VersionInfo;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -42,6 +43,10 @@
     // See http://b/162744366.
     @Test
     public void testMonetarySeparator() {
+        // Skip this test on U or lower due to a change in j.t.DecimalFormat. b/346454577
+        if (VersionInfo.ICU_VERSION.getMajor() < 75) {
+            return;
+        }
         Locale locale = Locale.forLanguageTag("en-BE");
         DecimalFormat df = (DecimalFormat) NumberFormat.getCurrencyInstance(locale);
         DecimalFormatSymbols dfs = df.getDecimalFormatSymbols();