author | yzhou |
Mon, 15 Jul 2019 10:21:33 +0800 | |
changeset 55680 | cd48f8f260c8 |
parent 52584 | 5ab248e47901 |
permissions | -rw-r--r-- |
52584
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
1 |
/* |
55680
cd48f8f260c8
8227289: Enable assertions for some shell to java conversion tests after JDK-8218960
yzhou
parents:
52584
diff
changeset
|
2 |
* Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved. |
52584
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
4 |
* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
8 |
* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
13 |
* accompanied this code). |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
14 |
* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
18 |
* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
21 |
* questions. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
22 |
*/ |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
23 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
24 |
/* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
25 |
* @test |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
26 |
* @bug 8137317 8139238 8210408 |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
27 |
* @summary Visibility tests for ResourceBundle.getBundle with and without |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
28 |
* an unnamed module argument. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
29 |
* @library /test/lib |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
30 |
* .. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
31 |
* @build jdk.test.lib.JDKToolLauncher |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
32 |
* jdk.test.lib.Utils |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
33 |
* jdk.test.lib.compiler.CompilerUtils |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
34 |
* jdk.test.lib.process.ProcessTools |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
35 |
* ModuleTestUtil |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
36 |
* @run testng VisibilityTest |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
37 |
*/ |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
38 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
39 |
import java.nio.file.Path; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
40 |
import java.nio.file.Paths; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
41 |
import java.util.List; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
42 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
43 |
import jdk.test.lib.JDKToolLauncher; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
44 |
import jdk.test.lib.Utils; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
45 |
import jdk.test.lib.process.ProcessTools; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
46 |
import org.testng.annotations.BeforeTest; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
47 |
import org.testng.annotations.DataProvider; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
48 |
import org.testng.annotations.Test; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
49 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
50 |
import static org.testng.Assert.assertEquals; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
51 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
52 |
@Test |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
53 |
public class VisibilityTest { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
54 |
private static final Path SRC_DIR = Paths.get(Utils.TEST_SRC, "src"); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
55 |
private static final Path MODS_DIR = Paths.get(Utils.TEST_CLASSES, "mods"); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
56 |
private static final Path CLASSES_DIR = Paths.get(Utils.TEST_CLASSES, "classes"); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
57 |
private static final Path NAMED_BUNDLES_DIR = MODS_DIR.resolve("named.bundles"); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
58 |
private static final Path EXPORTED_NAMED_BUNDLES_DIR = MODS_DIR.resolve("exported.named.bundles"); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
59 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
60 |
private static final List<String> MODULE_LIST = List.of("embargo", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
61 |
"exported.named.bundles", "named.bundles", "test"); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
62 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
63 |
@BeforeTest |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
64 |
public void prepareTestEnv() throws Throwable { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
65 |
MODULE_LIST.forEach(mn -> ModuleTestUtil.prepareModule(SRC_DIR, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
66 |
MODS_DIR, mn, ".properties")); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
67 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
68 |
// Prepare resource bundles in an unnamed module |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
69 |
ModuleTestUtil.compilePkg(SRC_DIR, CLASSES_DIR, "pkg"); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
70 |
ModuleTestUtil.copyResFiles(SRC_DIR, CLASSES_DIR, "pkg", ".properties"); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
71 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
72 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
73 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
74 |
/** |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
75 |
* Package jdk.test is in named module "test". |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
76 |
* Package jdk.embargo is in named module "embargo". |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
77 |
* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
78 |
* jdk.{test,embargo}.TestWithUnnamedModuleArg call: |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
79 |
* ResourceBundle.getBundle(basename, classloader.getUnnamedModule()) |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
80 |
* where classloader is the TCCL or system class loader. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
81 |
* jdk.{test,embargo}.TestWithNoModuleArg call: |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
82 |
* ResourceBundle.getBundle(basename) |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
83 |
* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
84 |
* jdk.test.resources[.exported].classes.* are class-based resource bundles. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
85 |
* jdk.test.resources[.exported].props.* are properties file-based resource bundles. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
86 |
* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
87 |
* Packages jdk.test.resources.{classes,props} in named module "named.bundles" |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
88 |
* are exported only to named module "test". |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
89 |
* Packages jdk.test.resources.exported.{classes,props} in named module |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
90 |
* "exported.named.bundle" are exported to unnamed modules. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
91 |
*/ |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
92 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
93 |
@DataProvider(name = "RunWithTestResData") |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
94 |
Object[][] RunWithTestResData() { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
95 |
return new Object[][] { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
96 |
// Tests using jdk.test.TestWithNoModuleArg and jdk.embargo.TestWithNoModuleArg. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
97 |
// Neither of which specifies an unnamed module with ResourceBundle.getBundle(). |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
98 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
99 |
// jdk.test.resources.{classes,props}.* are available only to |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
100 |
// named module "test" by ResourceBundleProvider. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
101 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
102 |
"-m", "test/jdk.test.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
103 |
"jdk.test.resources.classes.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
104 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
105 |
"-m", "test/jdk.test.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
106 |
"jdk.test.resources.props.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
107 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
108 |
"-m", "embargo/jdk.embargo.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
109 |
"jdk.test.resources.classes.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
110 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
111 |
"-m", "embargo/jdk.embargo.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
112 |
"jdk.test.resources.props.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
113 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
114 |
// Add mods/named.bundles to the class path. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
115 |
{List.of("-cp", NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
116 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
117 |
"-m", "test/jdk.test.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
118 |
"jdk.test.resources.classes.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
119 |
{List.of("-cp", NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
120 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
121 |
"-m", "test/jdk.test.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
122 |
"jdk.test.resources.props.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
123 |
{List.of("-cp", NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
124 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
125 |
"-m", "embargo/jdk.embargo.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
126 |
"jdk.test.resources.classes.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
127 |
{List.of("-cp", NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
128 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
129 |
"-m", "embargo/jdk.embargo.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
130 |
"jdk.test.resources.props.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
131 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
132 |
// Tests using jdk.test.TestWithUnnamedModuleArg and |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
133 |
// jdk.embargo.TestWithUnnamedModuleArg. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
134 |
// Both of which specify an unnamed module with ResourceBundle.getBundle. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
135 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
136 |
// jdk.test.resources.classes is exported to named module "test". |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
137 |
// IllegalAccessException is thrown in ResourceBundle.Control.newBundle(). |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
138 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
139 |
"-m", "test/jdk.test.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
140 |
"jdk.test.resources.classes.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
141 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
142 |
// jdk.test.resources.props is exported to named module "test". |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
143 |
// loader.getResource() doesn't find jdk.test.resources.props.MyResources. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
144 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
145 |
"-m", "test/jdk.test.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
146 |
"jdk.test.resources.props.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
147 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
148 |
// IllegalAccessException is thrown in ResourceBundle.Control.newBundle(). |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
149 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
150 |
"-m", "embargo/jdk.embargo.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
151 |
"jdk.test.resources.classes.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
152 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
153 |
// jdk.test.resources.props is exported to named module "test". |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
154 |
// loader.getResource() doesn't find jdk.test.resources.props.MyResources. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
155 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
156 |
"-m", "embargo/jdk.embargo.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
157 |
"jdk.test.resources.props.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
158 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
159 |
// Add mods/named.bundles to the class path. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
160 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
161 |
// IllegalAccessException is thrown in ResourceBundle.Control.newBundle(). |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
162 |
{List.of("-cp", NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
163 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
164 |
"-m", "test/jdk.test.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
165 |
"jdk.test.resources.classes.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
166 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
167 |
// loader.getResource() finds jdk.test.resources.exported.props.MyResources. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
168 |
{List.of("-cp", NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
169 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
170 |
"-m", "test/jdk.test.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
171 |
"jdk.test.resources.props.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
172 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
173 |
// jdk.test.resources.exported.classes.MyResources is treated |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
174 |
// as if the class is in an unnamed module. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
175 |
{List.of("-cp", NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
176 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
177 |
"-m", "embargo/jdk.embargo.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
178 |
"jdk.test.resources.classes.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
179 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
180 |
// loader.getResource() finds jdk.test.resources.exported.props.MyResources. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
181 |
{List.of("-cp", NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
182 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
183 |
"-m", "embargo/jdk.embargo.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
184 |
"jdk.test.resources.props.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
185 |
}; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
186 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
187 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
188 |
@DataProvider(name = "RunWithExportedResData") |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
189 |
Object[][] RunWithExportedResData() { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
190 |
return new Object[][] { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
191 |
// Tests using jdk.test.TestWithNoModuleArg and jdk.embargo.TestWithNoModuleArg |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
192 |
// neither of which specifies an unnamed module with ResourceBundle.getBundle. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
193 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
194 |
// None of jdk.test.resources.exported.** is available to the named modules. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
195 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
196 |
"-m", "test/jdk.test.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
197 |
"jdk.test.resources.exported.classes.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
198 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
199 |
"-m", "test/jdk.test.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
200 |
"jdk.test.resources.exported.props.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
201 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
202 |
"-m", "embargo/jdk.embargo.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
203 |
"jdk.test.resources.exported.classes.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
204 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
205 |
"-m", "embargo/jdk.embargo.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
206 |
"jdk.test.resources.exported.props.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
207 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
208 |
// Add mods/exported.named.bundles to the class path. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
209 |
{List.of("-cp", EXPORTED_NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
210 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
211 |
"-m", "test/jdk.test.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
212 |
"jdk.test.resources.exported.classes.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
213 |
{List.of("-cp", EXPORTED_NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
214 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
215 |
"-m", "test/jdk.test.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
216 |
"jdk.test.resources.exported.props.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
217 |
{List.of("-cp", EXPORTED_NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
218 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
219 |
"-m", "embargo/jdk.embargo.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
220 |
"jdk.test.resources.exported.classes.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
221 |
{List.of("-cp", EXPORTED_NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
222 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
223 |
"-m", "embargo/jdk.embargo.TestWithNoModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
224 |
"jdk.test.resources.exported.props.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
225 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
226 |
// Tests using jdk.test.TestWithUnnamedModuleArg and |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
227 |
// jdk.embargo.TestWithUnnamedModuleArg which specify |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
228 |
// an unnamed module with ResourceBundle.getBundle. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
229 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
230 |
// loader.loadClass() doesn't find jdk.test.resources.exported.classes.MyResources |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
231 |
// and throws a ClassNotFoundException. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
232 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
233 |
"-m", "test/jdk.test.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
234 |
"jdk.test.resources.exported.classes.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
235 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
236 |
// The properties files in jdk.test.resources.exported.props |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
237 |
// are not found with loader.getResource(). |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
238 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
239 |
"-m", "test/jdk.test.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
240 |
"jdk.test.resources.exported.props.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
241 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
242 |
// loader.loadClass() doesn't find jdk.test.resources.exported.classes.MyResources |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
243 |
// and throws a ClassNotFoundException. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
244 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
245 |
"-m", "embargo/jdk.embargo.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
246 |
"jdk.test.resources.exported.classes.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
247 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
248 |
// The properties files in jdk.test.resources.exported.props are not found |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
249 |
// with loader.getResource(). |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
250 |
{List.of("-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
251 |
"-m", "embargo/jdk.embargo.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
252 |
"jdk.test.resources.exported.props.MyResources", "false")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
253 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
254 |
// Add mods/exported.named.bundles to the class path. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
255 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
256 |
// jdk.test.resources.exported.classes.MyResources.getModule().isNamed() |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
257 |
// returns false. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
258 |
{List.of("-cp", EXPORTED_NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
259 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
260 |
"-m", "test/jdk.test.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
261 |
"jdk.test.resources.exported.classes.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
262 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
263 |
// loader.getResource() finds jdk.test.resources.exported.props.MyResources. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
264 |
{List.of("-cp", EXPORTED_NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
265 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
266 |
"-m", "test/jdk.test.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
267 |
"jdk.test.resources.exported.props.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
268 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
269 |
// jdk.test.resources.exported.classes.MyResources.getModule().isNamed() |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
270 |
// returns false. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
271 |
{List.of("-cp", EXPORTED_NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
272 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
273 |
"-m", "embargo/jdk.embargo.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
274 |
"jdk.test.resources.exported.classes.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
275 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
276 |
// loader.getResource() finds jdk.test.resources.exported.props.MyResources. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
277 |
{List.of("-cp", EXPORTED_NAMED_BUNDLES_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
278 |
"-p", MODS_DIR.toString(), |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
279 |
"-m", "embargo/jdk.embargo.TestWithUnnamedModuleArg", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
280 |
"jdk.test.resources.exported.props.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
281 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
282 |
}; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
283 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
284 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
285 |
@DataProvider(name = "RunWithPkgResData") |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
286 |
Object[][] RunWithPkgResData() { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
287 |
return new Object[][] { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
288 |
// jdk.pkg.resources.* are in an unnamed module. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
289 |
// jdk.pkg.test.Main calls ResourceBundle.getBundle with an unnamed module. |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
290 |
{ List.of("-cp", CLASSES_DIR.resolve("pkg").toString(), "jdk.pkg.test.Main", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
291 |
"jdk.pkg.resources.classes.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
292 |
{ List.of("-cp", CLASSES_DIR.resolve("pkg").toString(), "jdk.pkg.test.Main", |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
293 |
"jdk.pkg.resources.props.MyResources", "true")}, |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
294 |
}; |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
295 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
296 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
297 |
/** |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
298 |
* Test cases with jdk.test.resources.* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
299 |
*/ |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
300 |
@Test(dataProvider = "RunWithTestResData") |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
301 |
public void RunWithTestRes(List<String> argsList) throws Throwable { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
302 |
int exitCode = runCmd(argsList); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
303 |
assertEquals(exitCode, 0, "Execution of the tests with " |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
304 |
+ "jdk.test.resources.* failed. " |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
305 |
+ "Unexpected exit code: " + exitCode); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
306 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
307 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
308 |
/** |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
309 |
* Test cases with jdk.test.resources.exported.* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
310 |
*/ |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
311 |
@Test(dataProvider = "RunWithExportedResData") |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
312 |
public void RunWithExportedRes(List<String> argsList) throws Throwable { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
313 |
int exitCode = runCmd(argsList); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
314 |
assertEquals(exitCode, 0, "Execution of the tests with " |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
315 |
+ "jdk.test.resources.exported.* failed. " |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
316 |
+ "Unexpected exit code: " + exitCode); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
317 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
318 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
319 |
/** |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
320 |
* Test cases with jdk.pkg.resources.* |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
321 |
*/ |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
322 |
@Test(dataProvider = "RunWithPkgResData") |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
323 |
public void RunWithPkgRes(List<String> argsList) throws Throwable { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
324 |
int exitCode = runCmd(argsList); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
325 |
assertEquals(exitCode, 0, "Execution of the tests with " |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
326 |
+ "jdk.pkg.resources.* failed. " |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
327 |
+ "Unexpected exit code: " + exitCode); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
328 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
329 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
330 |
private int runCmd(List<String> argsList) throws Throwable { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
331 |
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("java"); |
55680
cd48f8f260c8
8227289: Enable assertions for some shell to java conversion tests after JDK-8218960
yzhou
parents:
52584
diff
changeset
|
332 |
launcher.addToolArg("-ea") |
cd48f8f260c8
8227289: Enable assertions for some shell to java conversion tests after JDK-8218960
yzhou
parents:
52584
diff
changeset
|
333 |
.addToolArg("-esa"); |
52584
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
334 |
argsList.forEach(launcher::addToolArg); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
335 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
336 |
return ProcessTools.executeCommand(launcher.getCommand()).getExitValue(); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
337 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
338 |
} |