jdk-sandbox: comparison langtools/test/tools/javac/failover/CheckAttributedTree.java

equal deleted inserted replaced

-:80190ab051c0
+:99fd9483d3f0
 /*
-* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2010, 2013, 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.
 * 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.source.util.TaskEvent;
+/*
+* @test
+* @bug 6970584
+* @summary assorted position errors in compiler syntax trees
+* @library ../lib
+* @build JavacTestingAbstractThreadedTest
+* @run main CheckAttributedTree -q -r -et ERRONEOUS .
+*/
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.EventQueue;
 import java.awt.Font;
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import javax.lang.model.element.Element;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.DefaultHighlighter;
 import javax.swing.text.Highlighter;
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
 import javax.tools.Diagnostic;
 import javax.tools.DiagnosticListener;
 import javax.tools.JavaFileObject;
-import javax.tools.StandardJavaFileManager;
 import com.sun.source.tree.CompilationUnitTree;
+import com.sun.source.util.TaskEvent;
 import com.sun.source.util.JavacTask;
 import com.sun.source.util.TaskListener;
-import com.sun.tools.javac.api.JavacTool;
 import com.sun.tools.javac.code.Symbol;
 import com.sun.tools.javac.code.Type;
 import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree;
 import com.sun.tools.javac.tree.JCTree.JCCompilationUnit;
 import com.sun.tools.javac.tree.JCTree.JCImport;
 import com.sun.tools.javac.tree.TreeInfo;
 import com.sun.tools.javac.tree.TreeScanner;
 import com.sun.tools.javac.util.Pair;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import javax.lang.model.element.Element;
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
 /**
 * Utility and test program to check validity of tree positions for tree nodes.
 * jtreg: Note that by using the -r switch in the test description below, this test
 * will process all java files in the langtools/test directory, thus implicitly
 * covering any new language features that may be tested in this test suite.
 */
-/*
+public class CheckAttributedTree extends JavacTestingAbstractThreadedTest {
-* @test
-* @bug 6970584
-* @summary assorted position errors in compiler syntax trees
-* @run main CheckAttributedTree -q -r -et ERRONEOUS .
-*/
-public class CheckAttributedTree {
 /**
 * Main entry point.
 * If test.src is set, program runs in jtreg mode, and will throw an Error
 * if any errors arise, otherwise System.exit will be used, unless the gui
 * viewer is being used. In jtreg mode, the default base directory for file
 * args is the value of ${test.src}. In jtreg mode, the -r option can be
 * given to change the default base directory to the root test directory.
 */
-public static void main(String... args) {
+public static void main(String... args) throws Exception {
 String testSrc = System.getProperty("test.src");
 File baseDir = (testSrc == null) ? null : new File(testSrc);
+throwAssertionOnError = false;
 boolean ok = new CheckAttributedTree().run(baseDir, args);
 if (!ok) {
 if (testSrc != null)  // jtreg mode
 throw new Error("failed");
 else
 * directory to the test root directory. For other options, see usage().
 * @param baseDir base directory for any file arguments.
 * @param args command line args
 * @return true if successful or in gui mode
 */
-boolean run(File baseDir, String... args) {
+boolean run(File baseDir, String... args) throws Exception {
 if (args.length == 0) {
 usage(System.out);
 return true;
 }
 encoding = args[++i];
 else if (arg.equals("-gui"))
 gui = true;
 else if (arg.equals("-q"))
 quiet = true;
-else if (arg.equals("-v"))
+else if (arg.equals("-v")) {
 verbose = true;
+printAll = true;
+}
 else if (arg.equals("-t") && i + 1 < args.length)
 tags.add(args[++i]);
 else if (arg.equals("-ef") && i + 1 < args.length)
 excludeFiles.add(new File(baseDir, args[++i]));
 else if (arg.equals("-et") && i + 1 < args.length)
 test(file);
 else
 error("File not found: " + file);
 }
-if (fileCount != 1)
+if (fileCount.get() != 1)
-System.err.println(fileCount + " files read");
+errWriter.println(fileCount + " files read");
-if (errors > 0)
+checkAfterExec(false);
-System.err.println(errors + " errors");
+return (gui || errCount.get() == 0);
-return (gui || errors == 0);
 }
 /**
 * Print command line help.
 * @param out output stream
 /**
 * Test a file. If the file is a directory, it will be recursively scanned
 * for java files.
 * @param file the file or directory to test
 */
-void test(File file) {
+void test(final File file) {
 if (excludeFiles.contains(file)) {
 if (!quiet)
 error("File " + file + " excluded");
 return;
 }
 }
 return;
 }
 if (file.isFile() && file.getName().endsWith(".java")) {
-try {
+pool.execute(new Runnable() {
-if (verbose)
+@Override
-System.err.println(file);
+public void run() {
-fileCount++;
+try {
-NPETester p = new NPETester();
+if (verbose)
-p.test(read(file));
+errWriter.println(file);
-} catch (AttributionException e) {
+fileCount.incrementAndGet();
-if (!quiet) {
+NPETester p = new NPETester();
-error("Error attributing " + file + "\n" + e.getMessage());
+p.test(read(file));
-}
+} catch (AttributionException e) {
-} catch (IOException e) {
+if (!quiet) {
-error("Error reading " + file + ": " + e);
+error("Error attributing " + file + "\n" + e.getMessage());
 }
-return;
+} catch (IOException e) {
+error("Error reading " + file + ": " + e);
+}
+}
+});
 }
 if (!quiet)
 error("File " + file + " ignored");
 }
 // See CR:  6982992 Tests CheckAttributedTree.java, JavacTreeScannerTest.java, and SourceTreeeScannerTest.java timeout
 StringWriter sw = new StringWriter();
 PrintWriter pw = new PrintWriter(sw);
 Reporter r = new Reporter(pw);
-JavacTool tool = JavacTool.create();
-StandardJavaFileManager fm = tool.getStandardFileManager(r, null, null);
 /**
 * Read a file.
 * @param file the file to be read
 * @return the tree for the content of the file
 * @throws IOException if any IO errors occur
 * @throws TreePosTest.ParseException if any errors occur while parsing the file
 */
 List<Pair<JCCompilationUnit, JCTree>> read(File file) throws IOException, AttributionException {
-JavacTool tool = JavacTool.create();
 r.errors = 0;
-Iterable<? extends JavaFileObject> files = fm.getJavaFileObjects(file);
+Iterable<? extends JavaFileObject> files = fm.get().getJavaFileObjects(file);
 String[] opts = { "-XDshouldStopPolicy=ATTR", "-XDverboseCompilePolicy" };
-JavacTask task = tool.getTask(pw, fm, r, Arrays.asList(opts), null, files);
+JavacTask task = (JavacTask)comp.getTask(pw, fm.get(), r, Arrays.asList(opts), null, files);
 final List<Element> analyzedElems = new ArrayList<>();
 task.setTaskListener(new TaskListener() {
 public void started(TaskEvent e) {
 if (e.getKind() == TaskEvent.Kind.ANALYZE)
 analyzedElems.add(e.getTypeElement());
 * exit or throw an Error if any errors have been reported.
 * @param msg the error message
 */
 void error(String msg) {
 System.err.println(msg);
-errors++;
+errCount.incrementAndGet();
 }
-/** Number of files that have been analyzed. */
-int fileCount;
-/** Number of errors reported. */
-int errors;
 /** Flag: don't report irrelevant files. */
 boolean quiet;
 /** Flag: show errors in GUI viewer. */
 boolean gui;
 /** The GUI viewer for errors. */
 if (gui) {
 if (viewer == null)
 viewer = new Viewer();
 viewer.addEntry(sourcefile, label, encl, self);
 }
-error(label + self.toString() + " encl: " + encl.toString() + " in file: " + sourcefile + "  " + self.tree);
+error(label + self.toString() + " encl: " + encl.toString() +
+" in file: " + sourcefile + "  " + self.tree);
 }
 }
 boolean checkFields(JCTree t) {
 List<Field> fieldsToCheck = treeUtil.getFieldsOfType(t,
 final String check;
 final Info encl;
 final Info self;
 }
 }
+/** Number of files that have been analyzed. */
+static AtomicInteger fileCount = new AtomicInteger();
 }

changeset 15040	99fd9483d3f0
parent 14058	c7ec7facdd20
child 15384	5a8d00abf076