jdk-sandbox: comparison langtools/test/tools/javac/generics/diamond/7046778/DiamondAndInnerClassTest.java

equal deleted inserted replaced

-:80190ab051c0
+:99fd9483d3f0
 /*
-* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2011, 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 7046778
 * @summary Project Coin: problem with diamond and member inner classes
+* @library ../../../lib
+* @build JavacTestingAbstractThreadedTest
+* @run main DiamondAndInnerClassTest
 */
 import com.sun.source.util.JavacTask;
 import java.net.URI;
 import java.util.Arrays;
 import javax.tools.Diagnostic;
-import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.SimpleJavaFileObject;
-import javax.tools.StandardJavaFileManager;
-import javax.tools.ToolProvider;
+public class DiamondAndInnerClassTest
+extends JavacTestingAbstractThreadedTest
-public class DiamondAndInnerClassTest {
+implements Runnable {
-static int checkCount = 0;
 enum TypeArgumentKind {
 NONE(""),
 STRING("<String>"),
 INTEGER("<Integer>"),
 return n ==innerClassDeclArity.n;
 }
 }
 public static void main(String... args) throws Exception {
-//create default shared JavaCompiler - reused across multiple compilations
-JavaCompiler comp = ToolProvider.getSystemJavaCompiler();
-StandardJavaFileManager fm = comp.getStandardFileManager(null, null, null);
 for (InnerClassDeclArity innerClassDeclArity : InnerClassDeclArity.values()) {
 for (TypeQualifierArity declType : TypeQualifierArity.values()) {
 if (!declType.matches(innerClassDeclArity)) continue;
 for (TypeQualifierArity newClassType : TypeQualifierArity.values()) {
 if (!newClassType.matches(innerClassDeclArity)) continue;
 for (TypeArgumentKind taDecl1 : TypeArgumentKind.values()) {
 boolean isDeclRaw = taDecl1 == TypeArgumentKind.NONE;
 //no diamond on decl site
 if (taDecl1 == TypeArgumentKind.DIAMOND) continue;
 for (TypeArgumentKind taSite1 : TypeArgumentKind.values()) {
-boolean isSiteRaw = taSite1 == TypeArgumentKind.NONE;
+boolean isSiteRaw =
+taSite1 == TypeArgumentKind.NONE;
 //diamond only allowed on the last type qualifier
 if (taSite1 == TypeArgumentKind.DIAMOND &&
-innerClassDeclArity != InnerClassDeclArity.ONE) continue;
+innerClassDeclArity !=
+InnerClassDeclArity.ONE)
+continue;
 for (ArgumentKind arg1 : ArgumentKind.values()) {
 if (innerClassDeclArity == innerClassDeclArity.ONE) {
-new DiamondAndInnerClassTest(innerClassDeclArity, declType, newClassType,
+pool.execute(
-argList, new TypeArgumentKind[] {taDecl1},
+new DiamondAndInnerClassTest(
-new TypeArgumentKind[] {taSite1}, new ArgumentKind[] {arg1}).run(comp, fm);
+innerClassDeclArity, declType,
+newClassType, argList,
+new TypeArgumentKind[] {taDecl1},
+new TypeArgumentKind[] {taSite1},
+new ArgumentKind[] {arg1}));
 continue;
 }
 for (TypeArgumentKind taDecl2 : TypeArgumentKind.values()) {
 //no rare types
-if (isDeclRaw != (taDecl2 == TypeArgumentKind.NONE)) continue;
+if (isDeclRaw != (taDecl2 == TypeArgumentKind.NONE))
+continue;
 //no diamond on decl site
-if (taDecl2 == TypeArgumentKind.DIAMOND) continue;
+if (taDecl2 == TypeArgumentKind.DIAMOND)
+continue;
 for (TypeArgumentKind taSite2 : TypeArgumentKind.values()) {
 //no rare types
-if (isSiteRaw != (taSite2 == TypeArgumentKind.NONE)) continue;
+if (isSiteRaw != (taSite2 == TypeArgumentKind.NONE))
+continue;
 //diamond only allowed on the last type qualifier
 if (taSite2 == TypeArgumentKind.DIAMOND &&
-innerClassDeclArity != InnerClassDeclArity.TWO) continue;
+innerClassDeclArity != InnerClassDeclArity.TWO)
+continue;
 for (ArgumentKind arg2 : ArgumentKind.values()) {
 if (innerClassDeclArity == innerClassDeclArity.TWO) {
-new DiamondAndInnerClassTest(innerClassDeclArity, declType, newClassType,
+pool.execute(
-argList, new TypeArgumentKind[] {taDecl1, taDecl2},
+new DiamondAndInnerClassTest(
+innerClassDeclArity,
+declType,
+newClassType,
+argList,
+new TypeArgumentKind[] {taDecl1, taDecl2},
 new TypeArgumentKind[] {taSite1, taSite2},
-new ArgumentKind[] {arg1, arg2}).run(comp, fm);
+new ArgumentKind[] {arg1, arg2}));
 continue;
 }
 for (TypeArgumentKind taDecl3 : TypeArgumentKind.values()) {
 //no rare types
-if (isDeclRaw != (taDecl3 == TypeArgumentKind.NONE)) continue;
+if (isDeclRaw != (taDecl3 == TypeArgumentKind.NONE))
+continue;
 //no diamond on decl site
-if (taDecl3 == TypeArgumentKind.DIAMOND) continue;
+if (taDecl3 == TypeArgumentKind.DIAMOND)
+continue;
 for (TypeArgumentKind taSite3 : TypeArgumentKind.values()) {
 //no rare types
-if (isSiteRaw != (taSite3 == TypeArgumentKind.NONE)) continue;
+if (isSiteRaw != (taSite3 == TypeArgumentKind.NONE))
+continue;
 //diamond only allowed on the last type qualifier
 if (taSite3 == TypeArgumentKind.DIAMOND &&
-innerClassDeclArity != InnerClassDeclArity.THREE) continue;
+innerClassDeclArity != InnerClassDeclArity.THREE)
+continue;
 for (ArgumentKind arg3 : ArgumentKind.values()) {
-if (innerClassDeclArity == innerClassDeclArity.THREE) {
+if (innerClassDeclArity ==
-new DiamondAndInnerClassTest(innerClassDeclArity, declType, newClassType,
+innerClassDeclArity.THREE) {
-argList, new TypeArgumentKind[] {taDecl1, taDecl2, taDecl3},
+pool.execute(
+new DiamondAndInnerClassTest(
+innerClassDeclArity,
+declType,
+newClassType,
+argList,
+new TypeArgumentKind[] {taDecl1, taDecl2, taDecl3},
 new TypeArgumentKind[] {taSite1, taSite2, taSite3},
-new ArgumentKind[] {arg1, arg2, arg3}).run(comp, fm);
+new ArgumentKind[] {arg1, arg2, arg3}));
 continue;
 }
 }
 }
 }
 }
 }
 }
 }
 }
-System.out.println("Total check executed: " + checkCount);
+checkAfterExec();
 }
 InnerClassDeclArity innerClassDeclArity;
 TypeQualifierArity declType;
 TypeQualifierArity siteType;
 ArgumentKind[] argumentKinds;
 JavaSource source;
 DiagnosticChecker diagChecker;
 DiamondAndInnerClassTest(InnerClassDeclArity innerClassDeclArity,
-TypeQualifierArity declType, TypeQualifierArity siteType, ArgumentListArity argList,
+TypeQualifierArity declType, TypeQualifierArity siteType,
-TypeArgumentKind[] declTypeArgumentKinds, TypeArgumentKind[] siteTypeArgumentKinds,
+ArgumentListArity argList, TypeArgumentKind[] declTypeArgumentKinds,
-ArgumentKind[] argumentKinds) {
+TypeArgumentKind[] siteTypeArgumentKinds, ArgumentKind[] argumentKinds) {
 this.innerClassDeclArity = innerClassDeclArity;
 this.declType = declType;
 this.siteType = siteType;
 this.argList = argList;
 this.declTypeArgumentKinds = declTypeArgumentKinds;
 String source;
 public JavaSource() {
 super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
 source = innerClassDeclArity.classDeclStr.replace("#B", bodyTemplate)
 .replace("#D", declType.getType(declTypeArgumentKinds))
 .replace("#S", siteType.getType(siteTypeArgumentKinds))
 .replace("#AL", argList.getArgs(argumentKinds));
 }
 @Override
 public CharSequence getCharContent(boolean ignoreEncodingErrors) {
 return source;
 }
 }
-void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
+@Override
-JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
+public void run() {
+JavacTask ct = (JavacTask)comp.getTask(null, fm.get(), diagChecker,
 null, null, Arrays.asList(source));
 try {
 ct.analyze();
 } catch (Throwable ex) {
-throw new AssertionError("Error thrown when compiling the following code:\n" + source.getCharContent(true));
+throw new AssertionError("Error thrown when compiling the following code:\n" +
+source.getCharContent(true));
 }
 check();
 }
 void check() {
-checkCount++;
+checkCount.incrementAndGet();
 boolean errorExpected = false;
-TypeArgumentKind[] expectedArgKinds = new TypeArgumentKind[innerClassDeclArity.n];
+TypeArgumentKind[] expectedArgKinds =
+new TypeArgumentKind[innerClassDeclArity.n];
 for (int i = 0 ; i < innerClassDeclArity.n ; i++) {
 if (!declTypeArgumentKinds[i].compatible(siteTypeArgumentKinds[i])) {
 errorExpected = true;
 break;
 }
-expectedArgKinds[i] = siteTypeArgumentKinds[i] == TypeArgumentKind.DIAMOND ?
+expectedArgKinds[i] = siteTypeArgumentKinds[i] ==
+TypeArgumentKind.DIAMOND ?
 declTypeArgumentKinds[i] : siteTypeArgumentKinds[i];
 }
 if (!errorExpected) {
 for (int i = 0 ; i < innerClassDeclArity.n ; i++) {
-//System.out.println("check " + expectedArgKinds[i] + " against " + argumentKinds[i]);
 if (!expectedArgKinds[i].compatible(argumentKinds[i])) {
 errorExpected = true;
 break;
 }
 }
 "\nFound error: " + diagChecker.errorFound +
 "\nExpected error: " + errorExpected);
 }
 }
-static class DiagnosticChecker implements javax.tools.DiagnosticListener<JavaFileObject> {
+static class DiagnosticChecker
+implements javax.tools.DiagnosticListener<JavaFileObject> {
 boolean errorFound;
 public void report(Diagnostic<? extends JavaFileObject> diagnostic) {
 if (diagnostic.getKind() == Diagnostic.Kind.ERROR) {
 errorFound = true;
 }
 }
 }
 }

changeset 15040	99fd9483d3f0
parent 11381	890ea587d133
child 15384	5a8d00abf076