diff options
| author | Victor Chang <vichang@google.com> | 2022-04-21 16:56:28 +0100 |
|---|---|---|
| committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2022-04-22 20:52:03 +0000 |
| commit | 3004e9ee592e6e54615d5a2cfc7909943d32048d (patch) | |
| tree | 4de8dd0c1464e4a47626f9e64371c6427dd2223e | |
| parent | a6b6af18083dbdfc033afc290cdaa3be8dd3c211 (diff) | |
| download | libcore-3004e9ee592e6e54615d5a2cfc7909943d32048d.tar.gz | |
Fix java.time MTS test failures on S
Test: CtsLibcoreOjTestCases
Fix: 229960530
Change-Id: I58b811cccb59269a165d3647bb79c4c7dcaa38bc
(cherry picked from commit 4f89896100307e50dea7ba1591b0558cd9719115)
Merged-In: I58b811cccb59269a165d3647bb79c4c7dcaa38bc
| -rw-r--r-- | ojluni/src/test/java/time/test/java/time/chrono/TestEraDisplayName.java | 5 | ||||
| -rw-r--r-- | ojluni/src/test/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ojluni/src/test/java/time/test/java/time/chrono/TestEraDisplayName.java b/ojluni/src/test/java/time/test/java/time/chrono/TestEraDisplayName.java index d2d655fa68e..409f975abe4 100644 --- a/ojluni/src/test/java/time/test/java/time/chrono/TestEraDisplayName.java +++ b/ojluni/src/test/java/time/test/java/time/chrono/TestEraDisplayName.java @@ -25,6 +25,7 @@ package test.java.time.chrono; +import android.icu.util.VersionInfo; import java.time.*; import java.time.chrono.*; import java.time.format.*; @@ -166,6 +167,10 @@ public class TestEraDisplayName { @Test(dataProvider="eraDisplayName") public void test_eraDisplayName(Era era, TextStyle style, Locale locale, String expected) { + // Android-added: The ICU data is different before ICU version 70. http://b/229960530 + if (VersionInfo.ICU_VERSION.getMajor() < 70) { + return; + } assertEquals(era.getDisplayName(style, locale), expected); } } diff --git a/ojluni/src/test/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java b/ojluni/src/test/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java index ee147926d5b..2f73f5997b4 100644 --- a/ojluni/src/test/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java +++ b/ojluni/src/test/java/time/test/java/time/format/TestDateTimeFormatterBuilderWithLocale.java @@ -64,6 +64,7 @@ */ package test.java.time.format; +import android.icu.util.VersionInfo; import java.time.chrono.ChronoLocalDate; import java.time.chrono.Chronology; import java.time.chrono.IsoChronology; @@ -220,6 +221,10 @@ public class TestDateTimeFormatterBuilderWithLocale { @Test(dataProvider="localePatterns") public void test_getLocalizedDateTimePattern(FormatStyle dateStyle, FormatStyle timeStyle, Chronology chrono, Locale locale, String expected) { + // Android-added: The ICU data is different before ICU version 70. http://b/229960530 + if (VersionInfo.ICU_VERSION.getMajor() < 70) { + return; + } String actual = DateTimeFormatterBuilder.getLocalizedDateTimePattern(dateStyle, timeStyle, chrono, locale); assertEquals(actual, expected, "Pattern " + convertNonAscii(actual)); } |