langtools/test/tools/sjavac/ApiExtraction.java

*** 27,40 ****
   * @summary Make sure extraction of non-private APIs work as expected.
   * @library /tools/lib
   * @modules jdk.compiler/com.sun.tools.javac.api
   *          jdk.compiler/com.sun.tools.javac.main
   *          jdk.compiler/com.sun.tools.sjavac
!  *          jdk.jdeps/com.sun.tools.javap
!  * @build Wrapper toolbox.ToolBox
   * @run main Wrapper ApiExtraction
   */
  import static java.util.Arrays.asList;
  import static java.util.Collections.emptyList;
  import static javax.lang.model.element.Modifier.FINAL;
  import static javax.lang.model.element.Modifier.PROTECTED;
  import static javax.lang.model.element.Modifier.PUBLIC;
--- 27,42 ----
   * @summary Make sure extraction of non-private APIs work as expected.
   * @library /tools/lib
   * @modules jdk.compiler/com.sun.tools.javac.api
   *          jdk.compiler/com.sun.tools.javac.main
   *          jdk.compiler/com.sun.tools.sjavac
!  *          jdk.compiler/com.sun.tools.sjavac.options
!  *          jdk.compiler/com.sun.tools.sjavac.pubapi
!  * @build Wrapper toolbox.ToolBox toolbox.JavacTask
   * @run main Wrapper ApiExtraction
   */
+ 
  import static java.util.Arrays.asList;
  import static java.util.Collections.emptyList;
  import static javax.lang.model.element.Modifier.FINAL;
  import static javax.lang.model.element.Modifier.PROTECTED;
  import static javax.lang.model.element.Modifier.PUBLIC;
*** 54,63 ****
--- 56,67 ----
  import com.sun.tools.sjavac.pubapi.PubMethod;
  import com.sun.tools.sjavac.pubapi.PubType;
  import com.sun.tools.sjavac.pubapi.PubVar;
  import com.sun.tools.sjavac.pubapi.ReferenceTypeDesc;
  
+ import toolbox.JavacTask;
+ import toolbox.ToolBox;
  
  public class ApiExtraction {
      public static void main(String[] args) throws IOException {
  
          String testSrc = String.join("\n",
*** 84,94 ****
                  "    }",
                  "    final class DummyInner2 { }",
                  "}");
  
          // Create class file to extract API from
!         new ToolBox().new JavacTask().sources(testSrc).run();
  
          // Extract PubApi
          Options options = Options.parseArgs("-d", "bin", "--state-dir=bin", "-cp", ".");
          PubApiExtractor pubApiExtr = new PubApiExtractor(options);
          PubApi actualApi = pubApiExtr.getPubApi("TestClass");
--- 88,98 ----
                  "    }",
                  "    final class DummyInner2 { }",
                  "}");
  
          // Create class file to extract API from
!         new JavacTask(new ToolBox()).sources(testSrc).run();
  
          // Extract PubApi
          Options options = Options.parseArgs("-d", "bin", "--state-dir=bin", "-cp", ".");
          PubApiExtractor pubApiExtr = new PubApiExtractor(options);
          PubApi actualApi = pubApiExtr.getPubApi("TestClass");