test/jdk/javadoc/tool/ReleaseOption.java

*** 19,28 ****
--- 19,29 ----
   * 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;
*** 51,68 ****
      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(options.toArray(new String[0]), pw);
          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(options.toArray(new String[0]), pw);
          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");
          }
      }
  }