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

*** 92,102 ****
          Path modulePath = base.resolve("module-path");
  
          Files.createDirectories(modulePath);
  
          new JavacTask(tb)
!                 .options("-modulesourcepath", moduleSrc.toString())
                  .outdir(modulePath)
                  .files(findJavaFiles(moduleSrc))
                  .run()
                  .writeAll();
  
--- 92,102 ----
          Path modulePath = base.resolve("module-path");
  
          Files.createDirectories(modulePath);
  
          new JavacTask(tb)
!                 .options("--module-source-path", moduleSrc.toString())
                  .outdir(modulePath)
                  .files(findJavaFiles(moduleSrc))
                  .run()
                  .writeAll();
  
*** 129,140 ****
          try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
              com.sun.source.util.JavacTask task =
                  (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
                                                                null,
                                                                d -> { throw new IllegalStateException(d.toString()); },
!                                                               Arrays.asList("-modulepath", modulePath.toString(),
!                                                                             "-classpath", cp.toString(),
                                                                              "-sourcepath", src.toString()),
                                                                null,
                                                                fm.getJavaFileObjects(src.resolve("test").resolve("Test2.java")));
              assertNotNull(task.getElements().getTypeElement("java.lang.String"));
              assertNotNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
--- 129,140 ----
          try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
              com.sun.source.util.JavacTask task =
                  (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
                                                                null,
                                                                d -> { throw new IllegalStateException(d.toString()); },
!                                                               Arrays.asList("--module-path", modulePath.toString(),
!                                                                             "--class-path", cp.toString(),
                                                                              "-sourcepath", src.toString()),
                                                                null,
                                                                fm.getJavaFileObjects(src.resolve("test").resolve("Test2.java")));
              assertNotNull(task.getElements().getTypeElement("java.lang.String"));
              assertNotNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
*** 168,178 ****
          Path modulePath = base.resolve("module-path");
  
          Files.createDirectories(modulePath);
  
          new JavacTask(tb)
!                 .options("-modulesourcepath", moduleSrc.toString())
                  .outdir(modulePath)
                  .files(findJavaFiles(moduleSrc))
                  .run()
                  .writeAll();
  
--- 168,178 ----
          Path modulePath = base.resolve("module-path");
  
          Files.createDirectories(modulePath);
  
          new JavacTask(tb)
!                 .options("--module-source-path", moduleSrc.toString())
                  .outdir(modulePath)
                  .files(findJavaFiles(moduleSrc))
                  .run()
                  .writeAll();
  
*** 205,216 ****
          try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
              com.sun.source.util.JavacTask task =
                  (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
                                                                null,
                                                                d -> { throw new IllegalStateException(d.toString()); },
!                                                               Arrays.asList("-modulepath", modulePath.toString(),
!                                                                             "-classpath", cp.toString(),
                                                                              "-sourcepath", src.toString()),
                                                                null,
                                                                fm.getJavaFileObjects(findJavaFiles(src)));
              assertNotNull(task.getElements().getTypeElement("java.lang.String"));
              assertNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
--- 205,216 ----
          try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
              com.sun.source.util.JavacTask task =
                  (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
                                                                null,
                                                                d -> { throw new IllegalStateException(d.toString()); },
!                                                               Arrays.asList("--module-path", modulePath.toString(),
!                                                                             "--class-path", cp.toString(),
                                                                              "-sourcepath", src.toString()),
                                                                null,
                                                                fm.getJavaFileObjects(findJavaFiles(src)));
              assertNotNull(task.getElements().getTypeElement("java.lang.String"));
              assertNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
*** 243,253 ****
          Path modulePath = base.resolve("module-path");
  
          Files.createDirectories(modulePath);
  
          new JavacTask(tb)
!                 .options("-modulesourcepath", modulePathSrc.toString())
                  .outdir(modulePath)
                  .files(findJavaFiles(modulePathSrc))
                  .run()
                  .writeAll();
  
--- 243,253 ----
          Path modulePath = base.resolve("module-path");
  
          Files.createDirectories(modulePath);
  
          new JavacTask(tb)
!                 .options("--module-source-path", modulePathSrc.toString())
                  .outdir(modulePath)
                  .files(findJavaFiles(modulePathSrc))
                  .run()
                  .writeAll();
  
*** 287,299 ****
          try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
              com.sun.source.util.JavacTask task =
                  (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
                                                                null,
                                                                d -> { throw new IllegalStateException(d.toString()); },
!                                                               Arrays.asList("-modulepath", modulePath.toString(),
!                                                                             "-classpath", cp.toString(),
!                                                                             "-modulesourcepath", moduleSrc.toString(),
                                                                              "-d", out.toString()),
                                                                null,
                                                                fm.getJavaFileObjects(findJavaFiles(moduleSrc)));
              assertNotNull(task.getElements().getTypeElement("java.lang.String"));
              assertNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
--- 287,299 ----
          try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
              com.sun.source.util.JavacTask task =
                  (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
                                                                null,
                                                                d -> { throw new IllegalStateException(d.toString()); },
!                                                               Arrays.asList("--module-path", modulePath.toString(),
!                                                                             "--class-path", cp.toString(),
!                                                                             "--module-source-path", moduleSrc.toString(),
                                                                              "-d", out.toString()),
                                                                null,
                                                                fm.getJavaFileObjects(findJavaFiles(moduleSrc)));
              assertNotNull(task.getElements().getTypeElement("java.lang.String"));
              assertNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
*** 337,355 ****
          try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
              com.sun.source.util.JavacTask task =
                  (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
                                                                null,
                                                                d -> { throw new IllegalStateException(d.toString()); },
!                                                               Arrays.asList("-processorpath", processorPath,
                                                                              "-processor", AP.class.getName(),
                                                                              "-Xplugin:test"),
                                                                null,
                                                                fm.getJavaFileObjects(testSource));
              task.call();
          }
  
!         Main.compile(new String[] {"-processorpath", processorPath,
                                     "-Xplugin:test",
                                     testSource.toString()});
      }
  
      public static class PluginImpl implements Plugin {
--- 337,355 ----
          try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
              com.sun.source.util.JavacTask task =
                  (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
                                                                null,
                                                                d -> { throw new IllegalStateException(d.toString()); },
!                                                               Arrays.asList("--processor-path", processorPath,
                                                                              "-processor", AP.class.getName(),
                                                                              "-Xplugin:test"),
                                                                null,
                                                                fm.getJavaFileObjects(testSource));
              task.call();
          }
  
!         Main.compile(new String[] {"--processor-path", processorPath,
                                     "-Xplugin:test",
                                     testSource.toString()});
      }
  
      public static class PluginImpl implements Plugin {