Fix fallback in Currency.getSymbol(Locale).
If ICU doesn't have any localized symbol for a currency, we're supposed to
return the currency code, not null.
I introduced this bug in my recent changes. The Currency tests don't find it,
but DecimalFormatTest.test_setCurrencyLjava_util_Currency does, by accident.
I've added an explicit test.
diff --git a/luni/src/main/java/java/util/Currency.java b/luni/src/main/java/java/util/Currency.java
index ed9868f..6aa295a 100644
--- a/luni/src/main/java/java/util/Currency.java
+++ b/luni/src/main/java/java/util/Currency.java
@@ -174,7 +174,9 @@
return localeData.currencySymbol;
}
- return Resources.getCurrencySymbolNative(locale.toString(), currencyCode);
+ // Try ICU, and fall back to the currency code if ICU has nothing.
+ String symbol = Resources.getCurrencySymbolNative(locale.toString(), currencyCode);
+ return symbol != null ? symbol : currencyCode;
// END android-changed
}
diff --git a/luni/src/test/java/java/util/AllTests.java b/luni/src/test/java/java/util/AllTests.java
index fdeb03a..f675328 100644
--- a/luni/src/test/java/java/util/AllTests.java
+++ b/luni/src/test/java/java/util/AllTests.java
@@ -22,6 +22,7 @@
public class AllTests {
public static final Test suite() {
TestSuite suite = tests.TestSuiteFactory.createTestSuite();
+ suite.addTestSuite(java.util.CurrencyTest.class);
suite.addTestSuite(java.util.DateTest.class);
suite.addTestSuite(java.util.FormatterTest.class);
return suite;
diff --git a/luni/src/test/java/java/util/CurrencyTest.java b/luni/src/test/java/java/util/CurrencyTest.java
new file mode 100644
index 0000000..16111d5
--- /dev/null
+++ b/luni/src/test/java/java/util/CurrencyTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2010 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package java.util;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class CurrencyTest extends junit.framework.TestCase {
+ // Regression test to ensure that Currency.getSymbol(Locale) returns the
+ // currency code if ICU doesn't have a localization of the symbol. The
+ // harmony Currency tests don't test this, and their DecimalFormat tests
+ // only test it as a side-effect, and in a way that only detected my
+ // specific mistake of returning null (returning "stinky" would have
+ // passed).
+ public void test_getSymbol_fallback() throws Exception {
+ // This assumes that AED never becomes a currency important enough to
+ // Canada that Canadians give it a localized (to Canada) symbol.
+ assertEquals("AED", Currency.getInstance("AED").getSymbol(Locale.CANADA));
+ }
+}