Merge changes from topic "icu60"
* changes:
Updated test expectations for ICU 60.
Replace clearCachedDefault with setICUDefault
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index 54a443c..ed88ae7 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -1838,5 +1838,11 @@
result: EXEC_FAILED,
bug: 67395816,
name: "libcore.java.util.zip.DeflateRegressionTest#deterministicOutput"
+},
+{
+ description: "Awaiting fix in fast-path UTF-8 decoder / CharsetDecoder",
+ result: EXEC_FAILED,
+ bug: 69599767,
+ name: "libcore.java.lang.StringTest#test_23831"
}
]
diff --git a/luni/src/test/java/libcore/java/text/NumberFormatTest.java b/luni/src/test/java/libcore/java/text/NumberFormatTest.java
index e391cd5..63892df 100644
--- a/luni/src/test/java/libcore/java/text/NumberFormatTest.java
+++ b/luni/src/test/java/libcore/java/text/NumberFormatTest.java
@@ -247,7 +247,7 @@
// Armenian Dram 0 fractional digits.
nf = NumberFormat.getCurrencyInstance(Locale.forLanguageTag("hy-AM"));
- assertEquals("֏\u00a050", nf.format(50.00));
+ assertEquals("50\u00a0֏", nf.format(50.00));
// Swiss Francs 2 fractional digits.
nf = NumberFormat.getCurrencyInstance(Locale.forLanguageTag("de-CH"));
diff --git a/luni/src/test/java/libcore/java/util/TimeZoneTest.java b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
index 5d8b976..bf4c8e0 100644
--- a/luni/src/test/java/libcore/java/util/TimeZoneTest.java
+++ b/luni/src/test/java/libcore/java/util/TimeZoneTest.java
@@ -460,7 +460,7 @@
// This is not public API but can effectively be invoked via
// java.util.TimeZone.setDefault. Call it directly to reduce the amount of code
// involved in this test.
- android.icu.util.TimeZone.clearCachedDefault();
+ android.icu.util.TimeZone.setICUDefault(null);
}
});
clearer.setName("testSetDefaultRace clearer");
diff --git a/luni/src/test/java/libcore/libcore/icu/DateIntervalFormatTest.java b/luni/src/test/java/libcore/libcore/icu/DateIntervalFormatTest.java
index 300c241..3c6049b 100644
--- a/luni/src/test/java/libcore/libcore/icu/DateIntervalFormatTest.java
+++ b/luni/src/test/java/libcore/libcore/icu/DateIntervalFormatTest.java
@@ -134,12 +134,12 @@
// The same tests but for es_US.
assertEquals("19–22 de enero de 2009", formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, 0));
- assertEquals("19 – 22 de ene. de 2009", formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));
+ assertEquals("19–22 de ene. de 2009", formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));
assertEquals("lun., 19 de ene. – jue., 22 de ene. de 2009", formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL));
assertEquals("lunes, 19 de enero–jueves, 22 de enero de 2009", formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * DAY, FORMAT_SHOW_WEEKDAY));
assertEquals("19 de enero–22 de abril de 2009", formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, 0));
- assertEquals("19 de ene. – 22 de abr. de 2009", formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));
+ assertEquals("19 de ene. – 22 de abr. 2009", formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_SHOW_DATE | FORMAT_ABBREV_ALL));
assertEquals("lun., 19 de ene. – mié., 22 de abr. de 2009", formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_SHOW_WEEKDAY | FORMAT_ABBREV_ALL));
assertEquals("enero–abril de 2009", formatDateRange(es_US, tz, fixedTime, fixedTime + 3 * MONTH, FORMAT_NO_MONTH_DAY));
@@ -407,7 +407,7 @@
// For now, here are the localized Gregorian strings instead...
assertEquals("یکشنبه ۱۰ فوریهٔ ۱۹۸۰", formatDateRange(new ULocale("fa"), utc, thisYear, thisYear, flags));
- assertEquals("یکشنبه د ۱۹۸۰ د فبروري ۱۰", formatDateRange(new ULocale("ps"), utc, thisYear, thisYear, flags));
+ assertEquals("يونۍ د ۱۹۸۰ د فبروري ۱۰", formatDateRange(new ULocale("ps"), utc, thisYear, thisYear, flags));
assertEquals("วันอาทิตย์ที่ 10 กุมภาพันธ์ ค.ศ. 1980", formatDateRange(new ULocale("th"), utc, thisYear, thisYear, flags));
}
diff --git a/luni/src/test/java/libcore/libcore/icu/RelativeDateTimeFormatterTest.java b/luni/src/test/java/libcore/libcore/icu/RelativeDateTimeFormatterTest.java
index 256795a..651b9f9 100644
--- a/luni/src/test/java/libcore/libcore/icu/RelativeDateTimeFormatterTest.java
+++ b/luni/src/test/java/libcore/libcore/icu/RelativeDateTimeFormatterTest.java
@@ -520,10 +520,10 @@
assertEquals("5 secondi fa, 20:14",
getRelativeDateTimeString(it_IT, tz, base - 5 * SECOND_IN_MILLIS, base, 0,
MINUTE_IN_MILLIS, 0));
- assertEquals("5 min. fa, 20:10",
+ assertEquals("5 min fa, 20:10",
getRelativeDateTimeString(it_IT, tz, base - 5 * MINUTE_IN_MILLIS, base, 0,
HOUR_IN_MILLIS, FORMAT_ABBREV_RELATIVE));
- assertEquals("0 h. fa, 20:10",
+ assertEquals("0 h fa, 20:10",
getRelativeDateTimeString(it_IT, tz, base - 5 * MINUTE_IN_MILLIS, base,
HOUR_IN_MILLIS, DAY_IN_MILLIS, FORMAT_ABBREV_RELATIVE));
assertEquals("Ieri, 22:15",
diff --git a/luni/src/test/java/libcore/libcore/icu/TransliteratorTest.java b/luni/src/test/java/libcore/libcore/icu/TransliteratorTest.java
index d1e1483..fbfd73b 100644
--- a/luni/src/test/java/libcore/libcore/icu/TransliteratorTest.java
+++ b/luni/src/test/java/libcore/libcore/icu/TransliteratorTest.java
@@ -71,7 +71,7 @@
// Use alternative transliteration variants.
t = Transliterator.getInstance("Greek-Latin/BGN");
- assertEquals("Kaliméra kósme!", t.transliterate(greek));
+ assertEquals("Kalēméra kósme!", t.transliterate(greek));
t = Transliterator.getInstance("Greek-Latin/UNGEGN");
assertEquals("Kali̱méra kósme!",t.transliterate(greek));
}
diff --git a/ojluni/src/main/java/java/util/TimeZone.java b/ojluni/src/main/java/java/util/TimeZone.java
index 6ad180b..de4d4d1 100644
--- a/ojluni/src/main/java/java/util/TimeZone.java
+++ b/ojluni/src/main/java/java/util/TimeZone.java
@@ -743,7 +743,7 @@
}
defaultTimeZone = timeZone != null ? (TimeZone) timeZone.clone() : null;
// Android-changed: notify ICU4J of changed default TimeZone.
- android.icu.util.TimeZone.clearCachedDefault();
+ android.icu.util.TimeZone.setICUDefault(null);
}
/**
diff --git a/ojluni/src/test/java/time/test/java/time/format/TestNonIsoFormatter.java b/ojluni/src/test/java/time/test/java/time/format/TestNonIsoFormatter.java
index 6609f2c..1edaba6 100644
--- a/ojluni/src/test/java/time/test/java/time/format/TestNonIsoFormatter.java
+++ b/ojluni/src/test/java/time/test/java/time/format/TestNonIsoFormatter.java
@@ -81,10 +81,10 @@
// new CLDR patterns include the era. Test Arabic locale with ASCII digits below.
{ HIJRAH, ARABIC, ARABIC, HIJRAH.date(IsoDate),
"\u0627\u0644\u0627\u062b\u0646\u064a\u0646\u060c \u0661 \u0631\u0628\u064a\u0639 "
- + "\u0627\u0644\u0622\u062e\u0631\u060c \u0661\u0664\u0663\u0664 \u0647\u0640" }, // Hijrah AH 1434-04-01 (Mon)
+ + "\u0627\u0644\u0622\u062e\u0631 \u0661\u0664\u0663\u0664 \u0647\u0640" }, // Hijrah AH 1434-04-01 (Mon)
{ HIJRAH, ARABIC, Locale.ENGLISH, HIJRAH.date(IsoDate),
"\u0627\u0644\u0627\u062b\u0646\u064a\u0646\u060c 1 \u0631\u0628\u064a\u0639 "
- + "\u0627\u0644\u0622\u062e\u0631\u060c 1434 \u0647\u0640" }, // Hijrah AH 1434-04-01 (Mon)
+ + "\u0627\u0644\u0622\u062e\u0631 1434 \u0647\u0640" }, // Hijrah AH 1434-04-01 (Mon)
{ MINGUO, Locale.TAIWAN, Locale.TAIWAN, MINGUO.date(IsoDate),
"\u6c11\u570b102\u5e742\u670811\u65e5 \u661f\u671f\u4e00" }, // Minguo ROC 102-02-11 (Mon)
{ BUDDHIST, thTH, thTH, BUDDHIST.date(IsoDate),
