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/DateFormatSymbolsProviderTest.java
+++ new/test/java/util/PluggableLocale/DateFormatSymbolsProviderTest.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 DateFormatSymbolsProviderTest extends ProviderTest {
33 33
34 34 com.foo.DateFormatSymbolsProviderImpl dfsp = new com.foo.DateFormatSymbolsProviderImpl();
35 35 List<Locale> availloc = Arrays.asList(DateFormatSymbols.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().getDateFormatSymbolsProvider().getAvailableLocales());
38 39
39 40 public static void main(String[] s) {
40 41 new DateFormatSymbolsProviderTest();
41 42 }
42 43
43 44 DateFormatSymbolsProviderTest() {
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.getDateFormatData(target);
64 - boolean jreSupportsLocale = jreloc.contains(target);
65 + ResourceBundle rb = LocaleProviderAdapter.forJRE().getLocaleData().getDateFormatData(target);
66 + boolean jreSupportsLocale = jreimplloc.contains(target);
65 67
66 68 // JRE string arrays
67 69 String[][] jres = new String[6][];
68 70 if (jreSupportsLocale) {
69 71 try {
70 72 jres[0] = (String[])rb.getObject("MonthNames");
71 73 jres[1] = (String[])rb.getObject("MonthAbbreviations");
72 74 jres[2] = (String[])rb.getObject("DayNames");
73 75 jres[3] = (String[])rb.getObject("DayAbbreviations");
74 76 jres[4] = (String[])rb.getObject("AmPmMarkers");
75 77 jres[5] = (String[])rb.getObject("Eras");
76 78 } catch (MissingResourceException mre) {}
77 79 }
78 80
79 81 // result object
80 82 DateFormatSymbols dfs = DateFormatSymbols.getInstance(target);
81 83 String[][] result = new String[6][];
82 84 result[0] = dfs.getMonths();
83 85 result[1] = dfs.getShortMonths();
84 86 // note that weekdays are 1-based
85 87 String[] tmp = dfs.getWeekdays();
86 88 result[2] = new String[7];
87 89 System.arraycopy(tmp, 1, result[2], 0, result[2].length);
88 90 tmp = dfs.getShortWeekdays();
89 91 result[3] = new String[7];
90 92 System.arraycopy(tmp, 1, result[3], 0, result[3].length);
91 93 result[4] = dfs.getAmPmStrings();
92 94 result[5] = dfs.getEras();
93 95
94 96 // provider's object (if any)
95 97 DateFormatSymbols providersDfs= null;
96 98 String[][] providers = new String[6][];
97 99 if (providerloc.contains(target)) {
98 100 providersDfs = dfsp.getInstance(target);
99 101 providers[0] = providersDfs.getMonths();
100 102 providers[1] = providersDfs.getShortMonths();
101 103 // note that weekdays are 1-based
102 104 tmp = dfs.getWeekdays();
103 105 providers[2] = new String[7];
104 106 System.arraycopy(tmp, 1, providers[2], 0, providers[2].length);
105 107 tmp = dfs.getShortWeekdays();
106 108 providers[3] = new String[7];
107 109 System.arraycopy(tmp, 1, providers[3], 0, providers[3].length);
108 110 providers[4] = providersDfs.getAmPmStrings();
109 111 providers[5] = providersDfs.getEras();
110 112 }
111 113
112 114 for (int i = 0; i < result.length; i ++) {
113 115 for (int j = 0; j < result[i].length; j++) {
114 116 String jresStr =
115 117 (jres[i] != null ? jres[i][j] : null);
116 118 String providersStr =
117 119 (providers[i] != null ? providers[i][j] : null);
118 120 String resultStr =
119 121 (result[i] != null ? result[i][j] : null);
120 122 checkValidity(target, jresStr, providersStr, resultStr, jreSupportsLocale);
121 123 }
122 124 }
123 125 }
124 126 }
125 127 }
|
↓ open down ↓ |
51 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX