jdk-sandbox: comparison langtools/test/tools/javac/Diagnostics/6769027/T6769027.java

equal deleted inserted replaced

-:80190ab051c0
+:99fd9483d3f0
 /*
-* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2009, 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.
 /**
 * @test
 * @bug     6769027
 * @summary Source line should be displayed immediately after the first diagnostic line
 * @author  Maurizio Cimadamore
+* @library ../../lib
+* @build JavacTestingAbstractThreadedTest
 * @run main/othervm T6769027
 */
 import java.net.URI;
 import java.util.regex.Matcher;
 import javax.tools.*;
 import com.sun.tools.javac.util.*;
-public class T6769027 {
+public class T6769027
+extends JavacTestingAbstractThreadedTest
+implements Runnable {
 enum OutputKind {
 RAW("rawDiagnostics","rawDiagnostics"),
 BASIC("","");
 super(ctx);
 }
 @Override
 protected java.io.PrintWriter getWriterForDiagnosticType(JCDiagnostic.DiagnosticType dt) {
-return new java.io.PrintWriter(System.out);
+return outWriter;
 }
 @Override
 protected boolean shouldReport(JavaFileObject jfo, int pos) {
 return true;
 }
 }
-int nerrors = 0;
+OutputKind outputKind;
+ErrorKind errorKind;
-void exec(OutputKind outputKind, ErrorKind errorKind, MultilineKind multiKind,
+MultilineKind multiKind;
+MultilinePolicy multiPolicy;
+PositionKind posKind;
+XDiagsSource xdiagsSource;
+XDiagsCompact xdiagsCompact;
+CaretKind caretKind;
+SourceLineKind sourceLineKind;
+IndentKind summaryIndent;
+IndentKind detailsIndent;
+IndentKind sourceIndent;
+IndentKind subdiagsIndent;
+T6769027(OutputKind outputKind, ErrorKind errorKind, MultilineKind multiKind,
 MultilinePolicy multiPolicy, PositionKind posKind, XDiagsSource xdiagsSource,
 XDiagsCompact xdiagsCompact, CaretKind caretKind, SourceLineKind sourceLineKind,
 IndentKind summaryIndent, IndentKind detailsIndent, IndentKind sourceIndent,
 IndentKind subdiagsIndent) {
+this.outputKind = outputKind;
+this.errorKind = errorKind;
+this.multiKind = multiKind;
+this.multiPolicy = multiPolicy;
+this.posKind = posKind;
+this.xdiagsSource = xdiagsSource;
+this.xdiagsCompact = xdiagsCompact;
+this.caretKind = caretKind;
+this.sourceLineKind = sourceLineKind;
+this.summaryIndent = summaryIndent;
+this.detailsIndent = detailsIndent;
+this.sourceIndent = sourceIndent;
+this.subdiagsIndent = subdiagsIndent;
+}
+@Override
+public void run() {
 Context ctx = new Context();
 Options options = Options.instance(ctx);
 outputKind.init(options);
 multiPolicy.init(options);
 xdiagsSource.init(options);
 List.of(sub, sub) :
 List.of(sub);
 d = new JCDiagnostic.MultilineDiagnostic(d, subdiags);
 }
 String diag = log.getDiagnosticFormatter().format(d, messages.getCurrentLocale());
-checkOutput(diag,
+checkOutput(diag);
-outputKind,
+}
-errorKind,
-multiKind,
+public static void main(String[] args) throws Exception {
-multiPolicy,
-posKind,
-xdiagsSource,
-xdiagsCompact,
-caretKind,
-sourceLineKind,
-summaryIndent,
-detailsIndent,
-sourceIndent,
-subdiagsIndent);
-}
-void test() {
 for (OutputKind outputKind : OutputKind.values()) {
 for (ErrorKind errKind : ErrorKind.values()) {
 for (MultilineKind multiKind : MultilineKind.values()) {
 for (MultilinePolicy multiPolicy : MultilinePolicy.values()) {
 for (PositionKind posKind : PositionKind.values()) {
 for (SourceLineKind sourceLineKind : SourceLineKind.values()) {
 for (IndentKind summaryIndent : IndentKind.values()) {
 for (IndentKind detailsIndent : IndentKind.values()) {
 for (IndentKind sourceIndent : IndentKind.values()) {
 for (IndentKind subdiagsIndent : IndentKind.values()) {
-exec(outputKind,
+pool.execute(new T6769027(outputKind,
 errKind,
 multiKind,
 multiPolicy,
 posKind,
 xdiagsSource,
 caretKind,
 sourceLineKind,
 summaryIndent,
 detailsIndent,
 sourceIndent,
-subdiagsIndent);
+subdiagsIndent));
 }
 }
 }
 }
 }
 }
 }
 }
 }
 }
-if (nerrors != 0)
-throw new AssertionError(nerrors + " errors found");
+checkAfterExec(false);
 }
-void printInfo(String msg, OutputKind outputKind, ErrorKind errorKind, MultilineKind multiKind,
+void printInfo(String msg, String errorLine) {
-MultilinePolicy multiPolicy, PositionKind posKind, XDiagsSource xdiagsSource,
-XDiagsCompact xdiagsCompact, CaretKind caretKind, SourceLineKind sourceLineKind,
-IndentKind summaryIndent, IndentKind detailsIndent, IndentKind sourceIndent,
-IndentKind subdiagsIndent, String errorLine) {
 String sep = "*********************************************************";
 String desc = "raw=" + outputKind + " pos=" + posKind + " key=" + errorKind.key() +
 " multiline=" + multiKind +" multiPolicy=" + multiPolicy.value +
 " diags= " + java.util.Arrays.asList(xdiagsSource.flag, xdiagsCompact.flag) +
 " caret=" + caretKind + " sourcePosition=" + sourceLineKind +
 " summaryIndent=" + summaryIndent + " detailsIndent=" + detailsIndent +
 " sourceIndent=" + sourceIndent + " subdiagsIndent=" + subdiagsIndent;
-System.out.println(sep);
+errWriter.println(sep);
-System.out.println(desc);
+errWriter.println(desc);
-System.out.println(sep);
+errWriter.println(sep);
-System.out.println(msg);
+errWriter.println(msg);
-System.out.println("Diagnostic formatting problem - expected diagnostic...\n" + errorLine);
+errWriter.println("Diagnostic formatting problem - expected diagnostic...\n" + errorLine);
 }
-void checkOutput(String msg, OutputKind outputKind, ErrorKind errorKind, MultilineKind multiKind,
+void checkOutput(String msg) {
-MultilinePolicy multiPolicy, PositionKind posKind, XDiagsSource xdiagsSource,
-XDiagsCompact xdiagsCompact, CaretKind caretKind, SourceLineKind sourceLineKind,
-IndentKind summaryIndent, IndentKind detailsIndent, IndentKind sourceIndent,
-IndentKind subdiagsIndent) {
 boolean shouldPrintSource = posKind == PositionKind.POS &&
 xdiagsSource != XDiagsSource.NO_SOURCE &&
 (xdiagsSource == XDiagsSource.SOURCE ||
 outputKind == OutputKind.BASIC);
 String errorLine = posKind.getOutput(outputKind) +
 errorKind.getOutput(outputKind, summaryIndent, detailsIndent);
 if (xdiagsCompact != XDiagsCompact.COMPACT)
-errorLine += multiKind.getOutput(outputKind, errorKind, multiPolicy, summaryIndent, detailsIndent, subdiagsIndent);
+errorLine += multiKind.getOutput(outputKind, errorKind, multiPolicy,
+summaryIndent, detailsIndent, subdiagsIndent);
 String[] lines = errorLine.split("\n");
 if (xdiagsCompact == XDiagsCompact.COMPACT) {
 errorLine = lines[0];
 lines = new String[] {errorLine};
 }
 else
 errorLine += xdiagsSource.getOutput(caretKind, sourceIndent, outputKind);
 }
 if (!msg.equals(errorLine)) {
-printInfo(msg,
+printInfo(msg, errorLine);
-outputKind,
+errCount.incrementAndGet();
-errorKind,
+}
-multiKind,
+}
-multiPolicy,
-posKind,
-xdiagsSource,
-xdiagsCompact,
-caretKind,
-sourceLineKind,
-summaryIndent,
-detailsIndent,
-sourceIndent,
-subdiagsIndent,
-errorLine);
-nerrors++;
-}
-}
-public static void main(String... args) throws Exception {
-new T6769027().test();
-}
 }

changeset 15040	99fd9483d3f0
parent 8843	2602bd5c9c5f
child 15384	5a8d00abf076