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/BreakIteratorProviderTest.java
+++ new/test/java/util/PluggableLocale/BreakIteratorProviderTest.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 *
19 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
↓ open down ↓ |
7 lines elided |
↑ open up ↑ |
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 29 import sun.text.resources.*;
30 -import sun.util.*;
30 +import sun.util.locale.provider.*;
31 31 import sun.util.resources.*;
32 32
33 33 public class BreakIteratorProviderTest extends ProviderTest {
34 34
35 35 com.foo.BreakIteratorProviderImpl bip = new com.foo.BreakIteratorProviderImpl();
36 36 List<Locale> availloc = Arrays.asList(BreakIterator.getAvailableLocales());
37 37 List<Locale> providerloc = Arrays.asList(bip.getAvailableLocales());
38 - List<Locale> jreloc = Arrays.asList(LocaleData.getAvailableLocales());
38 + List<Locale> jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales());
39 + List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getBreakIteratorProvider().getAvailableLocales());
39 40
40 41 private static final int CHARACTER_INDEX = 0;
41 42 private static final int WORD_INDEX = 1;
42 43 private static final int LINE_INDEX = 2;
43 44 private static final int SENTENCE_INDEX = 3;
44 45
45 46 public static void main(String[] s) {
46 47 new BreakIteratorProviderTest();
47 48 }
48 49
49 50 BreakIteratorProviderTest() {
50 51 availableLocalesTest();
51 52 objectValidityTest();
52 53 }
53 54
54 55 void availableLocalesTest() {
55 56 Set<Locale> localesFromAPI = new HashSet<Locale>(availloc);
56 - Set<Locale> localesExpected = new HashSet<Locale>(jreloc);
57 + Set<Locale> localesExpected = new HashSet<Locale>(jreimplloc);
58 + localesExpected.remove(Locale.ROOT);
57 59 localesExpected.addAll(providerloc);
58 60 if (localesFromAPI.equals(localesExpected)) {
59 61 System.out.println("availableLocalesTest passed.");
60 62 } else {
61 63 throw new RuntimeException("availableLocalesTest failed");
62 64 }
63 65 }
64 66
65 67 void objectValidityTest() {
66 68
67 69 for (Locale target: availloc) {
68 70 // pure JRE implementation
69 - ResourceBundle rb = ResourceBundle.getBundle(
71 + ResourceBundle rb = LocaleProviderAdapter.forJRE().getLocaleData().getBundle(
70 72 "sun.text.resources.BreakIteratorInfo", target);
71 73 String[] classNames = rb.getStringArray("BreakIteratorClasses");
72 - boolean jreSupportsLocale = jreloc.contains(target);
74 + boolean jreSupportsLocale = jreimplloc.contains(target);
73 75
74 76 // result object
75 77 String[] result = new String[4];
76 78 result[0] = BreakIterator.getCharacterInstance(target).getClass().getName();
77 79 result[1] = BreakIterator.getWordInstance(target).getClass().getName();
78 80 result[2] = BreakIterator.getLineInstance(target).getClass().getName();
79 81 result[3] = BreakIterator.getSentenceInstance(target).getClass().getName();
80 82
81 83 // provider's object (if any)
82 84 String[] providersResult = new String[4];
83 85 if (providerloc.contains(target)) {
|
↓ open down ↓ |
1 lines elided |
↑ open up ↑ |
84 86 providersResult[0] = bip.getCharacterInstance(target).getClass().getName();
85 87 providersResult[1] = bip.getWordInstance(target).getClass().getName();
86 88 providersResult[2] = bip.getLineInstance(target).getClass().getName();
87 89 providersResult[3] = bip.getSentenceInstance(target).getClass().getName();
88 90 }
89 91
90 92 // JRE
91 93 String[] jresResult = new String[4];
92 94 if (jreSupportsLocale) {
93 95 for (int i = 0; i < 4; i++) {
94 - jresResult[i] = "java.text."+classNames[i];
96 + jresResult[i] = "sun.util.locale.provider."+classNames[i];
95 97 }
96 98 }
97 99
98 100 for (int i = 0; i < 4; i++) {
99 101 checkValidity(target, jresResult[i], providersResult[i], result[i], jreSupportsLocale);
100 102 }
101 103 }
102 104 }
103 105 }
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX