Print this page
rev 5696 : 6336885: RFE: Locale Data Deployment Enhancements
4609153: Provide locale data for Indic locales
5104387: Support for gl_ES locale (galician language)
6337471: desktop/system locale preferences support
7056139: (cal) SPI support for locale-dependent Calendar parameters
7058206: Provide CalendarData SPI for week params and display field value names
7073852: Support multiple scripts for digits and decimal symbols per locale
7079560: [Fmt-Da] Context dependent month names support in SimpleDateFormat
7171324: getAvailableLocales() of locale sensitive services should return the actual availability of locales
7151414: (cal) Support calendar type identification
7168528: LocaleServiceProvider needs to be aware of Locale extensions
7171372: (cal) locale's default Calendar should be created if unknown calendar is specified
Summary: JEP 127: Improve Locale Data Packaging and Adopt Unicode CLDR Data (part 1 w/o packaging changes. by Naoto Sato and Masayoshi Okutsu)
Split |
Close |
Expand all |
Collapse all |
--- old/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java
+++ new/test/java/util/PluggableLocale/DecimalFormatSymbolsProviderTest.java
1 1 /*
2 - * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
2 + * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
↓ open down ↓ |
6 lines elided |
↑ open up ↑ |
19 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 * or visit www.oracle.com if you need additional information or have any
21 21 * questions.
22 22 */
23 23 /*
24 24 *
25 25 */
26 26
27 27 import java.text.*;
28 28 import java.util.*;
29 -import sun.util.*;
29 +import sun.util.locale.provider.*;
30 30 import sun.util.resources.*;
31 31
32 32 public class DecimalFormatSymbolsProviderTest extends ProviderTest {
33 33
34 34 com.foo.DecimalFormatSymbolsProviderImpl dfsp = new com.foo.DecimalFormatSymbolsProviderImpl();
35 35 List<Locale> availloc = Arrays.asList(DecimalFormatSymbols.getAvailableLocales());
36 36 List<Locale> providerloc = Arrays.asList(dfsp.getAvailableLocales());
37 - List<Locale> jreloc = Arrays.asList(LocaleData.getAvailableLocales());
37 + List<Locale> jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales());
38 + List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getDecimalFormatSymbolsProvider().getAvailableLocales());
38 39
39 40 public static void main(String[] s) {
40 41 new DecimalFormatSymbolsProviderTest();
41 42 }
42 43
43 44 DecimalFormatSymbolsProviderTest() {
44 45 availableLocalesTest();
45 46 objectValidityTest();
46 47 }
47 48
48 49 void availableLocalesTest() {
49 50 Set<Locale> localesFromAPI = new HashSet<Locale>(availloc);
50 - Set<Locale> localesExpected = new HashSet<Locale>(jreloc);
51 + Set<Locale> localesExpected = new HashSet<Locale>(jreimplloc);
52 + localesExpected.remove(Locale.ROOT);
51 53 localesExpected.addAll(providerloc);
52 54 if (localesFromAPI.equals(localesExpected)) {
53 55 System.out.println("availableLocalesTest passed.");
54 56 } else {
55 57 throw new RuntimeException("availableLocalesTest failed");
56 58 }
57 59 }
58 60
59 61 void objectValidityTest() {
60 62
61 63 for (Locale target: availloc) {
62 64 // pure JRE implementation
63 - ResourceBundle rb = LocaleData.getNumberFormatData(target);
64 - boolean jreSupportsLocale = jreloc.contains(target);
65 + ResourceBundle rb = LocaleProviderAdapter.forJRE().getLocaleData().getNumberFormatData(target);
66 + boolean jreSupportsLocale = jreimplloc.contains(target);
65 67
66 68 // JRE string arrays
67 69 String[] jres = new String[2];
68 70 if (jreSupportsLocale) {
69 71 try {
70 72 String[] tmp = rb.getStringArray("NumberElements");
71 73 jres[0] = tmp[9]; // infinity
72 74 jres[1] = tmp[10]; // NaN
73 75 } catch (MissingResourceException mre) {}
74 76 }
75 77
76 78 // result object
77 79 DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(target);
78 80 String[] result = new String[2];
79 81 result[0] = dfs.getInfinity();
80 82 result[1] = dfs.getNaN();
81 83
82 84 // provider's object (if any)
83 85 DecimalFormatSymbols providersDfs= null;
84 86 String[] providers = new String[2];
85 87 if (providerloc.contains(target)) {
86 88 providersDfs = dfsp.getInstance(target);
87 89 providers[0] = providersDfs.getInfinity();
88 90 providers[1] = providersDfs.getNaN();
89 91 }
90 92
91 93 for (int i = 0; i < result.length; i ++) {
92 94 checkValidity(target, jres[i], providers[i], result[i], jreSupportsLocale);
93 95 }
94 96 }
95 97 }
96 98 }
↓ open down ↓ |
22 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX