author | sundar |
Wed, 26 Oct 2016 10:42:55 +0530 | |
changeset 41766 | b5eab76a23a9 |
parent 41750 | 25ee1c2ee27e |
child 43185 | d75d9ff8d4e7 |
permissions | -rw-r--r-- |
36511 | 1 |
/* |
2 |
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
|
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
*/ |
|
23 |
||
24 |
import java.nio.file.Path; |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
25 |
import java.util.Arrays; |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
26 |
import java.util.ArrayList; |
36511 | 27 |
import java.util.List; |
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
28 |
import java.util.Locale; |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
29 |
import java.util.stream.Collectors; |
36511 | 30 |
|
31 |
import jdk.tools.jlink.plugin.Plugin; |
|
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
32 |
import jdk.tools.jlink.plugin.PluginException; |
36511 | 33 |
import jdk.tools.jlink.internal.PluginRepository; |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
34 |
import jdk.tools.jlink.internal.TaskHelper; |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
35 |
import jdk.tools.jlink.internal.plugins.PluginsResourceBundle; |
36511 | 36 |
import tests.Helper; |
37 |
import tests.JImageGenerator; |
|
38 |
import tests.JImageValidator; |
|
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
39 |
import tests.Result; |
36511 | 40 |
|
41 |
/* |
|
42 |
* @test |
|
41750
25ee1c2ee27e
8165804: Revisit the way of loading BreakIterator rules/dictionaries
okutsu
parents:
41229
diff
changeset
|
43 |
* @bug 8152143 8152704 8155649 8165804 |
36511 | 44 |
* @summary IncludeLocalesPlugin tests |
45 |
* @author Naoto Sato |
|
46 |
* @library ../../lib |
|
47 |
* @modules java.base/jdk.internal.jimage |
|
48 |
* jdk.jdeps/com.sun.tools.classfile |
|
49 |
* jdk.jlink/jdk.tools.jlink.internal |
|
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
50 |
* jdk.jlink/jdk.tools.jlink.internal.plugins |
36511 | 51 |
* jdk.jlink/jdk.tools.jmod |
52 |
* jdk.jlink/jdk.tools.jimage |
|
53 |
* jdk.compiler |
|
54 |
* @build tests.* |
|
55 |
* @build tools.jlink.plugins.GetAvailableLocales |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
56 |
* @run main/othervm -Xmx1g IncludeLocalesPluginTest |
36511 | 57 |
*/ |
58 |
public class IncludeLocalesPluginTest { |
|
59 |
||
60 |
private final static String moduleName = "IncludeLocalesTest"; |
|
61 |
private static Helper helper; |
|
62 |
private final static int INCLUDE_LOCALES_OPTION = 0; |
|
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
63 |
private final static int ADDMODS_OPTION = 1; |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
64 |
private final static int EXPECTED_LOCATIONS = 2; |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
65 |
private final static int UNEXPECTED_PATHS = 3; |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
66 |
private final static int AVAILABLE_LOCALES = 4; |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
67 |
private final static int ERROR_MESSAGE = 5; |
36511 | 68 |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
69 |
private static int errors; |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
70 |
|
36511 | 71 |
private final static Object[][] testData = { |
72 |
// without --include-locales option: should include all locales |
|
73 |
{ |
|
74 |
"", |
|
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
75 |
"jdk.localedata", |
36511 | 76 |
List.of( |
77 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", |
|
78 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
79 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class", |
|
80 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", |
|
81 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
|
82 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", |
|
83 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class", |
|
84 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), |
|
85 |
List.of(), |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
86 |
Arrays.stream(Locale.getAvailableLocales()) |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
87 |
// "(root)" for Locale.ROOT rather than "" |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
88 |
.map(loc -> loc.equals(Locale.ROOT) ? "(root)" : loc.toString()) |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
89 |
.collect(Collectors.toList()), |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
90 |
"", |
36511 | 91 |
}, |
92 |
||
39734 | 93 |
// Asterisk works exactly the same as above |
94 |
{ |
|
41229
61e0df02e2dd
8166645: Include locales plugin throws InternalError with "*" specified.
naoto
parents:
40813
diff
changeset
|
95 |
"--include-locales=*", |
39734 | 96 |
"jdk.localedata", |
97 |
List.of( |
|
98 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", |
|
99 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
100 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class", |
|
101 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", |
|
102 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
|
103 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", |
|
104 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class", |
|
105 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), |
|
106 |
List.of(), |
|
107 |
Arrays.stream(Locale.getAvailableLocales()) |
|
108 |
// "(root)" for Locale.ROOT rather than "" |
|
109 |
.map(loc -> loc.equals(Locale.ROOT) ? "(root)" : loc.toString()) |
|
110 |
.collect(Collectors.toList()), |
|
111 |
"", |
|
112 |
}, |
|
113 |
||
114 |
// World English/Spanish in Latin America |
|
115 |
{ |
|
116 |
"--include-locales=en-001,es-419", |
|
117 |
"jdk.localedata", |
|
118 |
List.of( |
|
119 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_AU.class", |
|
120 |
"/jdk.localedata/sun/text/resources/ext/FormatData_es.class", |
|
121 |
"/jdk.localedata/sun/text/resources/ext/FormatData_es_AR.class", |
|
122 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
|
123 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_150.class", |
|
124 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_AT.class", |
|
125 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_es.class", |
|
126 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_es_419.class", |
|
127 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_es_AR.class"), |
|
128 |
List.of( |
|
40813
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
129 |
"/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
130 |
"/jdk.localedata/sun/text/resources/ext/thai_dict", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
131 |
"/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", |
39734 | 132 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", |
133 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
134 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class", |
|
135 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", |
|
136 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), |
|
137 |
List.of( |
|
138 |
"(root)", "en", "en_US", "en_US_POSIX", "en_001", "en_150", "en_AG", "en_AI", |
|
139 |
"en_AT", "en_AU", "en_BB", "en_BE", "en_BM", "en_BS", "en_BW", "en_BZ", |
|
140 |
"en_CA", "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_DE", |
|
141 |
"en_DG", "en_DK", "en_DM", "en_ER", "en_FI", "en_FJ", "en_FK", "en_FM", |
|
142 |
"en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GY", "en_HK", |
|
143 |
"en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_JE", "en_JM", "en_KE", |
|
144 |
"en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_MG", "en_MO", |
|
145 |
"en_MS", "en_MT", "en_MU", "en_MW", "en_MY", "en_NA", "en_NF", "en_NG", |
|
146 |
"en_NL", "en_NR", "en_NU", "en_NZ", "en_PG", "en_PH", "en_PK", "en_PN", |
|
147 |
"en_PW", "en_RW", "en_SB", "en_SC", "en_SD", "en_SE", "en_SG", "en_SH", |
|
148 |
"en_SI", "en_SL", "en_SS", "en_SX", "en_SZ", "en_TC", "en_TK", "en_TO", |
|
149 |
"en_TT", "en_TV", "en_TZ", "en_UG", "en_VC", "en_VG", "en_VU", "en_WS", |
|
150 |
"en_ZA", "en_ZM", "en_ZW", "es", "es_419", "es_AR", "es_BO", "es_BR", |
|
151 |
"es_CL", "es_CO", "es_CR", "es_CU", "es_DO", "es_EC", "es_GT", "es_HN", |
|
152 |
"es_MX", "es_NI", "es_PA", "es_PE", "es_PR", "es_PY", "es_SV", "es_US", |
|
153 |
"es_UY", "es_VE"), |
|
154 |
"", |
|
155 |
}, |
|
156 |
||
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
157 |
// All English and Japanese locales |
36511 | 158 |
{ |
159 |
"--include-locales=en,ja", |
|
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
160 |
"jdk.localedata", |
36511 | 161 |
List.of( |
162 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", |
|
163 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
164 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
|
165 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class"), |
|
166 |
List.of( |
|
40813
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
167 |
"/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
168 |
"/jdk.localedata/sun/text/resources/ext/thai_dict", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
169 |
"/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", |
36511 | 170 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", |
171 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class", |
|
172 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", |
|
173 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class", |
|
174 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
175 |
List.of( |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
176 |
"(root)", "en", "en_001", "en_150", "en_AG", "en_AI", "en_AS", "en_AT", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
177 |
"en_AU", "en_BB", "en_BE", "en_BI", "en_BM", "en_BS", "en_BW", "en_BZ", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
178 |
"en_CA", "en_CC", "en_CH", "en_CK", "en_CM", "en_CX", "en_CY", "en_DE", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
179 |
"en_DG", "en_DK", "en_DM", "en_ER", "en_FI", "en_FJ", "en_FK", "en_FM", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
180 |
"en_GB", "en_GD", "en_GG", "en_GH", "en_GI", "en_GM", "en_GU", "en_GY", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
181 |
"en_HK", "en_IE", "en_IL", "en_IM", "en_IN", "en_IO", "en_JE", "en_JM", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
182 |
"en_KE", "en_KI", "en_KN", "en_KY", "en_LC", "en_LR", "en_LS", "en_MG", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
183 |
"en_MH", "en_MO", "en_MP", "en_MS", "en_MT", "en_MU", "en_MW", "en_MY", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
184 |
"en_NA", "en_NF", "en_NG", "en_NL", "en_NR", "en_NU", "en_NZ", "en_PG", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
185 |
"en_PH", "en_PK", "en_PN", "en_PR", "en_PW", "en_RW", "en_SB", "en_SC", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
186 |
"en_SD", "en_SE", "en_SG", "en_SH", "en_SI", "en_SL", "en_SS", "en_SX", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
187 |
"en_SZ", "en_TC", "en_TK", "en_TO", "en_TT", "en_TV", "en_TZ", "en_UG", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
188 |
"en_UM", "en_US", "en_US_POSIX", "en_VC", "en_VG", "en_VI", "en_VU", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
189 |
"en_WS", "en_ZA", "en_ZM", "en_ZW", "ja", "ja_JP", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
190 |
"ja_JP_JP_#u-ca-japanese"), |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
191 |
"", |
36511 | 192 |
}, |
193 |
||
39734 | 194 |
// All locales in Austria |
195 |
{ |
|
196 |
"--include-locales=*-AT", |
|
197 |
"jdk.localedata", |
|
198 |
List.of( |
|
199 |
"/jdk.localedata/sun/text/resources/ext/FormatData_de.class", |
|
200 |
"/jdk.localedata/sun/text/resources/ext/FormatData_de_AT.class", |
|
201 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_de.class", |
|
202 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_de_AT.class", |
|
203 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
|
204 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_150.class", |
|
205 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_AT.class"), |
|
206 |
List.of( |
|
40813
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
207 |
"/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
208 |
"/jdk.localedata/sun/text/resources/ext/thai_dict", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
209 |
"/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", |
39734 | 210 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", |
211 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", |
|
212 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
213 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class", |
|
214 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", |
|
215 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), |
|
216 |
List.of( |
|
217 |
"(root)", "en", "en_US", "en_US_POSIX", "en_001", "en_150", "en_AT", |
|
218 |
"de", "de_AT"), |
|
219 |
"", |
|
220 |
}, |
|
221 |
||
36511 | 222 |
// All locales in India |
223 |
{ |
|
224 |
"--include-locales=*-IN", |
|
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
225 |
"jdk.localedata", |
36511 | 226 |
List.of( |
227 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_IN.class", |
|
228 |
"/jdk.localedata/sun/text/resources/ext/FormatData_hi_IN.class", |
|
229 |
"/jdk.localedata/sun/util/resources/cldr/ext/CalendarData_as_IN.class", |
|
230 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
|
231 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_IN.class", |
|
232 |
"/jdk.localedata/sun/util/resources/cldr/ext/CalendarData_kok_IN.class", |
|
38747 | 233 |
"/jdk.localedata/sun/util/resources/cldr/ext/CalendarData_pa_Guru_IN.class"), |
36511 | 234 |
List.of( |
40813
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
235 |
"/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
236 |
"/jdk.localedata/sun/text/resources/ext/thai_dict", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
237 |
"/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", |
36511 | 238 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", |
41750
25ee1c2ee27e
8165804: Revisit the way of loading BreakIterator rules/dictionaries
okutsu
parents:
41229
diff
changeset
|
239 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorResources_th.class", |
36511 | 240 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", |
241 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
242 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class", |
|
243 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", |
|
244 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", |
|
245 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class", |
|
246 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
247 |
List.of( |
39734 | 248 |
"(root)", "as_IN", "as", "bn_IN", "bn", "bo_IN", "bo", "brx_IN", "brx", |
249 |
"en", "en_001", "en_IN", "en_US", "en_US_POSIX", "gu_IN", "gu", "hi_IN", |
|
250 |
"hi", "kn_IN", "kn", "kok_IN", "kok", "ks_IN", "ks", "ml_IN", "ml", |
|
251 |
"mr_IN", "mr", "ne_IN", "ne", "or_IN", "or", "pa_IN", "pa", "pa_IN_#Guru", |
|
252 |
"pa__#Guru", "ta_IN", "ta", "te_IN", "te", "ur_IN", "ur"), |
|
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
253 |
"", |
36511 | 254 |
}, |
255 |
||
256 |
// Thai |
|
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
257 |
{ |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
258 |
"--include-locales=th", |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
259 |
"jdk.localedata", |
36511 | 260 |
List.of( |
40813
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
261 |
"/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
262 |
"/jdk.localedata/sun/text/resources/ext/thai_dict", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
263 |
"/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", |
36511 | 264 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", |
41750
25ee1c2ee27e
8165804: Revisit the way of loading BreakIterator rules/dictionaries
okutsu
parents:
41229
diff
changeset
|
265 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorResources_th.class", |
36511 | 266 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class"), |
267 |
List.of( |
|
268 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", |
|
269 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
270 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", |
|
271 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
|
272 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", |
|
273 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
274 |
List.of( |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
275 |
"(root)", "en", "en_US", "en_US_POSIX", "th", "th_TH", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
276 |
"th_TH_TH_#u-nu-thai"), |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
277 |
"", |
36511 | 278 |
}, |
279 |
||
280 |
// Hong Kong |
|
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
281 |
{ |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
282 |
"--include-locales=zh-HK", |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
283 |
"jdk.localedata", |
36511 | 284 |
List.of( |
285 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", |
|
286 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh_HK.class", |
|
287 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh_TW.class", |
|
288 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), |
|
289 |
List.of( |
|
40813
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
290 |
"/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
291 |
"/jdk.localedata/sun/text/resources/ext/thai_dict", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
292 |
"/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", |
36511 | 293 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", |
294 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", |
|
295 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
296 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class", |
|
39734 | 297 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh_CN.class", |
36511 | 298 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
299 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", |
|
300 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
301 |
List.of( |
39734 | 302 |
"(root)", "en", "en_US", "en_US_POSIX", "zh", "zh__#Hans", "zh__#Hant", |
303 |
"zh_HK", "zh_HK_#Hans", "zh_HK_#Hant"), |
|
304 |
"", |
|
305 |
}, |
|
306 |
||
307 |
// Simplified Chinese |
|
308 |
{ |
|
309 |
"--include-locales=zh-Hans", |
|
310 |
"jdk.localedata", |
|
311 |
List.of( |
|
312 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh.class", |
|
313 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh_CN.class", |
|
314 |
"/jdk.localedata/sun/text/resources/ext/FormatData_zh_SG.class", |
|
315 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"), |
|
316 |
List.of( |
|
40813
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
317 |
"/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
318 |
"/jdk.localedata/sun/text/resources/ext/thai_dict", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
319 |
"/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", |
39734 | 320 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", |
321 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", |
|
322 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
323 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class", |
|
324 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
|
325 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", |
|
326 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), |
|
327 |
List.of( |
|
328 |
"(root)", "en", "en_US", "en_US_POSIX", "zh", "zh__#Hans", "zh_CN", |
|
329 |
"zh_CN_#Hans", "zh_HK_#Hans", "zh_MO_#Hans", "zh_SG", "zh_SG_#Hans"), |
|
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
330 |
"", |
36511 | 331 |
}, |
332 |
||
333 |
// Norwegian |
|
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
334 |
{ |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
335 |
"--include-locales=nb,nn,no", |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
336 |
"jdk.localedata", |
36511 | 337 |
List.of( |
338 |
"/jdk.localedata/sun/text/resources/ext/FormatData_no.class", |
|
339 |
"/jdk.localedata/sun/text/resources/ext/FormatData_no_NO.class", |
|
340 |
"/jdk.localedata/sun/text/resources/ext/FormatData_no_NO_NY.class", |
|
341 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_nb.class", |
|
342 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_nn.class"), |
|
343 |
List.of( |
|
40813
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
344 |
"/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
345 |
"/jdk.localedata/sun/text/resources/ext/thai_dict", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
346 |
"/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", |
36511 | 347 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", |
348 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", |
|
349 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
350 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class", |
|
351 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
|
352 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", |
|
353 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
354 |
List.of( |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
355 |
"(root)", "en", "en_US", "en_US_POSIX", "nb", "nb_NO", "nb_SJ", "nn", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
356 |
"nn_NO", "no", "no_NO", "no_NO_NY"), |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
357 |
"", |
36511 | 358 |
}, |
359 |
||
360 |
// Hebrew/Indonesian/Yiddish |
|
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
361 |
{ |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
362 |
"--include-locales=he,id,yi", |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
363 |
"jdk.localedata", |
36511 | 364 |
List.of( |
365 |
"/jdk.localedata/sun/text/resources/ext/FormatData_in.class", |
|
366 |
"/jdk.localedata/sun/text/resources/ext/FormatData_in_ID.class", |
|
367 |
"/jdk.localedata/sun/text/resources/ext/FormatData_iw.class", |
|
368 |
"/jdk.localedata/sun/text/resources/ext/FormatData_iw_IL.class", |
|
369 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_in.class", |
|
370 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_iw.class", |
|
371 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ji.class"), |
|
372 |
List.of( |
|
40813
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
373 |
"/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
374 |
"/jdk.localedata/sun/text/resources/ext/thai_dict", |
dd5aa9c67561
8165605: Thai resources in jdk.localedata cause split package issue with java.base
naoto
parents:
39734
diff
changeset
|
375 |
"/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th", |
36511 | 376 |
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class", |
377 |
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class", |
|
378 |
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class", |
|
379 |
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class", |
|
380 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class", |
|
381 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class", |
|
382 |
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class"), |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
383 |
List.of( |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
384 |
"(root)", "en", "en_US", "en_US_POSIX", "in", "in_ID", "iw", "iw_IL", |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
385 |
"ji", "ji_001"), |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
386 |
"", |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
387 |
}, |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
388 |
|
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
389 |
// Error case: No matching locales |
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
390 |
{ |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
391 |
"--include-locales=xyz", |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
392 |
"jdk.localedata", |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
393 |
null, |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
394 |
null, |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
395 |
null, |
36739
145210aba850
8152704: jlink command line output/help message improvement
naoto
parents:
36666
diff
changeset
|
396 |
new PluginException(String.format( |
145210aba850
8152704: jlink command line output/help message improvement
naoto
parents:
36666
diff
changeset
|
397 |
PluginsResourceBundle.getMessage("include-locales.nomatchinglocales"), "xyz")) |
145210aba850
8152704: jlink command line output/help message improvement
naoto
parents:
36666
diff
changeset
|
398 |
.getMessage(), |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
399 |
}, |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
400 |
|
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
401 |
// Error case: Invalid argument |
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
402 |
{ |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
403 |
"--include-locales=en,zh_HK", |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
404 |
"jdk.localedata", |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
405 |
null, |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
406 |
null, |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
407 |
null, |
36739
145210aba850
8152704: jlink command line output/help message improvement
naoto
parents:
36666
diff
changeset
|
408 |
new PluginException(String.format( |
39734 | 409 |
PluginsResourceBundle.getMessage("include-locales.invalidtag"), "zh_hk")) |
36739
145210aba850
8152704: jlink command line output/help message improvement
naoto
parents:
36666
diff
changeset
|
410 |
.getMessage(), |
36511 | 411 |
}, |
37790
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
412 |
|
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
413 |
// Error case: jdk.localedata is not added |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
414 |
{ |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
415 |
"--include-locales=en-US", |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
416 |
"java.base", |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
417 |
null, |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
418 |
null, |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
419 |
null, |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
420 |
new PluginException( |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
421 |
PluginsResourceBundle.getMessage("include-locales.localedatanotfound")) |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
422 |
.getMessage(), |
71c730d5e73a
8155649: IncludeLocalesPlugin throws NPE when jdk.localedata not resolved
naoto
parents:
36739
diff
changeset
|
423 |
}, |
36511 | 424 |
}; |
425 |
||
426 |
public static void main(String[] args) throws Exception { |
|
427 |
helper = Helper.newHelper(); |
|
428 |
if (helper == null) { |
|
429 |
System.err.println("Test not run"); |
|
430 |
return; |
|
431 |
} |
|
432 |
helper.generateDefaultModules(); |
|
433 |
||
434 |
for (Object[] data : testData) { |
|
435 |
// create image for each test data |
|
41766 | 436 |
Result result; |
437 |
if (data[INCLUDE_LOCALES_OPTION].toString().isEmpty()) { |
|
438 |
System.out.println("Invoking jlink with no --include-locales option"); |
|
439 |
result = JImageGenerator.getJLinkTask() |
|
440 |
.modulePath(helper.defaultModulePath()) |
|
441 |
.output(helper.createNewImageDir(moduleName)) |
|
442 |
.addMods((String) data[ADDMODS_OPTION]) |
|
443 |
.call(); |
|
444 |
} else { |
|
445 |
System.out.println("Invoking jlink with \"" + data[INCLUDE_LOCALES_OPTION] + "\""); |
|
446 |
result = JImageGenerator.getJLinkTask() |
|
36511 | 447 |
.modulePath(helper.defaultModulePath()) |
448 |
.output(helper.createNewImageDir(moduleName)) |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
449 |
.addMods((String) data[ADDMODS_OPTION]) |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
450 |
.option((String) data[INCLUDE_LOCALES_OPTION]) |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
451 |
.call(); |
41766 | 452 |
} |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
453 |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
454 |
String errorMsg = (String) data[ERROR_MESSAGE]; |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
455 |
if (errorMsg.isEmpty()) { |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
456 |
Path image = result.assertSuccess(); |
36511 | 457 |
|
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
458 |
// test locale data entries |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
459 |
testLocaleDataEntries(image, |
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
460 |
(List<String>) data[EXPECTED_LOCATIONS], |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
461 |
(List<String>) data[UNEXPECTED_PATHS]); |
36511 | 462 |
|
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
463 |
// test available locales |
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
464 |
testAvailableLocales(image, (List<String>) data[AVAILABLE_LOCALES]); |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
465 |
} else { |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
466 |
result.assertFailure(new TaskHelper(TaskHelper.JLINK_BUNDLE) |
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
467 |
.getMessage("error.prefix") + " " +errorMsg); |
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
468 |
System.out.println("\tExpected failure: " + result.getMessage()); |
36666
bf6dce37a2f0
8152143: jlink --include-locales should gracefully detect certain user error
naoto
parents:
36511
diff
changeset
|
469 |
} |
36511 | 470 |
} |
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
471 |
|
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
472 |
if (errors > 0) { |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
473 |
throw new RuntimeException("Test failed"); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
474 |
} |
36511 | 475 |
} |
476 |
||
477 |
private static void testLocaleDataEntries(Path image, List<String> expectedLocations, |
|
478 |
List<String> unexpectedPaths) throws Exception { |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
479 |
System.out.println("testLocaleDataEntries:"); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
480 |
try { |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
481 |
JImageValidator.validate( |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
482 |
image.resolve("lib").resolve("modules"), |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
483 |
expectedLocations, unexpectedPaths); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
484 |
} catch (Exception e) { |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
485 |
System.out.println("\tFailed with: " + e); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
486 |
e.printStackTrace(); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
487 |
errors++; |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
488 |
} |
36511 | 489 |
} |
490 |
||
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
491 |
private static void testAvailableLocales(Path image, List<String> availableLocales) throws Exception { |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
492 |
System.out.println("testAvailableLocales:"); |
36511 | 493 |
Path launcher = image.resolve("bin/java" + |
494 |
(System.getProperty("os.name").startsWith("Windows") ? ".exe" : "")); |
|
39051
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
495 |
List<String> args = new ArrayList<>(availableLocales.size() + 2); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
496 |
args.add(launcher.toString()); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
497 |
args.add("GetAvailableLocales"); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
498 |
args.addAll(availableLocales); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
499 |
Process proc = new ProcessBuilder(args).inheritIO().start(); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
500 |
|
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
501 |
int len = Math.min(10, args.size()); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
502 |
String command = args.subList(0, len).stream().collect(Collectors.joining(" ")) |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
503 |
+ (len < availableLocales.size() ? " ..." : ""); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
504 |
|
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
505 |
int status = proc.waitFor(); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
506 |
if (status == 0) { |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
507 |
System.out.println("\tDone\t" + command); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
508 |
} else { |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
509 |
System.out.println("\tExit " + status + "\t" + command); |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
510 |
errors++; |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
511 |
} |
1b0204c55914
8158272: IncludeLocalesPluginTest.java fails with timeout
okutsu
parents:
38747
diff
changeset
|
512 |
System.out.println(); |
36511 | 513 |
} |
514 |
} |