diff options
| author | Narayan Kamath <narayan@google.com> | 2014-11-27 14:40:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-27 14:40:34 +0000 |
| commit | 765a6c4ece178f90c3b5c2ddd1693c81700113ff (patch) | |
| tree | 09a45363ef722fdc5350e0a5b9f4641780cb097c | |
| parent | 6b00fa98129943f74e3209a46fde18d36bd7cf56 (diff) | |
| parent | 85e839fc507baedf3a7b99c3269ab54208eb6f25 (diff) | |
| download | libcore-765a6c4ece178f90c3b5c2ddd1693c81700113ff.zip libcore-765a6c4ece178f90c3b5c2ddd1693c81700113ff.tar.gz libcore-765a6c4ece178f90c3b5c2ddd1693c81700113ff.tar.bz2 | |
Merge "Track CLDR-26 updates to currency data."
| -rw-r--r-- | harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java | 4 | ||||
| -rw-r--r-- | luni/src/test/java/libcore/java/util/CurrencyTest.java | 2 |
2 files changed, 3 insertions, 3 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"}; 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 @@ public class CurrencyTest extends junit.framework.TestCase { 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 { |