archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +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/PluginsInModulesTest.java
View file

@ -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 PluginsInModulesTest
*/
@ -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 PluginsInModulesTest extends ModuleTestBase {
public static void main(String... args) throws Exception {
@ -103,13 +106,13 @@ public class PluginsInModulesTest extends ModuleTestBase {
pluginModule1,
plugin1);
String log = tb.new JavacTask()
String log = new JavacTask(tb)
.options("-modulesourcepath", moduleSrc.toString())
.outdir(processorCompiledModules)
.files(findJavaFiles(moduleSrc))
.run()
.writeAll()
.getOutput(ToolBox.OutputKind.DIRECT);
.getOutput(Task.OutputKind.DIRECT);
if (!log.isEmpty()) {
throw new AssertionError("Unexpected output: " + log);
@ -126,14 +129,14 @@ public class PluginsInModulesTest extends ModuleTestBase {
@Test
void testUseOnlyOneProcessor(Path base) throws Exception {
initialization(base);
List<String> log = tb.new JavacTask()
List<String> log = new JavacTask(tb)
.options("-processormodulepath", processorCompiledModules.toString(),
"-Xplugin:simpleplugin1")
.outdir(classes)
.sources(testClass)
.run()
.writeAll()
.getOutputLines(ToolBox.OutputKind.STDOUT);
.getOutputLines(Task.OutputKind.STDOUT);
if (!log.equals(Arrays.asList("simpleplugin1 started for event COMPILATION",
"simpleplugin1 finished for event COMPILATION"))) {
throw new AssertionError("Unexpected output: " + log);