langtools/test/tools/javadoc/ReleaseOption.java

*** 1,7 ****
  /*
!  * Copyright (c) 2015, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 19,36 ****
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! import com.sun.tools.javadoc.Main;
  import java.io.PrintWriter;
  import java.io.StringWriter;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.List;
  import java.util.function.Predicate;
  
  /**
   * @test
   * @bug 8086737
   * @summary Test -release option in javadoc
   * @run main ReleaseOption
--- 19,38 ----
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  
! import java.io.File;
  import java.io.PrintWriter;
  import java.io.StringWriter;
  import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.List;
  import java.util.function.Predicate;
  
+ import com.sun.tools.javadoc.Main;
+ 
  /**
   * @test
   * @bug 8086737
   * @summary Test -release option in javadoc
   * @run main ReleaseOption
*** 50,67 ****
      void doRunTest(int expectedResult, Predicate<String> validate, String... args) {
          System.err.println("running with args: " + Arrays.asList(args));
          List<String> options = new ArrayList<>();
          options.addAll(Arrays.asList(args));
          options.add("-XDrawDiagnostics");
!         options.add(System.getProperty("test.src", ".") + java.io.File.separatorChar + "ReleaseOptionSource.java");
          StringWriter out = new StringWriter();
          PrintWriter pw = new PrintWriter(out);
          int actualResult = Main.execute("javadoc", pw, pw, pw, "com.sun.tools.doclets.formats.html.HtmlDoclet", options.toArray(new String[0]));
          System.err.println("actual result=" + actualResult);
          System.err.println("actual output=" + out.toString());
          if (actualResult != expectedResult)
!             throw new Error();
          if (!validate.test(out.toString())) {
!             throw new Error("Not an expected error output: " + out.toString());
          }
      }
  }
--- 52,69 ----
      void doRunTest(int expectedResult, Predicate<String> validate, String... args) {
          System.err.println("running with args: " + Arrays.asList(args));
          List<String> options = new ArrayList<>();
          options.addAll(Arrays.asList(args));
          options.add("-XDrawDiagnostics");
!         options.add(new File(System.getProperty("test.src", "."), "ReleaseOptionSource.java").getPath());
          StringWriter out = new StringWriter();
          PrintWriter pw = new PrintWriter(out);
          int actualResult = Main.execute("javadoc", pw, pw, pw, "com.sun.tools.doclets.formats.html.HtmlDoclet", options.toArray(new String[0]));
          System.err.println("actual result=" + actualResult);
          System.err.println("actual output=" + out.toString());
          if (actualResult != expectedResult)
!             throw new Error("Exit code not as expected");
          if (!validate.test(out.toString())) {
!             throw new Error("Output not as expected");
          }
      }
  }