equal
deleted
inserted
replaced
26 * @summary Ensure that classes with the same FQNs are OK in unrelated modules. |
26 * @summary Ensure that classes with the same FQNs are OK in unrelated modules. |
27 * @library /tools/lib |
27 * @library /tools/lib |
28 * @modules |
28 * @modules |
29 * jdk.compiler/com.sun.tools.javac.api |
29 * jdk.compiler/com.sun.tools.javac.api |
30 * jdk.compiler/com.sun.tools.javac.main |
30 * jdk.compiler/com.sun.tools.javac.main |
31 * jdk.jdeps/com.sun.tools.javap |
31 * @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase |
32 * @build ToolBox ModuleTestBase |
|
33 * @run main DuplicateClassTest |
32 * @run main DuplicateClassTest |
34 */ |
33 */ |
35 |
34 |
36 import java.nio.file.Files; |
35 import java.nio.file.Files; |
37 import java.nio.file.Path; |
36 import java.nio.file.Path; |
|
37 |
|
38 import toolbox.JavacTask; |
|
39 import toolbox.Task; |
|
40 import toolbox.ToolBox; |
38 |
41 |
39 public class DuplicateClassTest extends ModuleTestBase { |
42 public class DuplicateClassTest extends ModuleTestBase { |
40 |
43 |
41 public static void main(String... args) throws Exception { |
44 public static void main(String... args) throws Exception { |
42 DuplicateClassTest t = new DuplicateClassTest(); |
45 DuplicateClassTest t = new DuplicateClassTest(); |
54 "module m2 { }", |
57 "module m2 { }", |
55 "package impl; public class Impl { }"); |
58 "package impl; public class Impl { }"); |
56 Path classes = base.resolve("classes"); |
59 Path classes = base.resolve("classes"); |
57 Files.createDirectories(classes); |
60 Files.createDirectories(classes); |
58 |
61 |
59 String log = tb.new JavacTask() |
62 String log = new JavacTask(tb) |
60 .options("-modulesourcepath", base.toString()) |
63 .options("-modulesourcepath", base.toString()) |
61 .outdir(classes) |
64 .outdir(classes) |
62 .files(findJavaFiles(base)) |
65 .files(findJavaFiles(base)) |
63 .run() |
66 .run() |
64 .writeAll() |
67 .writeAll() |
65 .getOutput(ToolBox.OutputKind.DIRECT); |
68 .getOutput(Task.OutputKind.DIRECT); |
66 |
69 |
67 if (!log.isEmpty()) |
70 if (!log.isEmpty()) |
68 throw new Exception("expected output not found; output: " + log); |
71 throw new Exception("expected output not found; output: " + log); |
69 } |
72 } |
70 |
73 |