Track CLDR-26 updates to currency data.
source/data/curr/it.txt : The "Svizzero" for CHF is now lowercase.
source/data/curr/fr_CA.txt : US dollars are now "$ US".
source/data/curr/en_GB.txt : Removed GB specific override ("$") for USD.
We now fall back to en_001 for USD, which is "US$".
Change-Id: I985897c67ed9ae831aa6b0eeb6d601a4adeeb2f9
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java
index 07256e4..a32845c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java
@@ -154,7 +154,7 @@
// BEGIN android-changed
assertEquals("currK.getSymbol()", "\u20a9", currK.getSymbol());
assertEquals("currI.getSymbol()", "IEP", currI.getSymbol());
- assertEquals("currUS.getSymbol()", "$", currUS.getSymbol());
+ assertEquals("currUS.getSymbol()", "US$", currUS.getSymbol());
// END android-changed
// Test what happens if the default is an invalid locale, one with the country Korea (KR)
@@ -220,7 +220,7 @@
// \u00a5 and \uffe5 are actually the same symbol, just different code points.
// But the RI returns the \uffe5 and Android returns those with \u00a5
String[] yen = new String[] {"JPY", "\u00a5", "\u00a5JP", "JP\u00a5", "\uffe5", "\uffe5JP", "JP\uffe5"};
- String[] dollar = new String[] {"USD", "$", "US$", "$US"};
+ String[] dollar = new String[] {"USD", "$", "US$", "$US", "$ US"};
// BEGIN android-changed
// Starting CLDR 1.7 release, currency symbol for CAD changed to CA$ in some locales such as ja.
String[] cDollar = new String[] {"CA$", "CAD", "$", "Can$", "$CA"};
diff --git a/luni/src/test/java/libcore/java/util/CurrencyTest.java b/luni/src/test/java/libcore/java/util/CurrencyTest.java
index cf2a1b6..08d5590 100644
--- a/luni/src/test/java/libcore/java/util/CurrencyTest.java
+++ b/luni/src/test/java/libcore/java/util/CurrencyTest.java
@@ -58,7 +58,7 @@
assertEquals("Swiss Franc", Currency.getInstance("CHF").getDisplayName(Locale.US));
assertEquals("Schweizer Franken", Currency.getInstance("CHF").getDisplayName(new Locale("de", "CH")));
assertEquals("franc suisse", Currency.getInstance("CHF").getDisplayName(new Locale("fr", "CH")));
- assertEquals("Franco Svizzero", Currency.getInstance("CHF").getDisplayName(new Locale("it", "CH")));
+ assertEquals("Franco svizzero", Currency.getInstance("CHF").getDisplayName(new Locale("it", "CH")));
}
public void test_getDefaultFractionDigits() throws Exception {