diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-02 22:31:28 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-11-02 22:31:28 +0000 |
commit | 6a772cea535abfb87c7ad61f3e77a084f4d240fb (patch) | |
tree | f70c738ef7a33888c0e1e7f028130b5f750143d3 | |
parent | 7ec9c640e48590d7cdb31c1383aa2b3588219842 (diff) | |
parent | cd8cfe8c27708551bde225f203622c0113a65c3b (diff) | |
download | icu-aml_cbr_341311010.tar.gz |
Snap for 11041982 from cd8cfe8c27708551bde225f203622c0113a65c3b to mainline-cellbroadcast-releaseaml_cbr_341510010aml_cbr_341410010aml_cbr_341311010android14-mainline-cellbroadcast-release
Change-Id: I8220003dbdaf22be402b5425e6e8932935078b17
4 files changed, 31 insertions, 22 deletions
diff --git a/android_icu4j/api/public/current.txt b/android_icu4j/api/public/current.txt index fd2e6fef4..ee59067c9 100644 --- a/android_icu4j/api/public/current.txt +++ b/android_icu4j/api/public/current.txt @@ -1715,6 +1715,7 @@ package android.icu.number { method public CharSequence subSequence(int, int); method public java.math.BigDecimal toBigDecimal(); method public java.text.AttributedCharacterIterator toCharacterIterator(); + method public String toString(); } public class FormattedNumberRange implements android.icu.text.FormattedValue { @@ -1727,6 +1728,7 @@ package android.icu.number { method public boolean nextPosition(android.icu.text.ConstrainedFieldPosition); method public CharSequence subSequence(int, int); method public java.text.AttributedCharacterIterator toCharacterIterator(); + method public String toString(); } public abstract class FractionPrecision extends android.icu.number.Precision { @@ -2199,6 +2201,7 @@ package android.icu.text { method public android.icu.text.Collator cloneAsThawed(); method public abstract int compare(String, String); method public int compare(Object, Object); + method public boolean equals(Object); method public boolean equals(String, String); method public android.icu.text.Collator freeze(); method public static java.util.Locale[] getAvailableLocales(); @@ -2576,6 +2579,7 @@ package android.icu.text { method public boolean nextPosition(android.icu.text.ConstrainedFieldPosition); method public CharSequence subSequence(int, int); method public java.text.AttributedCharacterIterator toCharacterIterator(); + method public String toString(); } public class DateIntervalInfo implements java.lang.Cloneable android.icu.util.Freezable<android.icu.text.DateIntervalInfo> java.io.Serializable { @@ -2947,6 +2951,7 @@ package android.icu.text { method public boolean nextPosition(android.icu.text.ConstrainedFieldPosition); method public CharSequence subSequence(int, int); method public java.text.AttributedCharacterIterator toCharacterIterator(); + method public String toString(); } public enum ListFormatter.Type { @@ -3412,6 +3417,7 @@ package android.icu.text { method public boolean nextPosition(android.icu.text.ConstrainedFieldPosition); method public CharSequence subSequence(int, int); method public java.text.AttributedCharacterIterator toCharacterIterator(); + method public String toString(); } public enum RelativeDateTimeFormatter.RelativeDateTimeUnit { diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/util/ULocaleCollationTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/util/ULocaleCollationTest.java index 4416bb1ca..3e78ea13f 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/util/ULocaleCollationTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/util/ULocaleCollationTest.java @@ -314,17 +314,18 @@ public class ULocaleCollationTest extends TestFmwk { expected.add(new UiListItem(new ULocale(rawRow[2]), new ULocale(rawRow[3]), rawRow[0], rawRow[1])); } List<UiListItem> newList = names.getUiList(list, false, collator); - if (!expected.equals(newList)) { - if (expected.size() != newList.size()) { - errln(list.toString() + ": wrong size" + expected + ", " + newList); - } else { - errln(list.toString()); - for (int i = 0; i < expected.size(); ++i) { - assertEquals(i+"", expected.get(i), newList.get(i)); - } - } + // Android-changed: Checking nameInSelf is not necessary. + if (expected.size() != newList.size()) { + errln(list.toString() + ": wrong size" + expected + ", " + newList); } else { - assertEquals(list.toString(), expected, newList); + String msgHead = list.toString() + ":"; + for (int i = 0; i < expected.size(); ++i) { + UiListItem expectedItem = expected.get(i); + UiListItem newItem = newList.get(i); + assertEquals(msgHead + i+":minimized", expectedItem.minimized, newItem.minimized); + assertEquals(msgHead + i+":modified", expectedItem.modified, newItem.modified); + assertEquals(msgHead + i+":nameInDisplayLocale", expectedItem.nameInDisplayLocale, newItem.nameInDisplayLocale); + } } } } diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index 2cf9143ad..ecc1bf01a 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -927,8 +927,9 @@ LocaleTest::TestGetLangsAndCountries() ; /* TODO: Change this test to be more like the cloctst version? */ - if (testCount != 595) - errln("Expected getISOLanguages() to return 595 languages; it returned %d", testCount); + // Allow more than a min number of languages provided in AOSP + if (testCount < 595) + errln("Expected getISOLanguages() to return at least 595 languages; it returned %d", testCount); else { for (i = 0; i < 15; i++) { int32_t j; diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ULocaleCollationTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ULocaleCollationTest.java index 170e51c12..185bb7086 100644 --- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ULocaleCollationTest.java +++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/util/ULocaleCollationTest.java @@ -311,17 +311,18 @@ public class ULocaleCollationTest extends TestFmwk { expected.add(new UiListItem(new ULocale(rawRow[2]), new ULocale(rawRow[3]), rawRow[0], rawRow[1])); } List<UiListItem> newList = names.getUiList(list, false, collator); - if (!expected.equals(newList)) { - if (expected.size() != newList.size()) { - errln(list.toString() + ": wrong size" + expected + ", " + newList); - } else { - errln(list.toString()); - for (int i = 0; i < expected.size(); ++i) { - assertEquals(i+"", expected.get(i), newList.get(i)); - } - } + // Android-changed: Checking nameInSelf is not necessary. + if (expected.size() != newList.size()) { + errln(list.toString() + ": wrong size" + expected + ", " + newList); } else { - assertEquals(list.toString(), expected, newList); + String msgHead = list.toString() + ":"; + for (int i = 0; i < expected.size(); ++i) { + UiListItem expectedItem = expected.get(i); + UiListItem newItem = newList.get(i); + assertEquals(msgHead + i+":minimized", expectedItem.minimized, newItem.minimized); + assertEquals(msgHead + i+":modified", expectedItem.modified, newItem.modified); + assertEquals(msgHead + i+":nameInDisplayLocale", expectedItem.nameInDisplayLocale, newItem.nameInDisplayLocale); + } } } } |