test/jdk/javadoc/tool/6958836/Test.java

*** 68,101 ****
          opts.addAll(testOpts);
          opts.add(pkg);
  
          StringWriter errSW = new StringWriter();
          PrintWriter errPW = new PrintWriter(errSW);
!         StringWriter warnSW = new StringWriter();
!         PrintWriter warnPW = new PrintWriter(warnSW);
!         StringWriter noteSW = new StringWriter();
!         PrintWriter notePW = new PrintWriter(noteSW);
! 
!         int rc = com.sun.tools.javadoc.Main.execute("javadoc",
!                               errPW, warnPW, notePW,
!                               "com.sun.tools.doclets.standard.Standard",
!                               getClass().getClassLoader(),
!                               opts.toArray(new String[opts.size()]));
          System.err.println("rc: " + rc);
  
          errPW.close();
          String errOut = errSW.toString();
          System.err.println("Errors:\n" + errOut);
-         warnPW.close();
-         String warnOut = warnSW.toString();
-         System.err.println("Warnings:\n" + warnOut);
-         notePW.close();
-         String noteOut = noteSW.toString();
-         System.err.println("Notes:\n" + noteOut);
  
          check(errOut, "Errors.java", expectErrs);
!         check(warnOut, " warning ", expectWarns); // requires -locale en_US
      }
  
      void check(String text, String expectText, int expectCount) {
          int foundCount = 0;
          for (String line: text.split("[\r\n]+")) {
--- 68,88 ----
          opts.addAll(testOpts);
          opts.add(pkg);
  
          StringWriter errSW = new StringWriter();
          PrintWriter errPW = new PrintWriter(errSW);
!         int rc = jdk.javadoc.internal.tool.Main.execute(
!                 opts.toArray(new String[opts.size()]),
!                 errPW);
          System.err.println("rc: " + rc);
  
          errPW.close();
          String errOut = errSW.toString();
          System.err.println("Errors:\n" + errOut);
  
          check(errOut, "Errors.java", expectErrs);
!         check(errOut, " warning ", expectWarns); // requires -locale en_US
      }
  
      void check(String text, String expectText, int expectCount) {
          int foundCount = 0;
          for (String line: text.split("[\r\n]+")) {