--- a/langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java Thu Mar 31 14:56:33 2016 -0700
+++ b/langtools/test/tools/javap/4798312/JavapShouldLoadClassesFromRTJarTest.java Thu Mar 31 15:20:50 2016 -0700
@@ -27,22 +27,25 @@
* @summary In Windows, javap doesn't load classes from rt.jar
* @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.JavapTask
* @run main JavapShouldLoadClassesFromRTJarTest
*/
+import toolbox.JavapTask;
+import toolbox.Task;
+import toolbox.ToolBox;
+
public class JavapShouldLoadClassesFromRTJarTest {
public static void main(String[] args) throws Exception {
ToolBox tb = new ToolBox();
- String out = tb.new JavapTask()
+ String out = new JavapTask(tb)
.options("-v")
.classes("java.lang.String")
.run()
- .getOutput(ToolBox.OutputKind.DIRECT);
+ .getOutput(Task.OutputKind.DIRECT);
if (out.isEmpty())
throw new AssertionError("javap generated no output");