author | erikj |
Tue, 12 Sep 2017 19:03:39 +0200 | |
changeset 47216 | 71c04702a3d5 |
parent 45467 | jdk/test/sun/security/tools/jarsigner/AltProvider.java@99c87a16a8e4 |
child 50780 | c9f193a8b671 |
permissions | -rw-r--r-- |
39633
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
1 |
/* |
45287
e0bb5f83e17a
8180888: move jdk.testlibrary.JarUtils to the top level testlibrary
iignatyev
parents:
40686
diff
changeset
|
2 |
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved. |
39633
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
4 |
* |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
8 |
* |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
13 |
* accompanied this code). |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
14 |
* |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
15 |
* You should have received a copy of the GNU General Public License version |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
18 |
* |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
21 |
* questions. |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
22 |
*/ |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
23 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
24 |
/* |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
25 |
* @test |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
26 |
* @bug 4906940 8130302 |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
27 |
* @summary -providerPath, -providerClass, -addprovider, and -providerArg |
45393 | 28 |
* @library /test/lib |
39633
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
29 |
* @modules java.base/jdk.internal.misc |
45467
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45393
diff
changeset
|
30 |
* @build jdk.test.lib.util.JarUtils |
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45393
diff
changeset
|
31 |
* jdk.test.lib.compiler.CompilerUtils |
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45393
diff
changeset
|
32 |
* jdk.test.lib.Utils |
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45393
diff
changeset
|
33 |
* jdk.test.lib.Asserts |
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45393
diff
changeset
|
34 |
* jdk.test.lib.JDKToolFinder |
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45393
diff
changeset
|
35 |
* jdk.test.lib.JDKToolLauncher |
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45393
diff
changeset
|
36 |
* jdk.test.lib.Platform |
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45393
diff
changeset
|
37 |
* jdk.test.lib.process.* |
99c87a16a8e4
8181761: add explicit @build actions for jdk.test.lib classes in all :tier2 tests
iignatyev
parents:
45393
diff
changeset
|
38 |
* @run main AltProvider |
39633
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
39 |
*/ |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
40 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
41 |
import jdk.test.lib.JDKToolLauncher; |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
42 |
import jdk.test.lib.process.OutputAnalyzer; |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
43 |
import jdk.test.lib.process.ProcessTools; |
45287
e0bb5f83e17a
8180888: move jdk.testlibrary.JarUtils to the top level testlibrary
iignatyev
parents:
40686
diff
changeset
|
44 |
import jdk.test.lib.util.JarUtils; |
45393 | 45 |
import jdk.test.lib.compiler.CompilerUtils; |
39633
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
46 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
47 |
import java.nio.file.*; |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
48 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
49 |
public class AltProvider { |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
50 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
51 |
private static final String TEST_SRC = |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
52 |
Paths.get(System.getProperty("test.src")).toString(); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
53 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
54 |
private static final Path MOD_SRC_DIR = Paths.get(TEST_SRC, "alt"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
55 |
private static final Path MOD_DEST_DIR = Paths.get("mods"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
56 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
57 |
private static final String ktCommand = "-keystore x.jks " + |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
58 |
"-storepass changeit -storetype dummyks -list -debug"; |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
59 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
60 |
private static final String jsCommand = "-keystore x.jks " + |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
61 |
"-storepass changeit -storetype dummyks -debug x.jar x"; |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
62 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
63 |
public static void main(String[] args) throws Throwable { |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
64 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
65 |
// Compile the provider |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
66 |
CompilerUtils.compile( |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
67 |
MOD_SRC_DIR, MOD_DEST_DIR, |
40261
86a49ba76f52
8136930: Simplify use of module-system options by custom launchers
mchung
parents:
39633
diff
changeset
|
68 |
"--module-source-path", |
39633
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
69 |
MOD_SRC_DIR.toString()); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
70 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
71 |
// Create a keystore |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
72 |
tool("keytool", "-keystore x.jks -storetype jks -genkeypair" + |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
73 |
" -storepass changeit -keypass changeit -alias x -dname CN=X") |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
74 |
.shouldHaveExitValue(0); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
75 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
76 |
// Create a jar file |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
77 |
JarUtils.createJar("x.jar", "x.jks"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
78 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
79 |
// Test starts here |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
80 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
81 |
// Without new provider |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
82 |
testBoth("", 1, "DUMMYKS not found"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
83 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
84 |
// legacy use (-providerPath only supported by keytool) |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
85 |
testKeytool("-providerPath mods/test.dummy " + |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
86 |
"-providerClass org.test.dummy.DummyProvider -providerArg full", |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
87 |
0, "loadProviderByClass: org.test.dummy.DummyProvider"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
88 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
89 |
// legacy, on classpath |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
90 |
testBoth("-J-cp -Jmods/test.dummy " + |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
91 |
"-providerClass org.test.dummy.DummyProvider -providerArg full", |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
92 |
0, "loadProviderByClass: org.test.dummy.DummyProvider"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
93 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
94 |
// Wrong name |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
95 |
testBoth("-J-cp -Jmods/test.dummy " + |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
96 |
"-providerClass org.test.dummy.Dummy -providerArg full", |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
97 |
1, "Provider \"org.test.dummy.Dummy\" not found"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
98 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
99 |
// Not a provider name |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
100 |
testBoth("-J-cp -Jmods/test.dummy " + |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
101 |
"-providerClass java.lang.Object -providerArg full", |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
102 |
1, "java.lang.Object not a provider"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
103 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
104 |
// without arg |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
105 |
testBoth("-J-cp -Jmods/test.dummy " + |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
106 |
"-providerClass org.test.dummy.DummyProvider", |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
107 |
1, "DUMMYKS not found"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
108 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
109 |
// old -provider still works |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
110 |
testBoth("-J-cp -Jmods/test.dummy " + |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
111 |
"-provider org.test.dummy.DummyProvider -providerArg full", |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
112 |
0, "loadProviderByClass: org.test.dummy.DummyProvider"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
113 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
114 |
// name in a module |
40261
86a49ba76f52
8136930: Simplify use of module-system options by custom launchers
mchung
parents:
39633
diff
changeset
|
115 |
testBoth("-J--module-path=mods " + |
39633
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
116 |
"-addprovider Dummy -providerArg full", |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
117 |
0, "loadProviderByName: Dummy"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
118 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
119 |
// -providerClass does not work |
40261
86a49ba76f52
8136930: Simplify use of module-system options by custom launchers
mchung
parents:
39633
diff
changeset
|
120 |
testBoth("-J--module-path=mods " + |
39633
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
121 |
"-providerClass org.test.dummy.DummyProvider -providerArg full", |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
122 |
1, "Provider \"org.test.dummy.DummyProvider\" not found"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
123 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
124 |
// -addprovider with class does not work |
40261
86a49ba76f52
8136930: Simplify use of module-system options by custom launchers
mchung
parents:
39633
diff
changeset
|
125 |
testBoth("-J--module-path=mods " + |
39633
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
126 |
"-addprovider org.test.dummy.DummyProvider -providerArg full", |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
127 |
1, "Provider named \"org.test.dummy.DummyProvider\" not found"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
128 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
129 |
// -addprovider without arg does not work |
40261
86a49ba76f52
8136930: Simplify use of module-system options by custom launchers
mchung
parents:
39633
diff
changeset
|
130 |
testBoth("-J--module-path=mods " + |
39633
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
131 |
"-addprovider Dummy", |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
132 |
1, "DUMMYKS not found"); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
133 |
} |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
134 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
135 |
// Test both tools with the same extra options |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
136 |
private static void testBoth(String args, int exitValue, String contains) |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
137 |
throws Throwable { |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
138 |
testKeytool(args, exitValue, contains); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
139 |
testJarsigner(args, exitValue, contains); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
140 |
} |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
141 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
142 |
// Test keytool with extra options and check exitValue and output |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
143 |
private static void testKeytool(String args, int exitValue, String contains) |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
144 |
throws Throwable { |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
145 |
tool("keytool", ktCommand + " " + args) |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
146 |
.shouldHaveExitValue(exitValue) |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
147 |
.shouldContain(contains); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
148 |
} |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
149 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
150 |
// Test jarsigner with extra options and check exitValue and output |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
151 |
private static void testJarsigner(String args, int exitValue, String contains) |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
152 |
throws Throwable { |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
153 |
tool("jarsigner", jsCommand + " " + args) |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
154 |
.shouldHaveExitValue(exitValue) |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
155 |
.shouldContain(contains); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
156 |
} |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
157 |
|
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
158 |
// Launch a tool with args (space separated string) |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
159 |
private static OutputAnalyzer tool(String tool, String args) |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
160 |
throws Throwable { |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
161 |
JDKToolLauncher l = JDKToolLauncher.createUsingTestJDK(tool); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
162 |
for (String a: args.split("\\s+")) { |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
163 |
if (a.startsWith("-J")) { |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
164 |
l.addVMArg(a.substring(2)); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
165 |
} else { |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
166 |
l.addToolArg(a); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
167 |
} |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
168 |
} |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
169 |
return ProcessTools.executeCommand(l.getCommand()); |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
170 |
} |
9dc7586be5f0
8130302: jarsigner and keytool -providerClass needs be re-examined for modules
weijun
parents:
diff
changeset
|
171 |
} |