changeset 3089:f5708f506523

6807534: CurrencyNameProvider.getDisplayName(String, Locale) doesn't throw IllegalArgumentException Reviewed-by: okutsu
author naoto
date Wed, 24 Nov 2010 15:26:41 -0800
parents 13bbabfee6d4
children 9461aeec7d9c
files src/share/classes/java/util/spi/CurrencyNameProvider.java test/java/util/Currency/Bug6807534.java
diffstat 2 files changed, 103 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/util/spi/CurrencyNameProvider.java	Wed Nov 24 14:13:37 2010 +0900
+++ b/src/share/classes/java/util/spi/CurrencyNameProvider.java	Wed Nov 24 15:26:41 2010 -0800
@@ -25,7 +25,9 @@
 
 package java.util.spi;
 
+import java.util.Arrays;
 import java.util.Currency;
+import java.util.List;
 import java.util.Locale;
 
 /**
@@ -95,6 +97,23 @@
             throw new NullPointerException();
         }
 
+        // Check whether the currencyCode is valid
+        char[] charray = currencyCode.toCharArray();
+        if (charray.length != 3) {
+            throw new IllegalArgumentException("The currencyCode is not in the form of three upper-case letters.");
+        }
+        for (char c : charray) {
+            if (c < 'A' || c > 'Z') {
+                throw new IllegalArgumentException("The currencyCode is not in the form of three upper-case letters.");
+            }
+        }
+
+        // Check whether the locale is valid
+        List<Locale> avail = Arrays.asList(getAvailableLocales());
+        if (!avail.contains(locale)) {
+            throw new IllegalArgumentException("The locale is not available");
+        }
+
         return null;
     }
 }
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/java/util/Currency/Bug6807534.java	Wed Nov 24 15:26:41 2010 -0800
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 6807534
+ * @summary check whether the default implementation of
+ *    CurrencNameProvider.getDisplayName(String, Locale) throws appropriate
+ *    exceptions when necessary.
+ */
+
+import java.util.Locale;
+import java.util.spi.CurrencyNameProvider;
+
+public class Bug6807534 {
+
+    static final CurrencyNameProvider cnp = new CurrencyNameProviderImpl();
+
+    public static void main(String[] args) throws Exception {
+        // test for NullPointerException (currencyCode)
+        try {
+            cnp.getDisplayName(null, Locale.US);
+            throwException("NPE was not thrown with null currencyCode");
+        } catch (NullPointerException npe) {}
+
+        // test for NullPointerException (locale)
+        try {
+            cnp.getDisplayName("USD", null);
+            throwException("NPE was not thrown with null locale");
+        } catch (NullPointerException npe) {}
+
+        // test for IllegalArgumentException (illegal currencyCode)
+        try {
+            cnp.getDisplayName("INVALID", Locale.US);
+            throwException("IllegalArgumentException was not thrown with invalid currency code");
+        } catch (IllegalArgumentException iae) {}
+        try {
+            cnp.getDisplayName("inv", Locale.US);
+            throwException("IllegalArgumentException was not thrown with invalid currency code");
+        } catch (IllegalArgumentException iae) {}
+
+        // test for IllegalArgumentException (non-supported locale)
+        try {
+            cnp.getDisplayName("USD", Locale.JAPAN);
+            throwException("IllegalArgumentException was not thrown with non-supported locale");
+        } catch (IllegalArgumentException iae) {}
+    }
+
+    static void throwException(String msg) {
+        throw new RuntimeException("test failed. "+msg);
+    }
+
+    static class CurrencyNameProviderImpl extends CurrencyNameProvider {
+        // dummy implementation
+        public String getSymbol(String currencyCode, Locale locale) {
+            return "";
+        }
+
+        public Locale[] getAvailableLocales() {
+            Locale[] avail = new Locale[1];
+            avail[0] = Locale.US;
+            return avail;
+        }
+    }
+}