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) 2017, 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 8180375 8185251 8210408 |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
27 |
* @summary Tests resource bundles are correctly loaded from modules through |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
28 |
* "<packageName>.spi.<simpleName>Provider" types. |
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 main LayerTest |
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 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
47 |
public class LayerTest { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
48 |
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
|
49 |
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
|
50 |
private static final List<String> MODULE_LIST = List.of("m1", "m2"); |
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 |
public static void main(String[] args) throws Throwable { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
53 |
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
|
54 |
MODS_DIR, mn, ".properties")); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
55 |
compileCmd(); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
56 |
runCmd(); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
57 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
58 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
59 |
private static void compileCmd() throws Throwable { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
60 |
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("javac"); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
61 |
launcher.addToolArg("-d") |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
62 |
.addToolArg(Utils.TEST_CLASSES) |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
63 |
.addToolArg(SRC_DIR.resolve("Main.java").toString()); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
64 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
65 |
int exitCode = ProcessTools.executeCommand(launcher.getCommand()) |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
66 |
.getExitValue(); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
67 |
if (exitCode != 0) { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
68 |
throw new RuntimeException("Compile of the test failed. " |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
69 |
+ "Unexpected exit code: " + exitCode); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
70 |
} |
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 |
private static void runCmd() throws Throwable { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
74 |
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
|
75 |
launcher.addToolArg("-ea") |
cd48f8f260c8
8227289: Enable assertions for some shell to java conversion tests after JDK-8218960
yzhou
parents:
52584
diff
changeset
|
76 |
.addToolArg("-esa") |
cd48f8f260c8
8227289: Enable assertions for some shell to java conversion tests after JDK-8218960
yzhou
parents:
52584
diff
changeset
|
77 |
.addToolArg("-cp") |
52584
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
78 |
.addToolArg(Utils.TEST_CLASSES) |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
79 |
.addToolArg("Main") |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
80 |
.addToolArg(Utils.TEST_CLASSES); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
81 |
|
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
82 |
int exitCode = ProcessTools.executeCommand(launcher.getCommand()) |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
83 |
.getExitValue(); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
84 |
if (exitCode != 0) { |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
85 |
throw new RuntimeException("Execution of the test failed. " |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
86 |
+ "Unexpected exit code: " + exitCode); |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
87 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
88 |
} |
5ab248e47901
8210408: Refactor java.util.ResourceBundle:i18n shell tests to plain java tests
dzhou
parents:
diff
changeset
|
89 |
} |