From d438cf7f6c20cccfe225f0e9f2f88a21e7e81f85 Mon Sep 17 00:00:00 2001 From: Victor Chang Date: Mon, 12 Jun 2023 13:29:58 +0100 Subject: Update NumberFormatTest#testMonetarySeparator due to ART 14 module j.t.DecimalFormatSymbols has been updated to OpenJDK 17 version, and thus the behavior has changed, but isn't a breaking change. This test change isn't intended for android14-tests-dev or main branch, and thus the Merged In tag is given. Bug; 286788987 Test: treehugger Merged-In: Iab8979b611d26b290e39ec1621237aeca97daebb Change-Id: I0bf89e786defa320c558858148090153a90336a2 --- .../testing/src/com/android/libcore/java/text/NumberFormatTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 fc2bfbfb1..fa7d21f97 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 @@ -49,6 +49,7 @@ public class NumberFormatTest { assertEquals(',', dfs.getDecimalSeparator()); assertEquals(',', dfs.getMonetaryDecimalSeparator()); // Assert that the separators in DecimalFormatSymbols are used. - assertEquals("€9.876,66",df.format(9876.66)); + // Disable this assertion as the behavior change on ART 14 module. http://b/286788987 + // assertEquals("€9.876,66",df.format(9876.66)); } } -- cgit v1.2.3