Mercurial Mercurial > jdk-sandbox / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
langtools/test/tools/javac/modules/QueryBeforeEnter.java
changeset 40308 274367a99f98
parent 37758 3ecf9b414e05
child 42822 a84956e7ee4d
equal deleted inserted replaced
40306:1a0fcaf3f2ed 40308:274367a99f98 
    92         Path modulePath = base.resolve("module-path");
 
    92         Path modulePath = base.resolve("module-path");
 
    93 
    93 
    94         Files.createDirectories(modulePath);
 
    94         Files.createDirectories(modulePath);
 
    95 
    95 
    96         new JavacTask(tb)
 
    96         new JavacTask(tb)
 
    97                 .options("-modulesourcepath", moduleSrc.toString())
 
    97                 .options("--module-source-path", moduleSrc.toString())
 
    98                 .outdir(modulePath)
 
    98                 .outdir(modulePath)
 
    99                 .files(findJavaFiles(moduleSrc))
 
    99                 .files(findJavaFiles(moduleSrc))
 
   100                 .run()
 
   100                 .run()
 
   101                 .writeAll();
 
   101                 .writeAll();
 
   102 
   102 
   129         try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
 
   129         try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
 
   130             com.sun.source.util.JavacTask task =
 
   130             com.sun.source.util.JavacTask task =
 
   131                 (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
 
   131                 (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
 
   132                                                               null,
 
   132                                                               null,
 
   133                                                               d -> { throw new IllegalStateException(d.toString()); },
 
   133                                                               d -> { throw new IllegalStateException(d.toString()); },
 
   134                                                               Arrays.asList("-modulepath", modulePath.toString(),
 
   134                                                               Arrays.asList("--module-path", modulePath.toString(),
 
   135                                                                             "-classpath", cp.toString(),
 
   135                                                                             "--class-path", cp.toString(),
 
   136                                                                             "-sourcepath", src.toString()),
 
   136                                                                             "-sourcepath", src.toString()),
 
   137                                                               null,
 
   137                                                               null,
 
   138                                                               fm.getJavaFileObjects(src.resolve("test").resolve("Test2.java")));
 
   138                                                               fm.getJavaFileObjects(src.resolve("test").resolve("Test2.java")));
 
   139             assertNotNull(task.getElements().getTypeElement("java.lang.String"));
 
   139             assertNotNull(task.getElements().getTypeElement("java.lang.String"));
 
   140             assertNotNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
 
   140             assertNotNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
 
   168         Path modulePath = base.resolve("module-path");
 
   168         Path modulePath = base.resolve("module-path");
 
   169 
   169 
   170         Files.createDirectories(modulePath);
 
   170         Files.createDirectories(modulePath);
 
   171 
   171 
   172         new JavacTask(tb)
 
   172         new JavacTask(tb)
 
   173                 .options("-modulesourcepath", moduleSrc.toString())
 
   173                 .options("--module-source-path", moduleSrc.toString())
 
   174                 .outdir(modulePath)
 
   174                 .outdir(modulePath)
 
   175                 .files(findJavaFiles(moduleSrc))
 
   175                 .files(findJavaFiles(moduleSrc))
 
   176                 .run()
 
   176                 .run()
 
   177                 .writeAll();
 
   177                 .writeAll();
 
   178 
   178 
   205         try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
 
   205         try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
 
   206             com.sun.source.util.JavacTask task =
 
   206             com.sun.source.util.JavacTask task =
 
   207                 (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
 
   207                 (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
 
   208                                                               null,
 
   208                                                               null,
 
   209                                                               d -> { throw new IllegalStateException(d.toString()); },
 
   209                                                               d -> { throw new IllegalStateException(d.toString()); },
 
   210                                                               Arrays.asList("-modulepath", modulePath.toString(),
 
   210                                                               Arrays.asList("--module-path", modulePath.toString(),
 
   211                                                                             "-classpath", cp.toString(),
 
   211                                                                             "--class-path", cp.toString(),
 
   212                                                                             "-sourcepath", src.toString()),
 
   212                                                                             "-sourcepath", src.toString()),
 
   213                                                               null,
 
   213                                                               null,
 
   214                                                               fm.getJavaFileObjects(findJavaFiles(src)));
 
   214                                                               fm.getJavaFileObjects(findJavaFiles(src)));
 
   215             assertNotNull(task.getElements().getTypeElement("java.lang.String"));
 
   215             assertNotNull(task.getElements().getTypeElement("java.lang.String"));
 
   216             assertNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
 
   216             assertNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
 
   243         Path modulePath = base.resolve("module-path");
 
   243         Path modulePath = base.resolve("module-path");
 
   244 
   244 
   245         Files.createDirectories(modulePath);
 
   245         Files.createDirectories(modulePath);
 
   246 
   246 
   247         new JavacTask(tb)
 
   247         new JavacTask(tb)
 
   248                 .options("-modulesourcepath", modulePathSrc.toString())
 
   248                 .options("--module-source-path", modulePathSrc.toString())
 
   249                 .outdir(modulePath)
 
   249                 .outdir(modulePath)
 
   250                 .files(findJavaFiles(modulePathSrc))
 
   250                 .files(findJavaFiles(modulePathSrc))
 
   251                 .run()
 
   251                 .run()
 
   252                 .writeAll();
 
   252                 .writeAll();
 
   253 
   253 
   287         try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
 
   287         try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
 
   288             com.sun.source.util.JavacTask task =
 
   288             com.sun.source.util.JavacTask task =
 
   289                 (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
 
   289                 (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
 
   290                                                               null,
 
   290                                                               null,
 
   291                                                               d -> { throw new IllegalStateException(d.toString()); },
 
   291                                                               d -> { throw new IllegalStateException(d.toString()); },
 
   292                                                               Arrays.asList("-modulepath", modulePath.toString(),
 
   292                                                               Arrays.asList("--module-path", modulePath.toString(),
 
   293                                                                             "-classpath", cp.toString(),
 
   293                                                                             "--class-path", cp.toString(),
 
   294                                                                             "-modulesourcepath", moduleSrc.toString(),
 
   294                                                                             "--module-source-path", moduleSrc.toString(),
 
   295                                                                             "-d", out.toString()),
 
   295                                                                             "-d", out.toString()),
 
   296                                                               null,
 
   296                                                               null,
 
   297                                                               fm.getJavaFileObjects(findJavaFiles(moduleSrc)));
 
   297                                                               fm.getJavaFileObjects(findJavaFiles(moduleSrc)));
 
   298             assertNotNull(task.getElements().getTypeElement("java.lang.String"));
 
   298             assertNotNull(task.getElements().getTypeElement("java.lang.String"));
 
   299             assertNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
 
   299             assertNull(task.getElements().getTypeElement("javax.tools.ToolProvider"));
 
   337         try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
 
   337         try (StandardJavaFileManager fm = javaCompiler.getStandardFileManager(null, null, null)) {
 
   338             com.sun.source.util.JavacTask task =
 
   338             com.sun.source.util.JavacTask task =
 
   339                 (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
 
   339                 (com.sun.source.util.JavacTask) javaCompiler.getTask(null,
 
   340                                                               null,
 
   340                                                               null,
 
   341                                                               d -> { throw new IllegalStateException(d.toString()); },
 
   341                                                               d -> { throw new IllegalStateException(d.toString()); },
 
   342                                                               Arrays.asList("-processorpath", processorPath,
 
   342                                                               Arrays.asList("--processor-path", processorPath,
 
   343                                                                             "-processor", AP.class.getName(),
 
   343                                                                             "-processor", AP.class.getName(),
 
   344                                                                             "-Xplugin:test"),
 
   344                                                                             "-Xplugin:test"),
 
   345                                                               null,
 
   345                                                               null,
 
   346                                                               fm.getJavaFileObjects(testSource));
 
   346                                                               fm.getJavaFileObjects(testSource));
 
   347             task.call();
 
   347             task.call();
 
   348         }
 
   348         }
 
   349 
   349 
   350         Main.compile(new String[] {"-processorpath", processorPath,
 
   350         Main.compile(new String[] {"--processor-path", processorPath,
 
   351                                    "-Xplugin:test",
 
   351                                    "-Xplugin:test",
 
   352                                    testSource.toString()});
 
   352                                    testSource.toString()});
 
   353     }
 
   353     }
 
   354 
   354 
   355     public static class PluginImpl implements Plugin {
 
   355     public static class PluginImpl implements Plugin {
jdk-sandbox