archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 02:54:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8152897: refactor ToolBox to allow reduced documented dependencies

Browse source 
Reviewed-by: vromero
This commit is contained in:
Jonathan Gibbons 2016-03-31 15:20:50 -07:00
parent 208d93e110
commit 7812306bc0
212 changed files with 3955 additions and 3485 deletions
Download patch file Download diff file Expand all files Collapse all files

15
langtools/test/tools/javac/modules/PackageMultipleModules.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -28,8 +28,7 @@
* @modules
* jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
* @build ToolBox ModuleTestBase
* @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase
* @run main PackageMultipleModules
*/
@ -38,6 +37,10 @@ import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
import toolbox.JavacTask;
import toolbox.Task;
import toolbox.ToolBox;
public class PackageMultipleModules extends ModuleTestBase {
public static void main(String... args) throws Exception {
@ -60,13 +63,13 @@ public class PackageMultipleModules extends ModuleTestBase {
Path classes = base.resolve("classes");
Files.createDirectories(classes);
List<String> log = tb.new JavacTask()
List<String> log = new JavacTask(tb)
.options("-XDrawDiagnostics", "-modulesourcepath", base.toString())
.outdir(classes)
.files(findJavaFiles(base))
.run(ToolBox.Expect.FAIL)
.run(Task.Expect.FAIL)
.writeAll()
.getOutputLines(ToolBox.OutputKind.DIRECT);
.getOutputLines(Task.OutputKind.DIRECT);
List<String> expected = Arrays.asList("A.java:1:26: compiler.err.not.def.access.package.cant.access: test.B, test",
"B.java:1:26: compiler.err.not.def.access.package.cant.access: test.A, test",