jdk8-mips64-public/langtools: comparison test/tools/javac/lambda/LambdaParserTest.java

-:d07340b61e6a
+:954541f13717
 /*
-* 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 7115050
 * @bug 8003280
 * @summary Add lambda tests
 *  Add parser support for lambda expressions
+* @library ../lib
+* @build JavacTestingAbstractThreadedTest
+* @run main LambdaParserTest
 */
-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 com.sun.source.util.JavacTask;
-import javax.tools.ToolProvider;
+public class LambdaParserTest
-public class LambdaParserTest {
+extends JavacTestingAbstractThreadedTest
+implements Runnable {
-static int checkCount = 0;
 enum LambdaKind {
 NILARY_EXPR("()->x"),
 NILARY_STMT("()->{ return x; }"),
 ONEARY_SHORT_EXPR("x->x"),
 this.subExpression = subExpression;
 }
 }
 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 (LambdaKind lk : LambdaKind.values()) {
 for (LambdaParameterKind pk1 : LambdaParameterKind.values()) {
-if (lk.arity() < 1 && pk1 != LambdaParameterKind.IMPLICIT) continue;
+if (lk.arity() < 1 && pk1 != LambdaParameterKind.IMPLICIT)
+continue;
 for (LambdaParameterKind pk2 : LambdaParameterKind.values()) {
-if (lk.arity() < 2 && pk2 != LambdaParameterKind.IMPLICIT) continue;
+if (lk.arity() < 2 && pk2 != LambdaParameterKind.IMPLICIT)
+continue;
 for (ModifierKind mk1 : ModifierKind.values()) {
-if (mk1 != ModifierKind.NONE && lk.isShort()) continue;
+if (mk1 != ModifierKind.NONE && lk.isShort())
-if (lk.arity() < 1 && mk1 != ModifierKind.NONE) continue;
+continue;
+if (lk.arity() < 1 && mk1 != ModifierKind.NONE)
+continue;
 for (ModifierKind mk2 : ModifierKind.values()) {
-if (lk.arity() < 2 && mk2 != ModifierKind.NONE) continue;
+if (lk.arity() < 2 && mk2 != ModifierKind.NONE)
+continue;
 for (SubExprKind sk : SubExprKind.values()) {
 for (ExprKind ek : ExprKind.values()) {
-new LambdaParserTest(pk1, pk2, mk1, mk2, lk, sk, ek)
+pool.execute(
-.run(comp, fm);
+new LambdaParserTest(pk1, pk2, mk1,
+mk2, lk, sk, ek));
 }
 }
 }
 }
 }
 }
 }
-System.out.println("Total check executed: " + checkCount);
+checkAfterExec();
 }
 LambdaParameterKind pk1;
 LambdaParameterKind pk2;
 ModifierKind mk1;
 SubExprKind sk;
 ExprKind ek;
 JavaSource source;
 DiagnosticChecker diagChecker;
-LambdaParserTest(LambdaParameterKind pk1, LambdaParameterKind pk2, ModifierKind mk1,
+LambdaParserTest(LambdaParameterKind pk1, LambdaParameterKind pk2,
-ModifierKind mk2, LambdaKind lk, SubExprKind sk, ExprKind ek) {
+ModifierKind mk1, ModifierKind mk2, LambdaKind lk,
+SubExprKind sk, ExprKind ek) {
 this.pk1 = pk1;
 this.pk2 = pk2;
 this.mk1 = mk1;
 this.mk2 = mk2;
 this.lk = lk;
 String source;
 public JavaSource() {
 super(URI.create("myfo:/Test.java"), JavaFileObject.Kind.SOURCE);
-source = template.replaceAll("#E", ek.expressionString(pk1, pk2, mk1, mk2, lk, sk));
+source = template.replaceAll("#E",
+ek.expressionString(pk1, pk2, mk1, mk2, lk, sk));
 }
 @Override
 public CharSequence getCharContent(boolean ignoreEncodingErrors) {
 return source;
 }
 }
-void run(JavaCompiler tool, StandardJavaFileManager fm) throws Exception {
+public void run() {
-JavacTask ct = (JavacTask)tool.getTask(null, fm, diagChecker,
+JavacTask ct = (JavacTask)comp.getTask(null, fm.get(), diagChecker,
 null, null, Arrays.asList(source));
 try {
 ct.parse();
 } catch (Throwable ex) {
-throw new AssertionError("Error thrown when parsing the following source:\n" + source.getCharContent(true));
+processException(ex);
+return;
 }
 check();
 }
 void check() {
-checkCount++;
+checkCount.incrementAndGet();
 boolean errorExpected = (lk.arity() > 0 && !mk1.compatibleWith(pk1)) ||
 (lk.arity() > 1 && !mk2.compatibleWith(pk2));
 if (lk.arity() == 2 &&
 "\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;
 }
 }
 }
 }

Mercurial > jdk8-mips64-public > langtools / file comparison

comparison: test/tools/javac/lambda/LambdaParserTest.java

test/tools/javac/lambda/LambdaParserTest.java