diff options
Diffstat (limited to 'javaparser-testing/src/test/java/com')
13 files changed, 28 insertions, 16 deletions
diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/stmt/TryStmtTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/stmt/TryStmtTest.java index 34484e1a4..1a63b21f7 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/stmt/TryStmtTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/stmt/TryStmtTest.java @@ -10,6 +10,7 @@ import com.github.javaparser.ast.expr.VariableDeclarationExpr; import com.github.javaparser.ast.validator.Java9Validator; import org.junit.Test; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertInstanceOf; import static org.junit.Assert.assertTrue; @@ -72,7 +73,7 @@ public class TryStmtTest { } private <T> T parse9(String code) { - JavaParser parser = new JavaParser(new ParserConfiguration().setValidator(new Java9Validator())); + JavaParser parser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_9)); ParseResult<Statement> result = parser.parse(ParseStart.STATEMENT, provider(code)); assertTrue(result.toString(), result.isSuccessful()); return (T) result.getResult().get(); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java index 6606d2ec6..7160bcfb9 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_0ValidatorTest.java @@ -15,13 +15,14 @@ import java.util.ArrayList; import java.util.List; import static com.github.javaparser.ParseStart.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertNoProblems; import static com.github.javaparser.utils.TestUtils.assertProblems; import static org.junit.Assert.assertEquals; public class Java1_0ValidatorTest { - public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java1_0Validator())); + public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_0)); @Test public void tryWithoutResources() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java index 6aa1b8c02..6331d9ab1 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_1ValidatorTest.java @@ -11,12 +11,13 @@ import org.junit.Test; import static com.github.javaparser.ParseStart.COMPILATION_UNIT; import static com.github.javaparser.ParseStart.EXPRESSION; import static com.github.javaparser.ParseStart.STATEMENT; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertNoProblems; import static com.github.javaparser.utils.TestUtils.assertProblems; public class Java1_1ValidatorTest { - public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java1_1Validator())); + public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_1)); public static final String allModifiers = "public protected private abstract static final transient volatile synchronized native strictfp transitive default "; diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java index cd7a71d39..3ae7018fe 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_2ValidatorTest.java @@ -10,11 +10,12 @@ import org.junit.Test; import static com.github.javaparser.ParseStart.COMPILATION_UNIT; import static com.github.javaparser.ParseStart.STATEMENT; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertProblems; public class Java1_2ValidatorTest { - public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java1_2Validator())); + public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_2)); private final String allModifiers = "public protected private abstract static final transient volatile synchronized native strictfp transitive default "; diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java index 90e7ed3ce..b10114abf 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_3ValidatorTest.java @@ -7,11 +7,12 @@ import com.github.javaparser.ast.stmt.Statement; import org.junit.Test; import static com.github.javaparser.ParseStart.STATEMENT; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertProblems; public class Java1_3ValidatorTest { - public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java1_3Validator())); + public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_3)); @Test public void noAssert() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java index 60f62a5fb..ed0be99fe 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java1_4ValidatorTest.java @@ -9,12 +9,13 @@ import com.github.javaparser.ast.stmt.Statement; import org.junit.Test; import static com.github.javaparser.ParseStart.*; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertNoProblems; import static com.github.javaparser.utils.TestUtils.assertProblems; public class Java1_4ValidatorTest { - public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java1_4Validator())); + public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_1_4)); @Test public void yesAssert() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java5ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java5ValidatorTest.java index d212ab037..315167fda 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java5ValidatorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java5ValidatorTest.java @@ -11,13 +11,14 @@ import org.junit.Test; import static com.github.javaparser.ParseStart.*; import static com.github.javaparser.ParseStart.COMPILATION_UNIT; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.ast.validator.Java1_1ValidatorTest.allModifiers; import static com.github.javaparser.utils.TestUtils.assertNoProblems; import static com.github.javaparser.utils.TestUtils.assertProblems; public class Java5ValidatorTest { - public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java5Validator())); + public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_5)); @Test public void genericsWithoutDiamond() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java index 276e17cd9..d066abe07 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java6ValidatorTest.java @@ -9,11 +9,12 @@ import org.junit.Test; import static com.github.javaparser.ParseStart.EXPRESSION; import static com.github.javaparser.ParseStart.STATEMENT; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.TestUtils.assertProblems; public class Java6ValidatorTest { - public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java6Validator())); + public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_6)); @Test public void noStringsInSwitch() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java index 7c50fa31d..216fb5b13 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java8ValidatorTest.java @@ -9,13 +9,14 @@ import org.junit.Test; import static com.github.javaparser.ParseStart.COMPILATION_UNIT; import static com.github.javaparser.ParseStart.STATEMENT; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.ast.validator.Java1_1ValidatorTest.allModifiers; import static com.github.javaparser.utils.TestUtils.assertNoProblems; import static com.github.javaparser.utils.TestUtils.assertProblems; public class Java8ValidatorTest { - public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java8Validator())); + public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_8)); @Test public void localInterface() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java index 3e979d31a..911f6a984 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/ast/validator/Java9ValidatorTest.java @@ -9,13 +9,14 @@ import org.junit.Test; import static com.github.javaparser.ParseStart.COMPILATION_UNIT; import static com.github.javaparser.ParseStart.STATEMENT; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.ast.validator.Java1_1ValidatorTest.allModifiers; import static com.github.javaparser.utils.TestUtils.assertNoProblems; import static com.github.javaparser.utils.TestUtils.assertProblems; public class Java9ValidatorTest { - public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java9Validator())); + public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_9)); @Test public void underscoreIdentifiers() { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java b/javaparser-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java index a72f394ce..8932bd9b4 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/manual/BulkParseTest.java @@ -19,6 +19,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_9; import static com.github.javaparser.utils.CodeGenerationUtils.f; import static com.github.javaparser.utils.SourceRoot.Callback.Result.DONT_SAVE; import static com.github.javaparser.utils.TestUtils.download; @@ -48,13 +49,13 @@ public class BulkParseTest { then copying the "zip" link to the line below: */ download(new URL("http://hg.openjdk.java.net/jdk9/jdk9/langtools/archive/5ecbed313125.zip"), openJdkZipPath); } - bulkTest(new SourceZip(openJdkZipPath), "openjdk_src_repo_test_results.txt", new ParserConfiguration().setValidator(new Java9Validator())); + bulkTest(new SourceZip(openJdkZipPath), "openjdk_src_repo_test_results.txt", new ParserConfiguration().setLanguageLevel(JAVA_9)); } private void parseJdkSrcZip() throws IOException { // This is where Ubuntu stores the contents of package openjdk-8-src Path path = Paths.get("/usr/lib/jvm/openjdk-9/src.zip"); - bulkTest(new SourceZip(path), "openjdk_src_zip_test_results.txt", new ParserConfiguration().setValidator(new Java9Validator())); + bulkTest(new SourceZip(path), "openjdk_src_zip_test_results.txt", new ParserConfiguration().setLanguageLevel(JAVA_9)); } @Test @@ -62,7 +63,7 @@ public class BulkParseTest { bulkTest( new SourceRoot(CodeGenerationUtils.mavenModuleRoot(BulkParseTest.class).resolve("..")), "javaparser_test_results.txt", - new ParserConfiguration().setValidator(new Java9Validator())); + new ParserConfiguration().setLanguageLevel(JAVA_9)); } public void bulkTest(SourceRoot sourceRoot, String testResultsFileName, ParserConfiguration configuration) throws IOException { diff --git a/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java b/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java index 619b27cff..80ebe557e 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/modules/ModuleDeclarationTest.java @@ -11,20 +11,20 @@ import com.github.javaparser.ast.expr.Name; import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr; import com.github.javaparser.ast.modules.*; import com.github.javaparser.ast.type.ClassOrInterfaceType; -import com.github.javaparser.ast.validator.Java9Validator; import com.github.javaparser.printer.ConcreteSyntaxModel; import org.junit.Test; import static com.github.javaparser.GeneratedJavaParserConstants.IDENTIFIER; import static com.github.javaparser.JavaParser.parseClassOrInterfaceType; import static com.github.javaparser.JavaParser.parseName; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.JAVA_9; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.Utils.EOL; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; public class ModuleDeclarationTest { - public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java9Validator())); + public static final JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_9)); private final CompilationUnit parse(String code) { return javaParser.parse(ParseStart.COMPILATION_UNIT, provider(code)).getResult().get(); diff --git a/javaparser-testing/src/test/java/com/github/javaparser/utils/TestUtils.java b/javaparser-testing/src/test/java/com/github/javaparser/utils/TestUtils.java index 0213c1191..24f17670a 100644 --- a/javaparser-testing/src/test/java/com/github/javaparser/utils/TestUtils.java +++ b/javaparser-testing/src/test/java/com/github/javaparser/utils/TestUtils.java @@ -16,6 +16,7 @@ import java.util.stream.Collectors; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import static com.github.javaparser.ParserConfiguration.LanguageLevel.*; import static com.github.javaparser.Providers.provider; import static com.github.javaparser.utils.CodeGenerationUtils.f; import static com.github.javaparser.utils.Utils.EOL; @@ -140,7 +141,7 @@ public class TestUtils { } public static void assertExpressionValid(String expression) { - JavaParser javaParser = new JavaParser(new ParserConfiguration().setValidator(new Java9Validator())); + JavaParser javaParser = new JavaParser(new ParserConfiguration().setLanguageLevel(JAVA_9)); ParseResult<Expression> result = javaParser.parse(ParseStart.EXPRESSION, provider(expression)); assertEquals(true, result.isSuccessful(), result.getProblems().toString()); } |