test/tools/javac/processing/errors/TestReturnCode.java

*** 1,7 ****
  /*
!  * Copyright (c) 2006, 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) 2006, 2010, 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.
*** 24,33 ****
--- 24,35 ----
  /*
   * @test
   * @bug 6403468
   * @summary Test that an erroneous return code results from raising an error.
   * @author  Joseph D. Darcy
+  * @library ../../lib
+  * @build JavacTestingAbstractProcessor
   * @compile TestReturnCode.java
   *
   * @compile      -processor TestReturnCode -proc:only                                                                   Foo.java
   * @compile/fail -processor TestReturnCode -proc:only                                                    -AErrorOnFirst Foo.java
   * @compile/fail -processor TestReturnCode -proc:only                                      -AErrorOnLast                Foo.java
*** 58,81 ****
  
  /**
   * This processor raises errors or throws exceptions on different
   * rounds to allow the return code to be test.
   */
- @SupportedAnnotationTypes("*")
  @SupportedOptions({"ErrorOnFirst",
                     "ErrorOnLast",
                     "ExceptionOnFirst",
                     "ExceptionOnLast"})
! public class TestReturnCode extends AbstractProcessor {
  
      private boolean errorOnFirst;
      private boolean errorOnLast;
      private boolean exceptionOnFirst;
      private boolean exceptionOnLast;
  
-     private Messager messager;
- 
      public boolean process(Set<? extends TypeElement> annotations,
                             RoundEnvironment roundEnv) {
          if (!roundEnv.processingOver()) {
              System.out.format("Variables: %b\t%b\t%b\t%b%n",
                                errorOnFirst,
--- 60,80 ----
  
  /**
   * This processor raises errors or throws exceptions on different
   * rounds to allow the return code to be test.
   */
  @SupportedOptions({"ErrorOnFirst",
                     "ErrorOnLast",
                     "ExceptionOnFirst",
                     "ExceptionOnLast"})
! public class TestReturnCode extends JavacTestingAbstractProcessor {
  
      private boolean errorOnFirst;
      private boolean errorOnLast;
      private boolean exceptionOnFirst;
      private boolean exceptionOnLast;
  
      public boolean process(Set<? extends TypeElement> annotations,
                             RoundEnvironment roundEnv) {
          if (!roundEnv.processingOver()) {
              System.out.format("Variables: %b\t%b\t%b\t%b%n",
                                errorOnFirst,
*** 101,113 ****
          Set<String> keySet = processingEnv.getOptions().keySet();
          errorOnFirst      = keySet.contains("ErrorOnFirst");
          errorOnLast     = keySet.contains("ErrorOnLast");
          exceptionOnFirst  = keySet.contains("ExceptionOnFirst");
          exceptionOnLast = keySet.contains("ExceptionOnLast");
-         messager = processingEnv.getMessager();
-     }
- 
-     @Override
-     public SourceVersion getSupportedSourceVersion() {
-         return SourceVersion.latest();
      }
  }
--- 100,106 ----