test/tools/javac/util/T6597678.java

*** 21,31 ****
   * questions.
   */
  
  /**
   * @test
!  * @bug 6597678
   * @summary Ensure Messages propogated between rounds
   * @library ../lib
   * @build JavacTestingAbstractProcessor T6597678
   * @run main T6597678
   */
--- 21,31 ----
   * questions.
   */
  
  /**
   * @test
!  * @bug 6597678 6449184
   * @summary Ensure Messages propogated between rounds
   * @library ../lib
   * @build JavacTestingAbstractProcessor T6597678
   * @run main T6597678
   */
*** 40,69 ****
  
  import com.sun.tools.javac.processing.JavacProcessingEnvironment;
  import com.sun.tools.javac.util.Context;
  import com.sun.tools.javac.util.JavacMessages;
  
  public class T6597678 extends JavacTestingAbstractProcessor {
      public static void main(String... args) throws Exception {
          new T6597678().run();
      }
  
- 
      void run() throws Exception {
          String myName = T6597678.class.getSimpleName();
          File testSrc = new File(System.getProperty("test.src"));
          File file = new File(testSrc, myName + ".java");
  
!         compile(
              "-proc:only",
              "-processor", myName,
              file.getPath());
      }
  
!     void compile(String... args) throws Exception {
!         StringWriter sw = new StringWriter();
!         PrintWriter pw = new PrintWriter(sw);
          int rc = com.sun.tools.javac.Main.compile(args, pw);
          pw.close();
          String out = sw.toString();
          if (!out.isEmpty())
              System.err.println(out);
--- 40,71 ----
  
  import com.sun.tools.javac.processing.JavacProcessingEnvironment;
  import com.sun.tools.javac.util.Context;
  import com.sun.tools.javac.util.JavacMessages;
  
+ @SupportedOptions("WriterString")
  public class T6597678 extends JavacTestingAbstractProcessor {
      public static void main(String... args) throws Exception {
          new T6597678().run();
      }
  
      void run() throws Exception {
          String myName = T6597678.class.getSimpleName();
          File testSrc = new File(System.getProperty("test.src"));
          File file = new File(testSrc, myName + ".java");
  
!         StringWriter sw = new StringWriter();
!         PrintWriter pw = new PrintWriter(sw);
! 
!         compile(sw, pw,
              "-proc:only",
              "-processor", myName,
+             "-AWriterString=" + pw.toString(),
              file.getPath());
      }
  
!     void compile(StringWriter sw, PrintWriter pw, String... args) throws Exception {
          int rc = com.sun.tools.javac.Main.compile(args, pw);
          pw.close();
          String out = sw.toString();
          if (!out.isEmpty())
              System.err.println(out);
*** 74,93 ****
--- 76,100 ----
      //---------------
  
      @Override
      public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
          Context context = ((JavacProcessingEnvironment) processingEnv).getContext();
+         PrintWriter out = ((JavacProcessingEnvironment) processingEnv).getWriter();
          Locale locale = context.get(Locale.class);
          JavacMessages messages = context.get(JavacMessages.messagesKey);
  
          round++;
          if (round == 1) {
              initialLocale = locale;
              initialMessages = messages;
+             initialWriter = out;
+ 
+             checkEqual("writerString", out.toString().intern(), options.get("WriterString").intern());
          } else {
              checkEqual("locale", locale, initialLocale);
              checkEqual("messages", messages, initialMessages);
+             checkEqual("writer", out, initialWriter);
          }
  
          return true;
      }
  
*** 100,105 ****
--- 107,113 ----
      }
  
      int round = 0;
      Locale initialLocale;
      JavacMessages initialMessages;
+     PrintWriter initialWriter;
  }