langtools/test/tools/javac/modules/ModuleInfoTest.java
changeset 40308 274367a99f98
parent 38916 d118cb2cffab
child 42407 f3702cff2933
equal deleted inserted replaced
40306:1a0fcaf3f2ed 40308:274367a99f98
   186 
   186 
   187         Path classes = base.resolve("classes");
   187         Path classes = base.resolve("classes");
   188         Files.createDirectories(classes);
   188         Files.createDirectories(classes);
   189 
   189 
   190         String log = new JavacTask(tb)
   190         String log = new JavacTask(tb)
   191                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
   191                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
   192                 .outdir(classes)
   192                 .outdir(classes)
   193                 .files(findJavaFiles(src))
   193                 .files(findJavaFiles(src))
   194                 .run(Task.Expect.FAIL)
   194                 .run(Task.Expect.FAIL)
   195                 .writeAll()
   195                 .writeAll()
   196                 .getOutput(Task.OutputKind.DIRECT);
   196                 .getOutput(Task.OutputKind.DIRECT);
   214 
   214 
   215         Path classes = base.resolve("classes");
   215         Path classes = base.resolve("classes");
   216         Files.createDirectories(classes);
   216         Files.createDirectories(classes);
   217 
   217 
   218         String log = new JavacTask(tb)
   218         String log = new JavacTask(tb)
   219                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
   219                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
   220                 .outdir(classes)
   220                 .outdir(classes)
   221                 .files(findJavaFiles(src))
   221                 .files(findJavaFiles(src))
   222                 .run(Task.Expect.FAIL)
   222                 .run(Task.Expect.FAIL)
   223                 .writeAll()
   223                 .writeAll()
   224                 .getOutput(Task.OutputKind.DIRECT);
   224                 .getOutput(Task.OutputKind.DIRECT);
   240 
   240 
   241         Path classes = base.resolve("classes");
   241         Path classes = base.resolve("classes");
   242         Files.createDirectories(classes);
   242         Files.createDirectories(classes);
   243 
   243 
   244         String log = new JavacTask(tb)
   244         String log = new JavacTask(tb)
   245                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
   245                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
   246                 .outdir(classes)
   246                 .outdir(classes)
   247                 .files(findJavaFiles(src))
   247                 .files(findJavaFiles(src))
   248                 .run(Task.Expect.FAIL)
   248                 .run(Task.Expect.FAIL)
   249                 .writeAll()
   249                 .writeAll()
   250                 .getOutput(Task.OutputKind.DIRECT);
   250                 .getOutput(Task.OutputKind.DIRECT);
   287 
   287 
   288         Path classes = base.resolve("classes");
   288         Path classes = base.resolve("classes");
   289         Files.createDirectories(classes);
   289         Files.createDirectories(classes);
   290 
   290 
   291         String log = new JavacTask(tb)
   291         String log = new JavacTask(tb)
   292                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
   292                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
   293                 .outdir(classes)
   293                 .outdir(classes)
   294                 .files(findJavaFiles(src))
   294                 .files(findJavaFiles(src))
   295                 .run(Task.Expect.FAIL)
   295                 .run(Task.Expect.FAIL)
   296                 .writeAll()
   296                 .writeAll()
   297                 .getOutput(Task.OutputKind.DIRECT);
   297                 .getOutput(Task.OutputKind.DIRECT);
   313 
   313 
   314         Path classes = base.resolve("classes");
   314         Path classes = base.resolve("classes");
   315         Files.createDirectories(classes);
   315         Files.createDirectories(classes);
   316 
   316 
   317         String log = new JavacTask(tb)
   317         String log = new JavacTask(tb)
   318                 .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
   318                 .options("-XDrawDiagnostics", "--module-source-path", src.toString())
   319                 .outdir(classes)
   319                 .outdir(classes)
   320                 .files(findJavaFiles(src))
   320                 .files(findJavaFiles(src))
   321                 .run(Task.Expect.FAIL)
   321                 .run(Task.Expect.FAIL)
   322                 .writeAll()
   322                 .writeAll()
   323                 .getOutput(Task.OutputKind.DIRECT);
   323                 .getOutput(Task.OutputKind.DIRECT);
   354             String postAnno = String.join("", Arrays.copyOfRange(splittedCode, i, length));
   354             String postAnno = String.join("", Arrays.copyOfRange(splittedCode, i, length));
   355             String moduleInfo = preAnno + anno + postAnno;
   355             String moduleInfo = preAnno + anno + postAnno;
   356             tb.writeFile(src_m1.resolve("module-info.java"), moduleInfo);
   356             tb.writeFile(src_m1.resolve("module-info.java"), moduleInfo);
   357 
   357 
   358             String log = new JavacTask(tb)
   358             String log = new JavacTask(tb)
   359                     .options("-XDrawDiagnostics", "-modulesourcepath", src.toString())
   359                     .options("-XDrawDiagnostics", "--module-source-path", src.toString())
   360                     .outdir(classes)
   360                     .outdir(classes)
   361                     .files(findJavaFiles(src))
   361                     .files(findJavaFiles(src))
   362                     .run(Task.Expect.FAIL)
   362                     .run(Task.Expect.FAIL)
   363                     .writeAll()
   363                     .writeAll()
   364                     .getOutput(Task.OutputKind.DIRECT);
   364                     .getOutput(Task.OutputKind.DIRECT);