Py3 Runtime: distribute the tests

contributors.txt

@@ -279,4 +279,5 @@ YYYY/MM/DD, github id, Full name, email
 2020/10/16, adarshbhat, Adarsh Bhat, adarshbhat@users.noreply.github.com
 2020/10/20, adamwojs, Adam Wójs, adam[at]wojs.pl
 2020/10/24, cliid, Jiwu Jang, jiwujang@naver.com
-2020/11/05, MichelHartmann, Michel Hartmann, MichelHartmann@users.noreply.github.com
+2020/11/05, MichelHartmann, Michel Hartmann, MichelHartmann@users.noreply.github.com
+2020/11/26, mr-c, Michael R. Crusoe, 1330696+mr-c@users.noreply.github.com

runtime/Python3/MANIFEST.in

@@ -1 +1,2 @@
-include *.txt
+include *.txt
+recursive-include test *.py

runtime/Python3/setup.py

@@ -3,14 +3,19 @@
 setup(
     name='antlr4-python3-runtime',
     version='4.9',
-    packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree', 'antlr4.error', 'antlr4.xpath'],
-    package_dir={'': 'src'},
+    packages=['antlr4', 'antlr4.atn', 'antlr4.dfa', 'antlr4.tree',
+              'antlr4.error', 'antlr4.xpath', 'antlr4.test',
+              'antlr4.test.mocks', 'antlr4.test.expr',
+              'antlr4.test.parser'],
+    package_dir={'': 'src',
+                 'antlr4.test': 'test', },
     install_requires=[
         "typing ; python_version<'3.5'",
     ],
     url='http://www.antlr.org',
     license='BSD',
     author='Eric Vergnaud, Terence Parr, Sam Harwell',
     author_email='eric.vergnaud@wanadoo.fr',
+    scripts=["bin/pygrun"],
     description='ANTLR 4.9 runtime for Python 3.7'
 )

runtime/Python3/test/TestTokenStreamRewriter.py

@@ -5,7 +5,7 @@
 import unittest
 
 
-from mocks.TestLexer import TestLexer, TestLexer2
+from antlr4.test.mocks.TestLexer import TestLexer, TestLexer2
 from antlr4.TokenStreamRewriter import TokenStreamRewriter
 from antlr4.InputStream import InputStream
 from antlr4.CommonTokenStream import CommonTokenStream

runtime/Python3/test/ctest.py

@@ -7,8 +7,8 @@
 import sys
 sys.setrecursionlimit(4000)
 import antlr4
-from parser.cparser import CParser
-from parser.clexer import CLexer
+from antlr4.test.parser.cparser import CParser
+from antlr4.test.parser.clexer import CLexer
 from datetime import datetime
 import cProfile
 
@@ -47,4 +47,4 @@ def main():
     # print(str(after-before))
 
 if __name__ == '__main__':
-    cProfile.run("main()", sort='tottime')
+    cProfile.run("main()", sort='tottime')

runtime/Python3/test/xpathtest.py

@@ -2,8 +2,8 @@
 from antlr4 import InputStream, CommonTokenStream, TerminalNode
 from antlr4.xpath.XPath import XPath
 import unittest
-from expr.ExprParser import ExprParser
-from expr.ExprLexer  import ExprLexer
+from antlr4.test.expr.ExprParser import ExprParser
+from antlr4.test.expr.ExprLexer  import ExprLexer
 
 def tokenToString(token, ruleNames):
     if isinstance(token, TerminalNode):
@@ -86,4 +86,4 @@ def testValidPaths(self):
             self.assertEqual(res_str, expected, "Failed test %s" % path)
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()