commit aa685bec4fddc9825faec0560458d6610da29a72
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jun 14 20:19:14 2024 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Jun 14 20:19:14 2024 +0000
tree e2a982e378d5019ff1eb4e8ae9815a1f0a175a9c
parent 58e0b701f7289fad739f61a133fa62b9026ad39b
parent 5d219b975656e2c6ababb940a07e7b8d1c8439fd

Snap for 11972971 from 5d219b975656e2c6ababb940a07e7b8d1c8439fd to android14-tests-release

Change-Id: I84c7c48661bf5171c140fa3ce5835355039814d5

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();