diff --git a/.travis.yml b/.travis.yml index 812eca9b0..d27ee56b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,7 @@ matrix: env: - TARGET=cpp - CXX=g++-5 + - GROUP=ALL addons: apt: sources: @@ -22,7 +23,9 @@ matrix: - os: osx compiler: clang osx_image: xcode8.1 - env: TARGET=cpp + env: + - TARGET=cpp + - GROUP=LEXER addons: apt: sources: @@ -35,13 +38,71 @@ matrix: - os: osx compiler: clang osx_image: xcode8.1 - env: TARGET=swift + env: + - TARGET=cpp + - GROUP=PARSER + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - g++-5 + - uuid-dev + - clang-3.7 + - os: osx + compiler: clang + osx_image: xcode8.1 + env: + - TARGET=cpp + - GROUP=RECURSION + addons: + apt: + sources: + - ubuntu-toolchain-r-test + - llvm-toolchain-precise-3.7 + packages: + - g++-5 + - uuid-dev + - clang-3.7 + - os: osx + compiler: clang + osx_image: xcode8.1 + env: + - TARGET=swift + - GROUP=LEXER + - os: osx + compiler: clang + osx_image: xcode8.1 + env: + - TARGET=swift + - GROUP=PARSER + - os: osx + compiler: clang + osx_image: xcode8.1 + env: + - TARGET=swift + - GROUP=RECURSION - os: linux compiler: clang - env: TARGET=swift + env: + - TARGET=swift + - GROUP=ALL - os: osx osx_image: xcode8.2 - env: TARGET=dotnet + env: + - TARGET=dotnet + - GROUP=LEXER + - os: osx + osx_image: xcode8.2 + env: + - TARGET=dotnet + - GROUP=PARSER + - os: osx + osx_image: xcode8.2 + env: + - TARGET=dotnet + - GROUP=RECURSION - os: linux jdk: oraclejdk7 env: TARGET=java @@ -54,7 +115,21 @@ matrix: - os: linux jdk: oraclejdk8 dist: trusty - env: TARGET=dotnet + env: + - TARGET=dotnet + - GROUP=LEXER + - os: linux + jdk: oraclejdk8 + dist: trusty + env: + - TARGET=dotnet + - GROUP=PARSER + - os: linux + jdk: oraclejdk8 + dist: trusty + env: + - TARGET=dotnet + - GROUP=RECURSION - os: linux jdk: oraclejdk7 env: TARGET=python2 diff --git a/.travis/run-tests-cpp.sh b/.travis/run-tests-cpp.sh index ad32820c7..768926a61 100755 --- a/.travis/run-tests-cpp.sh +++ b/.travis/run-tests-cpp.sh @@ -1,3 +1,12 @@ #!/bin/bash -mvn -q -Dtest=cpp.* test # timeout due to no output for 10 min on travis if in parallel +if [ $GROUP == "LEXER" ]; then + mvn -q -Dgroups="org.antlr.v4.test.runtime.category.LexerTests" -Dtest=cpp.* test +elif [ $GROUP == "PARSER" ]; then + mvn -q -Dgroups="org.antlr.v4.test.runtime.category.ParserTests" -Dtest=cpp.* test +elif [ $GROUP == "RECURSION" ]; then + mvn -q -Dgroups="org.antlr.v4.test.runtime.category.LeftRecursionTests" -Dtest=cpp.* test +else + mvn -q -Dtest=cpp.* test +fi + diff --git a/.travis/run-tests-dotnet.sh b/.travis/run-tests-dotnet.sh index 83fbe6d58..d49e30044 100755 --- a/.travis/run-tests-dotnet.sh +++ b/.travis/run-tests-dotnet.sh @@ -8,5 +8,12 @@ dotnet build -c Release ../runtime/CSharp/runtime/CSharp/Antlr4.Runtime/Antlr4.R # call test -mvn -q -Dparallel=classes -DthreadCount=4 -Dtest=csharp.* -Dantlr-csharp-netstandard=true test - +if [ $GROUP == "LEXER" ]; then + mvn -q -Dgroups="org.antlr.v4.test.runtime.category.LexerTests" -Dparallel=classes -DthreadCount=4 -Dtest=csharp.* -Dantlr-csharp-netstandard=true test +elif [ $GROUP == "PARSER" ]; then + mvn -q -Dgroups="org.antlr.v4.test.runtime.category.ParserTests" -Dparallel=classes -DthreadCount=4 -Dtest=csharp.* -Dantlr-csharp-netstandard=true test +elif [ $GROUP == "RECURSION" ]; then + mvn -q -Dgroups="org.antlr.v4.test.runtime.category.LeftRecursionTests" -Dparallel=classes -DthreadCount=4 -Dtest=csharp.* -Dantlr-csharp-netstandard=true test +else + mvn -q -Dparallel=classes -DthreadCount=4 -Dtest=csharp.* -Dantlr-csharp-netstandard=true test +fi diff --git a/.travis/run-tests-swift.sh b/.travis/run-tests-swift.sh index f0ffae029..56d2cec65 100755 --- a/.travis/run-tests-swift.sh +++ b/.travis/run-tests-swift.sh @@ -17,4 +17,12 @@ fi swift --version swift build --version -mvn -q -Dtest=swift.* test +if [ $GROUP == "LEXER" ]; then + mvn -q -Dgroups="org.antlr.v4.test.runtime.category.LexerTests" -Dtest=swift.* test +elif [ $GROUP == "PARSER" ]; then + mvn -q -Dgroups="org.antlr.v4.test.runtime.category.ParserTests" -Dtest=swift.* test +elif [ $GROUP == "RECURSION" ]; then + mvn -q -Dgroups="org.antlr.v4.test.runtime.category.LeftRecursionTests" -Dtest=swift.* test +else + mvn -q -Dtest=swift.* test +fi diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/category/LeftRecursionTests.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/category/LeftRecursionTests.java new file mode 100644 index 000000000..11c90a9af --- /dev/null +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/category/LeftRecursionTests.java @@ -0,0 +1,7 @@ +package org.antlr.v4.test.runtime.category; + +/** + * Created by ericvergnaud on 27/06/2017. + */ +public class LeftRecursionTests { +} diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/category/LexerTests.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/category/LexerTests.java new file mode 100644 index 000000000..8e534c0d1 --- /dev/null +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/category/LexerTests.java @@ -0,0 +1,7 @@ +package org.antlr.v4.test.runtime.category; + +/** + * Created by ericvergnaud on 27/06/2017. + */ +public class LexerTests { +} diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/category/ParserTests.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/category/ParserTests.java new file mode 100644 index 000000000..7ad7cd957 --- /dev/null +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/category/ParserTests.java @@ -0,0 +1,7 @@ +package org.antlr.v4.test.runtime.category; + +/** + * Created by ericvergnaud on 27/06/2017. + */ +public class ParserTests { +} diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestCompositeLexers.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestCompositeLexers.java index a124e5a04..182d2536c 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestCompositeLexers.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestCompositeLexers.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.CompositeLexersDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestCompositeLexers extends BaseRuntimeTest { public TestCompositeLexers(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestCompositeParsers.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestCompositeParsers.java index 6af6c86ce..98dfbc79a 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestCompositeParsers.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestCompositeParsers.java @@ -6,12 +6,16 @@ package org.antlr.v4.test.runtime.cpp; +import org.antlr.v4.codegen.model.Parser; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.CompositeParsersDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestCompositeParsers extends BaseRuntimeTest { public TestCompositeParsers(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestFullContextParsing.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestFullContextParsing.java index 79316a842..96d1d5b63 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestFullContextParsing.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestFullContextParsing.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.FullContextParsingDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestFullContextParsing extends BaseRuntimeTest { public TestFullContextParsing(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLeftRecursion.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLeftRecursion.java index ddb786a3f..962be4bbe 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLeftRecursion.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLeftRecursion.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LeftRecursionTests; import org.antlr.v4.test.runtime.descriptors.LeftRecursionDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LeftRecursionTests.class) @RunWith(Parameterized.class) public class TestLeftRecursion extends BaseRuntimeTest { public TestLeftRecursion(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLexerErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLexerErrors.java index a5a3b8184..05307d6f7 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLexerErrors.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLexerErrors.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.LexerErrorsDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestLexerErrors extends BaseRuntimeTest { public TestLexerErrors(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLexerExec.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLexerExec.java index e75083422..9c5cc89a9 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLexerExec.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestLexerExec.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.LexerExecDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestLexerExec extends BaseRuntimeTest { public TestLexerExec(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestListeners.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestListeners.java index a89a6e28a..75a6d1000 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestListeners.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestListeners.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ListenersDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestListeners extends BaseRuntimeTest { public TestListeners(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParseTrees.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParseTrees.java index e2d46f040..ca333afc5 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParseTrees.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParseTrees.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ParseTreesDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestParseTrees extends BaseRuntimeTest { public TestParseTrees(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParserErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParserErrors.java index 26b06d965..aa8fc80fd 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParserErrors.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParserErrors.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ParserErrorsDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestParserErrors extends BaseRuntimeTest { public TestParserErrors(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParserExec.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParserExec.java index 80a26f34b..999f3116f 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParserExec.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestParserExec.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ParserExecDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestParserExec extends BaseRuntimeTest { public TestParserExec(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestPerformance.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestPerformance.java index 225be4087..7ab384ce5 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestPerformance.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestPerformance.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.PerformanceDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestPerformance extends BaseRuntimeTest { public TestPerformance(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSemPredEvalLexer.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSemPredEvalLexer.java index 587f432e9..23f90bd83 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSemPredEvalLexer.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSemPredEvalLexer.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.SemPredEvalLexerDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestSemPredEvalLexer extends BaseRuntimeTest { public TestSemPredEvalLexer(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSemPredEvalParser.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSemPredEvalParser.java index 0d8115df3..3b3eb5ca1 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSemPredEvalParser.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSemPredEvalParser.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.SemPredEvalParserDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestSemPredEvalParser extends BaseRuntimeTest { public TestSemPredEvalParser(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSets.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSets.java index c6458b467..a1345ae17 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSets.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/cpp/TestSets.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.cpp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.SetsDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestSets extends BaseRuntimeTest { public TestSets(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestCompositeLexers.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestCompositeLexers.java index e544724b6..69ca0ca0f 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestCompositeLexers.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestCompositeLexers.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.CompositeLexersDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestCompositeLexers extends BaseRuntimeTest { public TestCompositeLexers(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestCompositeParsers.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestCompositeParsers.java index 2331caae2..930d408d5 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestCompositeParsers.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestCompositeParsers.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.CompositeParsersDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestCompositeParsers extends BaseRuntimeTest { public TestCompositeParsers(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestFullContextParsing.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestFullContextParsing.java index e4e9fe3cc..543674a97 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestFullContextParsing.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestFullContextParsing.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.FullContextParsingDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestFullContextParsing extends BaseRuntimeTest { public TestFullContextParsing(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLeftRecursion.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLeftRecursion.java index e4c93c416..b5e9994bc 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLeftRecursion.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLeftRecursion.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LeftRecursionTests; import org.antlr.v4.test.runtime.descriptors.LeftRecursionDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LeftRecursionTests.class) @RunWith(Parameterized.class) public class TestLeftRecursion extends BaseRuntimeTest { public TestLeftRecursion(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLexerErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLexerErrors.java index 2e49ea115..a49ec51e9 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLexerErrors.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLexerErrors.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.LexerErrorsDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestLexerErrors extends BaseRuntimeTest { public TestLexerErrors(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLexerExec.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLexerExec.java index f53be2e77..7ba180119 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLexerExec.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestLexerExec.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.LexerExecDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestLexerExec extends BaseRuntimeTest { public TestLexerExec(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestListeners.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestListeners.java index 4ce2a9b95..e8d599998 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestListeners.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestListeners.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ListenersDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestListeners extends BaseRuntimeTest { public TestListeners(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParseTrees.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParseTrees.java index d8b047e28..22110fa23 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParseTrees.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParseTrees.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ParseTreesDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestParseTrees extends BaseRuntimeTest { public TestParseTrees(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserErrors.java index 903952945..b7a2463f0 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserErrors.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserErrors.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ParserErrorsDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestParserErrors extends BaseRuntimeTest { public TestParserErrors(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserExec.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserExec.java index f3157311d..2561dbf10 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserExec.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestParserExec.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ParserExecDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestParserExec extends BaseRuntimeTest { public TestParserExec(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestPerformance.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestPerformance.java index 8d38e29f2..108ea1878 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestPerformance.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestPerformance.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.PerformanceDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestPerformance extends BaseRuntimeTest { public TestPerformance(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSemPredEvalLexer.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSemPredEvalLexer.java index 14258bdf0..f2fa2d2a3 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSemPredEvalLexer.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSemPredEvalLexer.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.SemPredEvalLexerDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestSemPredEvalLexer extends BaseRuntimeTest { public TestSemPredEvalLexer(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSemPredEvalParser.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSemPredEvalParser.java index 4803de18b..5ecab67c8 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSemPredEvalParser.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSemPredEvalParser.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.SemPredEvalParserDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestSemPredEvalParser extends BaseRuntimeTest { public TestSemPredEvalParser(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSets.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSets.java index b9b6168b3..1b970e30b 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSets.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/csharp/TestSets.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.csharp; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.SetsDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestSets extends BaseRuntimeTest { public TestSets(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestCompositeLexers.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestCompositeLexers.java index 3786d83c4..5dad5c839 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestCompositeLexers.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestCompositeLexers.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.CompositeLexersDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestCompositeLexers extends BaseRuntimeTest { public TestCompositeLexers(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestCompositeParsers.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestCompositeParsers.java index fa1d8e787..faaa7792e 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestCompositeParsers.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestCompositeParsers.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.CompositeParsersDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestCompositeParsers extends BaseRuntimeTest { public TestCompositeParsers(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestFullContextParsing.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestFullContextParsing.java index 9bfe4587c..ad3844211 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestFullContextParsing.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestFullContextParsing.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.FullContextParsingDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestFullContextParsing extends BaseRuntimeTest { public TestFullContextParsing(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLeftRecursion.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLeftRecursion.java index 5ebe190d0..cfea28411 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLeftRecursion.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLeftRecursion.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LeftRecursionTests; import org.antlr.v4.test.runtime.descriptors.LeftRecursionDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LeftRecursionTests.class) @RunWith(Parameterized.class) public class TestLeftRecursion extends BaseRuntimeTest { public TestLeftRecursion(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLexerErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLexerErrors.java index ff45db2a2..9e094dc48 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLexerErrors.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLexerErrors.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.LexerErrorsDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestLexerErrors extends BaseRuntimeTest { public TestLexerErrors(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLexerExec.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLexerExec.java index 8dab7319e..9d5a64716 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLexerExec.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestLexerExec.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.LexerExecDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestLexerExec extends BaseRuntimeTest { public TestLexerExec(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestListeners.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestListeners.java index e27d5e057..330680de9 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestListeners.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestListeners.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ListenersDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestListeners extends BaseRuntimeTest { public TestListeners(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParseTrees.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParseTrees.java index f3542a1ae..a03e8fa57 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParseTrees.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParseTrees.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ParseTreesDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestParseTrees extends BaseRuntimeTest { public TestParseTrees(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParserErrors.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParserErrors.java index fd5c0e70b..98d310e99 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParserErrors.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParserErrors.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ParserErrorsDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestParserErrors extends BaseRuntimeTest { public TestParserErrors(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParserExec.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParserExec.java index 030ae4c30..23b9823df 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParserExec.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestParserExec.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.ParserExecDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestParserExec extends BaseRuntimeTest { public TestParserExec(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestPerformance.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestPerformance.java index 717d09507..469877d3d 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestPerformance.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestPerformance.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.PerformanceDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestPerformance extends BaseRuntimeTest { public TestPerformance(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSemPredEvalLexer.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSemPredEvalLexer.java index 9629669fb..fe0e380a5 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSemPredEvalLexer.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSemPredEvalLexer.java @@ -9,10 +9,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.SemPredEvalLexerDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestSemPredEvalLexer extends BaseRuntimeTest { public TestSemPredEvalLexer(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSemPredEvalParser.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSemPredEvalParser.java index 78e5b7c16..ba231c967 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSemPredEvalParser.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSemPredEvalParser.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.ParserTests; import org.antlr.v4.test.runtime.descriptors.SemPredEvalParserDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(ParserTests.class) @RunWith(Parameterized.class) public class TestSemPredEvalParser extends BaseRuntimeTest { public TestSemPredEvalParser(RuntimeTestDescriptor descriptor) { diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSets.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSets.java index 979714bc6..e46e9514d 100644 --- a/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSets.java +++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/swift/TestSets.java @@ -8,10 +8,13 @@ package org.antlr.v4.test.runtime.swift; import org.antlr.v4.test.runtime.BaseRuntimeTest; import org.antlr.v4.test.runtime.RuntimeTestDescriptor; +import org.antlr.v4.test.runtime.category.LexerTests; import org.antlr.v4.test.runtime.descriptors.SetsDescriptors; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +@Category(LexerTests.class) @RunWith(Parameterized.class) public class TestSets extends BaseRuntimeTest { public TestSets(RuntimeTestDescriptor descriptor) {