From fdcfe5482f3d6b93b5d9a38b4176fb0aa6dae9a8 Mon Sep 17 00:00:00 2001 From: parrt Date: Wed, 24 Jun 2015 17:11:50 -0700 Subject: [PATCH] mv tool tests into their own top level directory; mv test template support .stg into the runtime-testsuite area --- .../resources}/org/antlr/v4/test/runtime/java/Java.test.stg | 0 .../test/org/antlr/v4/test/tool/BaseTest.java | 0 .../test/org/antlr/v4/test/tool/ErrorQueue.java | 0 .../test/org/antlr/v4/test/tool/InterpreterTreeTextProvider.java | 0 {tool => tool-testsuite}/test/org/antlr/v4/test/tool/Java-LR.g4 | 0 {tool => tool-testsuite}/test/org/antlr/v4/test/tool/Java.g4 | 0 .../test/org/antlr/v4/test/tool/JavaUnicodeInputStream.java | 0 .../test/org/antlr/v4/test/tool/ParserInterpreterForTesting.java | 0 .../test/org/antlr/v4/test/tool/PositionAdjustingLexer.g4 | 0 {tool => tool-testsuite}/test/org/antlr/v4/test/tool/Psl.g4 | 0 .../test/org/antlr/v4/test/tool/TestASTStructure.gunit | 0 .../test/org/antlr/v4/test/tool/TestASTStructure.java | 0 .../test/org/antlr/v4/test/tool/TestATNConstruction.java | 0 .../test/org/antlr/v4/test/tool/TestATNDeserialization.java | 0 .../test/org/antlr/v4/test/tool/TestATNInterpreter.java | 0 .../test/org/antlr/v4/test/tool/TestATNLexerInterpreter.java | 0 .../test/org/antlr/v4/test/tool/TestATNParserPrediction.java | 0 .../test/org/antlr/v4/test/tool/TestATNSerialization.java | 0 .../test/org/antlr/v4/test/tool/TestActionSplitter.java | 0 .../test/org/antlr/v4/test/tool/TestActionTranslation.java | 0 .../test/org/antlr/v4/test/tool/TestAmbigParseTrees.java | 0 .../test/org/antlr/v4/test/tool/TestAttributeChecks.java | 0 .../test/org/antlr/v4/test/tool/TestBasicSemanticErrors.java | 0 .../test/org/antlr/v4/test/tool/TestBufferedTokenStream.java | 0 .../test/org/antlr/v4/test/tool/TestCodeGeneration.java | 0 .../test/org/antlr/v4/test/tool/TestCommonTokenStream.java | 0 .../test/org/antlr/v4/test/tool/TestCompositeGrammars.java | 0 .../test/org/antlr/v4/test/tool/TestDollarParser.java | 0 .../test/org/antlr/v4/test/tool/TestErrorSets.java | 0 .../test/org/antlr/v4/test/tool/TestFastQueue.java | 0 .../test/org/antlr/v4/test/tool/TestGrammarParserInterpreter.java | 0 .../test/org/antlr/v4/test/tool/TestGraphNodes.java | 0 .../test/org/antlr/v4/test/tool/TestIntervalSet.java | 0 .../test/org/antlr/v4/test/tool/TestLeftRecursionToolIssues.java | 0 .../test/org/antlr/v4/test/tool/TestLexerActions.java | 0 .../test/org/antlr/v4/test/tool/TestLookaheadTrees.java | 0 .../test/org/antlr/v4/test/tool/TestParseTreeMatcher.java | 0 .../test/org/antlr/v4/test/tool/TestParserExec.java | 0 .../test/org/antlr/v4/test/tool/TestParserInterpreter.java | 0 .../test/org/antlr/v4/test/tool/TestParserProfiler.java | 0 .../test/org/antlr/v4/test/tool/TestPerformance.java | 0 .../test/org/antlr/v4/test/tool/TestScopeParsing.java | 0 .../test/org/antlr/v4/test/tool/TestSymbolIssues.java | 0 .../test/org/antlr/v4/test/tool/TestTokenPositionOptions.java | 0 .../test/org/antlr/v4/test/tool/TestTokenStreamRewriter.java | 0 .../test/org/antlr/v4/test/tool/TestTokenTypeAssignment.java | 0 .../test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java | 0 .../test/org/antlr/v4/test/tool/TestTopologicalSort.java | 0 .../test/org/antlr/v4/test/tool/TestUnbufferedCharStream.java | 0 .../test/org/antlr/v4/test/tool/TestUnbufferedTokenStream.java | 0 .../test/org/antlr/v4/test/tool/TestVocabulary.java | 0 .../test/org/antlr/v4/test/tool/TestXPath.java | 0 52 files changed, 0 insertions(+), 0 deletions(-) rename {tool/test => runtime-testsuite/resources}/org/antlr/v4/test/runtime/java/Java.test.stg (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/BaseTest.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/ErrorQueue.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/InterpreterTreeTextProvider.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/Java-LR.g4 (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/Java.g4 (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/JavaUnicodeInputStream.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/ParserInterpreterForTesting.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/PositionAdjustingLexer.g4 (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/Psl.g4 (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestASTStructure.gunit (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestASTStructure.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestATNConstruction.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestATNDeserialization.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestATNInterpreter.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestATNLexerInterpreter.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestATNParserPrediction.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestATNSerialization.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestActionSplitter.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestActionTranslation.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestAmbigParseTrees.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestAttributeChecks.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestBasicSemanticErrors.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestBufferedTokenStream.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestCodeGeneration.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestCommonTokenStream.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestCompositeGrammars.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestDollarParser.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestErrorSets.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestFastQueue.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestGrammarParserInterpreter.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestGraphNodes.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestIntervalSet.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestLeftRecursionToolIssues.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestLexerActions.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestLookaheadTrees.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestParseTreeMatcher.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestParserExec.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestParserInterpreter.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestParserProfiler.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestPerformance.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestScopeParsing.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestSymbolIssues.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestTokenPositionOptions.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestTokenStreamRewriter.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestTokenTypeAssignment.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestTopologicalSort.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestUnbufferedCharStream.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestUnbufferedTokenStream.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestVocabulary.java (100%) rename {tool => tool-testsuite}/test/org/antlr/v4/test/tool/TestXPath.java (100%) diff --git a/tool/test/org/antlr/v4/test/runtime/java/Java.test.stg b/runtime-testsuite/resources/org/antlr/v4/test/runtime/java/Java.test.stg similarity index 100% rename from tool/test/org/antlr/v4/test/runtime/java/Java.test.stg rename to runtime-testsuite/resources/org/antlr/v4/test/runtime/java/Java.test.stg diff --git a/tool/test/org/antlr/v4/test/tool/BaseTest.java b/tool-testsuite/test/org/antlr/v4/test/tool/BaseTest.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/BaseTest.java rename to tool-testsuite/test/org/antlr/v4/test/tool/BaseTest.java diff --git a/tool/test/org/antlr/v4/test/tool/ErrorQueue.java b/tool-testsuite/test/org/antlr/v4/test/tool/ErrorQueue.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/ErrorQueue.java rename to tool-testsuite/test/org/antlr/v4/test/tool/ErrorQueue.java diff --git a/tool/test/org/antlr/v4/test/tool/InterpreterTreeTextProvider.java b/tool-testsuite/test/org/antlr/v4/test/tool/InterpreterTreeTextProvider.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/InterpreterTreeTextProvider.java rename to tool-testsuite/test/org/antlr/v4/test/tool/InterpreterTreeTextProvider.java diff --git a/tool/test/org/antlr/v4/test/tool/Java-LR.g4 b/tool-testsuite/test/org/antlr/v4/test/tool/Java-LR.g4 similarity index 100% rename from tool/test/org/antlr/v4/test/tool/Java-LR.g4 rename to tool-testsuite/test/org/antlr/v4/test/tool/Java-LR.g4 diff --git a/tool/test/org/antlr/v4/test/tool/Java.g4 b/tool-testsuite/test/org/antlr/v4/test/tool/Java.g4 similarity index 100% rename from tool/test/org/antlr/v4/test/tool/Java.g4 rename to tool-testsuite/test/org/antlr/v4/test/tool/Java.g4 diff --git a/tool/test/org/antlr/v4/test/tool/JavaUnicodeInputStream.java b/tool-testsuite/test/org/antlr/v4/test/tool/JavaUnicodeInputStream.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/JavaUnicodeInputStream.java rename to tool-testsuite/test/org/antlr/v4/test/tool/JavaUnicodeInputStream.java diff --git a/tool/test/org/antlr/v4/test/tool/ParserInterpreterForTesting.java b/tool-testsuite/test/org/antlr/v4/test/tool/ParserInterpreterForTesting.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/ParserInterpreterForTesting.java rename to tool-testsuite/test/org/antlr/v4/test/tool/ParserInterpreterForTesting.java diff --git a/tool/test/org/antlr/v4/test/tool/PositionAdjustingLexer.g4 b/tool-testsuite/test/org/antlr/v4/test/tool/PositionAdjustingLexer.g4 similarity index 100% rename from tool/test/org/antlr/v4/test/tool/PositionAdjustingLexer.g4 rename to tool-testsuite/test/org/antlr/v4/test/tool/PositionAdjustingLexer.g4 diff --git a/tool/test/org/antlr/v4/test/tool/Psl.g4 b/tool-testsuite/test/org/antlr/v4/test/tool/Psl.g4 similarity index 100% rename from tool/test/org/antlr/v4/test/tool/Psl.g4 rename to tool-testsuite/test/org/antlr/v4/test/tool/Psl.g4 diff --git a/tool/test/org/antlr/v4/test/tool/TestASTStructure.gunit b/tool-testsuite/test/org/antlr/v4/test/tool/TestASTStructure.gunit similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestASTStructure.gunit rename to tool-testsuite/test/org/antlr/v4/test/tool/TestASTStructure.gunit diff --git a/tool/test/org/antlr/v4/test/tool/TestASTStructure.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestASTStructure.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestASTStructure.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestASTStructure.java diff --git a/tool/test/org/antlr/v4/test/tool/TestATNConstruction.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestATNConstruction.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestATNConstruction.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestATNConstruction.java diff --git a/tool/test/org/antlr/v4/test/tool/TestATNDeserialization.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestATNDeserialization.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestATNDeserialization.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestATNDeserialization.java diff --git a/tool/test/org/antlr/v4/test/tool/TestATNInterpreter.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestATNInterpreter.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestATNInterpreter.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestATNInterpreter.java diff --git a/tool/test/org/antlr/v4/test/tool/TestATNLexerInterpreter.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestATNLexerInterpreter.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestATNLexerInterpreter.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestATNLexerInterpreter.java diff --git a/tool/test/org/antlr/v4/test/tool/TestATNParserPrediction.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestATNParserPrediction.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestATNParserPrediction.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestATNParserPrediction.java diff --git a/tool/test/org/antlr/v4/test/tool/TestATNSerialization.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestATNSerialization.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestATNSerialization.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestATNSerialization.java diff --git a/tool/test/org/antlr/v4/test/tool/TestActionSplitter.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestActionSplitter.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestActionSplitter.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestActionSplitter.java diff --git a/tool/test/org/antlr/v4/test/tool/TestActionTranslation.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestActionTranslation.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestActionTranslation.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestActionTranslation.java diff --git a/tool/test/org/antlr/v4/test/tool/TestAmbigParseTrees.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestAmbigParseTrees.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestAmbigParseTrees.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestAmbigParseTrees.java diff --git a/tool/test/org/antlr/v4/test/tool/TestAttributeChecks.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestAttributeChecks.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestAttributeChecks.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestAttributeChecks.java diff --git a/tool/test/org/antlr/v4/test/tool/TestBasicSemanticErrors.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestBasicSemanticErrors.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestBasicSemanticErrors.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestBasicSemanticErrors.java diff --git a/tool/test/org/antlr/v4/test/tool/TestBufferedTokenStream.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestBufferedTokenStream.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestBufferedTokenStream.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestBufferedTokenStream.java diff --git a/tool/test/org/antlr/v4/test/tool/TestCodeGeneration.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestCodeGeneration.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestCodeGeneration.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestCodeGeneration.java diff --git a/tool/test/org/antlr/v4/test/tool/TestCommonTokenStream.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestCommonTokenStream.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestCommonTokenStream.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestCommonTokenStream.java diff --git a/tool/test/org/antlr/v4/test/tool/TestCompositeGrammars.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestCompositeGrammars.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestCompositeGrammars.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestCompositeGrammars.java diff --git a/tool/test/org/antlr/v4/test/tool/TestDollarParser.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestDollarParser.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestDollarParser.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestDollarParser.java diff --git a/tool/test/org/antlr/v4/test/tool/TestErrorSets.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestErrorSets.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestErrorSets.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestErrorSets.java diff --git a/tool/test/org/antlr/v4/test/tool/TestFastQueue.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestFastQueue.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestFastQueue.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestFastQueue.java diff --git a/tool/test/org/antlr/v4/test/tool/TestGrammarParserInterpreter.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestGrammarParserInterpreter.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestGrammarParserInterpreter.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestGrammarParserInterpreter.java diff --git a/tool/test/org/antlr/v4/test/tool/TestGraphNodes.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestGraphNodes.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestGraphNodes.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestGraphNodes.java diff --git a/tool/test/org/antlr/v4/test/tool/TestIntervalSet.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestIntervalSet.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestIntervalSet.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestIntervalSet.java diff --git a/tool/test/org/antlr/v4/test/tool/TestLeftRecursionToolIssues.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestLeftRecursionToolIssues.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestLeftRecursionToolIssues.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestLeftRecursionToolIssues.java diff --git a/tool/test/org/antlr/v4/test/tool/TestLexerActions.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestLexerActions.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestLexerActions.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestLexerActions.java diff --git a/tool/test/org/antlr/v4/test/tool/TestLookaheadTrees.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestLookaheadTrees.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestLookaheadTrees.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestLookaheadTrees.java diff --git a/tool/test/org/antlr/v4/test/tool/TestParseTreeMatcher.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestParseTreeMatcher.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestParseTreeMatcher.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestParseTreeMatcher.java diff --git a/tool/test/org/antlr/v4/test/tool/TestParserExec.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestParserExec.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestParserExec.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestParserExec.java diff --git a/tool/test/org/antlr/v4/test/tool/TestParserInterpreter.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestParserInterpreter.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestParserInterpreter.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestParserInterpreter.java diff --git a/tool/test/org/antlr/v4/test/tool/TestParserProfiler.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestParserProfiler.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestParserProfiler.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestParserProfiler.java diff --git a/tool/test/org/antlr/v4/test/tool/TestPerformance.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestPerformance.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestPerformance.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestPerformance.java diff --git a/tool/test/org/antlr/v4/test/tool/TestScopeParsing.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestScopeParsing.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestScopeParsing.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestScopeParsing.java diff --git a/tool/test/org/antlr/v4/test/tool/TestSymbolIssues.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestSymbolIssues.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestSymbolIssues.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestSymbolIssues.java diff --git a/tool/test/org/antlr/v4/test/tool/TestTokenPositionOptions.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestTokenPositionOptions.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestTokenPositionOptions.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestTokenPositionOptions.java diff --git a/tool/test/org/antlr/v4/test/tool/TestTokenStreamRewriter.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestTokenStreamRewriter.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestTokenStreamRewriter.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestTokenStreamRewriter.java diff --git a/tool/test/org/antlr/v4/test/tool/TestTokenTypeAssignment.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestTokenTypeAssignment.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestTokenTypeAssignment.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestTokenTypeAssignment.java diff --git a/tool/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestToolSyntaxErrors.java diff --git a/tool/test/org/antlr/v4/test/tool/TestTopologicalSort.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestTopologicalSort.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestTopologicalSort.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestTopologicalSort.java diff --git a/tool/test/org/antlr/v4/test/tool/TestUnbufferedCharStream.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestUnbufferedCharStream.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestUnbufferedCharStream.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestUnbufferedCharStream.java diff --git a/tool/test/org/antlr/v4/test/tool/TestUnbufferedTokenStream.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestUnbufferedTokenStream.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestUnbufferedTokenStream.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestUnbufferedTokenStream.java diff --git a/tool/test/org/antlr/v4/test/tool/TestVocabulary.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestVocabulary.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestVocabulary.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestVocabulary.java diff --git a/tool/test/org/antlr/v4/test/tool/TestXPath.java b/tool-testsuite/test/org/antlr/v4/test/tool/TestXPath.java similarity index 100% rename from tool/test/org/antlr/v4/test/tool/TestXPath.java rename to tool-testsuite/test/org/antlr/v4/test/tool/TestXPath.java