commit 63e274aff3fded27eb0a8cafea4ad33e0d9aa928
author Victor Chang <vichang@google.com> Fri Jun 14 17:14:28 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 14 17:14:28 2024 +0000
tree b5dd61372ac4713ce1c7b7e0773222356f05a0d0
parent 25d9d020f2b5dd2944689caa325ef1b7ae2005bd
parent 921400dd8d808e35888f869cdd2a52df72a08ba6

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

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

Change-Id: Iba0d2b9dd647d1d76bc5febba70f949b7f8dcef9
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 fa7d21f..b8f1536 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;
@@ -40,6 +41,10 @@
     // 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();