25 * @test |
25 * @test |
26 * @bug 8049811 |
26 * @bug 8049811 |
27 * @summary javah should accept module/class names |
27 * @summary javah should accept module/class names |
28 * @library /tools/lib |
28 * @library /tools/lib |
29 * @modules jdk.compiler/com.sun.tools.javac.api |
29 * @modules jdk.compiler/com.sun.tools.javac.api |
30 * jdk.compiler/com.sun.tools.javac.file |
|
31 * jdk.compiler/com.sun.tools.javac.main |
30 * jdk.compiler/com.sun.tools.javac.main |
32 * jdk.jdeps/com.sun.tools.javap |
31 * @build toolbox.ToolBox toolbox.JavahTask |
33 * @build ToolBox |
|
34 * @run main ModuleClass |
32 * @run main ModuleClass |
35 */ |
33 */ |
36 |
34 |
37 import java.util.List; |
35 import java.util.List; |
|
36 |
|
37 import toolbox.JavahTask; |
|
38 import toolbox.ToolBox; |
38 |
39 |
39 public class ModuleClass { |
40 public class ModuleClass { |
40 static public void main(String[] args) throws Exception { |
41 static public void main(String[] args) throws Exception { |
41 ToolBox tb = new ToolBox(); |
42 ToolBox tb = new ToolBox(); |
42 check(tb, "java.lang.Object"); |
43 check(tb, "java.lang.Object"); |
43 check(tb, "java.base/java.io.File"); |
44 check(tb, "java.base/java.io.File"); |
44 } |
45 } |
45 |
46 |
46 static void check(ToolBox tb, String name) throws Exception { |
47 static void check(ToolBox tb, String name) throws Exception { |
47 tb.new JavahTask() |
48 new JavahTask(tb) |
48 .classes(name) |
49 .classes(name) |
49 .run(); |
50 .run(); |
50 |
51 |
51 int sep = name.indexOf("/"); |
52 int sep = name.indexOf("/"); |
52 String className = (sep == -1) ? name : name.substring(sep + 1); |
53 String className = (sep == -1) ? name : name.substring(sep + 1); |