Fix CurrencyTest's expectation for CAD in fr_FR.

Fix this harmony test which we've been failing since our ICU update:

  Default Locale is: ja_JP. For locale fr_FR the Canadian Dollar currency
  returned $CA. Expected was one of these: [CA$, CAD, $, Can$, $Ca]

The upstream harmony test (which has diverged quite a bit) tests for "$CA"
instead of "$Ca".

diff --git a/libcore/luni/src/test/java/tests/api/java/util/CurrencyTest.java b/libcore/luni/src/test/java/tests/api/java/util/CurrencyTest.java
index b7a5648..14068a3 100644 (file)
--- a/libcore/luni/src/test/java/tests/api/java/util/CurrencyTest.java
+++ b/libcore/luni/src/test/java/tests/api/java/util/CurrencyTest.java
@@ -233,7 +233,7 @@ public class CurrencyTest extends junit.framework.TestCase {
         String[] dollar  = new String[] {"USD", "$", "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"};
+        String[] cDollar = new String[] {"CA$", "CAD", "$", "Can$", "$CA"};
         // END android-changed
 
         Currency currE   = Currency.getInstance("EUR");