8152897: refactor ToolBox to allow reduced documented dependencies

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

View file

@ -27,16 +27,20 @@
* @summary Verify that javap prints StackMapTable attribute contents
* @library /tools/lib
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.file
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.javap
* @build ToolBox
* @build toolbox.ToolBox toolbox.JavacTask toolbox.JavapTask
* @run main StackmapTest
*/
import java.util.ArrayList;
import java.util.List;
import toolbox.JavacTask;
import toolbox.JavapTask;
import toolbox.Task;
import toolbox.ToolBox;
// Original test: test/tools/javap/stackmap/T6271292.sh
public class StackmapTest {
@ -80,15 +84,15 @@ public class StackmapTest {
public static void main(String[] args) throws Exception {
ToolBox tb = new ToolBox();
tb.new JavacTask()
new JavacTask(tb)
.sources(TestSrc)
.run();
List<String> out = tb.new JavapTask()
List<String> out = new JavapTask(tb)
.options("-v")
.classes("Test.class")
.run()
.getOutputLines(ToolBox.OutputKind.DIRECT);
.getOutputLines(Task.OutputKind.DIRECT);
List<String> grepResult = new ArrayList<>();
grepResult.addAll(tb.grep("frame_type", out));