langtools/test/tools/javac/modules/ModulesAndClassPathTest.java

*** 44,54 ****
  import javax.lang.model.element.TypeElement;
  
  import toolbox.JarTask;
  import toolbox.JavacTask;
  import toolbox.Task;
- import toolbox.ToolBox;
  
  public class ModulesAndClassPathTest extends ModuleTestBase {
  
      public static void main(String... args) throws Exception {
          new ModulesAndClassPathTest().runTests();
--- 44,53 ----
*** 68,78 ****
          tb.writeJavaFiles(m1,
                            "module m1 { }",
                            "package impl; public class Impl { api.Api api; }");
  
          List<String> modLog = new JavacTask(tb)
!                                 .options("-classpath", jar.toString(),
                                           "-XDrawDiagnostics")
                                  .outdir(classes)
                                  .files(findJavaFiles(moduleSrc))
                                  .run(Task.Expect.FAIL)
                                  .writeAll()
--- 67,77 ----
          tb.writeJavaFiles(m1,
                            "module m1 { }",
                            "package impl; public class Impl { api.Api api; }");
  
          List<String> modLog = new JavacTask(tb)
!                                 .options("--class-path", jar.toString(),
                                           "-XDrawDiagnostics")
                                  .outdir(classes)
                                  .files(findJavaFiles(moduleSrc))
                                  .run(Task.Expect.FAIL)
                                  .writeAll()
*** 84,104 ****
          if (!expected.equals(modLog)) {
              throw new Exception("unexpected output: " + modLog);
          }
  
          new JavacTask(tb)
!           .options("-classpath", jar.toString(),
!                    "-XaddReads:m1=ALL-UNNAMED")
            .outdir(classes)
            .files(findJavaFiles(moduleSrc))
            .run()
            .writeAll()
            .getOutputLines(Task.OutputKind.DIRECT);
  
          new JavacTask(tb)
!           .options("-classpath", jar.toString() + File.pathSeparator + System.getProperty("test.classes"),
!                    "-XaddReads:m1=ALL-UNNAMED",
                     "-processor", ProcessorImpl.class.getName())
            .outdir(classes)
            .files(findJavaFiles(moduleSrc))
            .run()
            .writeAll()
--- 83,103 ----
          if (!expected.equals(modLog)) {
              throw new Exception("unexpected output: " + modLog);
          }
  
          new JavacTask(tb)
!           .options("--class-path", jar.toString(),
!                    "--add-reads", "m1=ALL-UNNAMED")
            .outdir(classes)
            .files(findJavaFiles(moduleSrc))
            .run()
            .writeAll()
            .getOutputLines(Task.OutputKind.DIRECT);
  
          new JavacTask(tb)
!           .options("--class-path", jar.toString() + File.pathSeparator + System.getProperty("test.classes"),
!                    "--add-reads", "m1=ALL-UNNAMED",
                     "-processor", ProcessorImpl.class.getName())
            .outdir(classes)
            .files(findJavaFiles(moduleSrc))
            .run()
            .writeAll()
*** 119,129 ****
          tb.writeJavaFiles(m1,
                            "module m1 { }",
                            "package impl; public class Impl { api.Api api; }");
  
          List<String> modLog = new JavacTask(tb)
!                                 .options("-classpath", jar.toString(),
                                           "-sourcepath", m1.toString(),
                                           "-XDrawDiagnostics")
                                  .outdir(classes)
                                  .files(m1.resolve("impl").resolve("Impl.java"))
                                  .run(Task.Expect.FAIL)
--- 118,128 ----
          tb.writeJavaFiles(m1,
                            "module m1 { }",
                            "package impl; public class Impl { api.Api api; }");
  
          List<String> modLog = new JavacTask(tb)
!                                 .options("--class-path", jar.toString(),
                                           "-sourcepath", m1.toString(),
                                           "-XDrawDiagnostics")
                                  .outdir(classes)
                                  .files(m1.resolve("impl").resolve("Impl.java"))
                                  .run(Task.Expect.FAIL)
*** 152,171 ****
          tb.writeJavaFiles(m1,
                            "module m1 { }",
                            "package impl; public class Impl { api.Api api; }");
  
          new JavacTask(tb)
!           .options("-classpath", jar.toString(),
                     "-XDrawDiagnostics")
            .outdir(classes)
            .files(m1.resolve("module-info.java"))
            .run()
            .writeAll()
            .getOutputLines(Task.OutputKind.DIRECT);
  
          List<String> modLog = new JavacTask(tb)
!                                 .options("-classpath", jar.toString(),
                                           "-XDrawDiagnostics")
                                  .outdir(classes)
                                  .files(m1.resolve("impl").resolve("Impl.java"))
                                  .run(Task.Expect.FAIL)
                                  .writeAll()
--- 151,170 ----
          tb.writeJavaFiles(m1,
                            "module m1 { }",
                            "package impl; public class Impl { api.Api api; }");
  
          new JavacTask(tb)
!           .options("--class-path", jar.toString(),
                     "-XDrawDiagnostics")
            .outdir(classes)
            .files(m1.resolve("module-info.java"))
            .run()
            .writeAll()
            .getOutputLines(Task.OutputKind.DIRECT);
  
          List<String> modLog = new JavacTask(tb)
!                                 .options("--class-path", jar.toString(),
                                           "-XDrawDiagnostics")
                                  .outdir(classes)
                                  .files(m1.resolve("impl").resolve("Impl.java"))
                                  .run(Task.Expect.FAIL)
                                  .writeAll()