summaryrefslogtreecommitdiffstats
path: root/harmony-tests
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-11-27 14:48:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-27 14:48:23 +0000
commita15eb800707e8f0d14d5f8c0e1976c4931f2e2b4 (patch)
tree00e6dc4270aec236f1dae063d14810c88dbf2e05 /harmony-tests
parentbdd3184aca91e9a9e55fa44d01a664400ecb3c48 (diff)
parent765a6c4ece178f90c3b5c2ddd1693c81700113ff (diff)
downloadlibcore-a15eb800707e8f0d14d5f8c0e1976c4931f2e2b4.zip
libcore-a15eb800707e8f0d14d5f8c0e1976c4931f2e2b4.tar.gz
libcore-a15eb800707e8f0d14d5f8c0e1976c4931f2e2b4.tar.bz2
am 765a6c4e: Merge "Track CLDR-26 updates to currency data."
* commit '765a6c4ece178f90c3b5c2ddd1693c81700113ff': Track CLDR-26 updates to currency data.
Diffstat (limited to 'harmony-tests')
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java4
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"};