diff options
author | Narayan Kamath <narayan@google.com> | 2014-11-27 13:31:01 +0000 |
---|---|---|
committer | Narayan Kamath <narayan@google.com> | 2014-11-27 13:40:09 +0000 |
commit | 85e839fc507baedf3a7b99c3269ab54208eb6f25 (patch) | |
tree | cdc1e465b589176910ba5bb03f14e807b39dd46f /harmony-tests/src/test/java | |
parent | 659e01c3687b73a284612e500a3434d4b387c520 (diff) | |
download | libcore-85e839fc507baedf3a7b99c3269ab54208eb6f25.zip libcore-85e839fc507baedf3a7b99c3269ab54208eb6f25.tar.gz libcore-85e839fc507baedf3a7b99c3269ab54208eb6f25.tar.bz2 |
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
Diffstat (limited to 'harmony-tests/src/test/java')
-rw-r--r-- | harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ public class CurrencyTest extends junit.framework.TestCase { // 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 @@ public class CurrencyTest extends junit.framework.TestCase { // \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"}; |