Print this page
rev 5615 : 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 Jigsaw. by Naoto Sato and Masayoshi Okutsu)
Split |
Close |
Expand all |
Collapse all |
--- old/test/java/util/PluggableLocale/CollatorProviderTest.java
+++ new/test/java/util/PluggableLocale/CollatorProviderTest.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 CollatorProviderTest extends ProviderTest {
33 33
34 34 com.foo.CollatorProviderImpl cp = new com.foo.CollatorProviderImpl();
35 35 List<Locale> availloc = Arrays.asList(Collator.getAvailableLocales());
36 36 List<Locale> providerloc = Arrays.asList(cp.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().getCollatorProvider().getAvailableLocales());
38 39
39 40 public static void main(String[] s) {
40 41 new CollatorProviderTest();
41 42 }
42 43
43 44 CollatorProviderTest() {
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 Collator def = Collator.getInstance(new Locale(""));
61 63 String defrules = ((RuleBasedCollator)def).getRules();
62 64
63 65 for (Locale target: availloc) {
64 66 // pure JRE implementation
65 - ResourceBundle rb = LocaleData.getCollationData(target);
66 - boolean jreSupportsLocale = jreloc.contains(target);
67 + Set<Locale> jreimplloc = new HashSet<>();
68 + for (String tag : ((AvailableLanguageTags)LocaleProviderAdapter.forJRE().getCollatorProvider()).getAvailableLanguageTags()) {
69 + jreimplloc.add(Locale.forLanguageTag(tag));
70 + }
71 + ResourceBundle rb = LocaleProviderAdapter.forJRE().getLocaleData().getCollationData(target);
72 + boolean jreSupportsLocale = jreimplloc.contains(target);
67 73
68 74 // result object
69 75 Collator result = Collator.getInstance(target);
70 76
71 77 // provider's object (if any)
72 78 Collator providersResult = null;
73 79 if (providerloc.contains(target)) {
74 80 providersResult = cp.getInstance(target);
75 81 }
76 82
77 83 // JRE rule
78 84 Collator jresResult = null;
79 85 if (jreSupportsLocale) {
80 86 try {
81 87 String rules = rb.getString("Rule");
82 88 jresResult = new RuleBasedCollator(defrules+rules);
83 89 jresResult.setDecomposition(Collator.NO_DECOMPOSITION);
84 90 } catch (MissingResourceException mre) {
85 91 } catch (ParseException pe) {
86 92 }
87 93 }
88 94
89 95 checkValidity(target, jresResult, providersResult, result, jreSupportsLocale);
90 96 }
91 97 }
92 98 }
↓ open down ↓ |
16 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX