From e365d7aea0e35ee2d0a8a95aec8711a6ae7eb6d5 Mon Sep 17 00:00:00 2001 From: "C. Scott Ananian" Date: Sat, 13 Oct 2018 11:13:05 -0400 Subject: [PATCH] Update the Python codegen target & tests --- runtime/Python/hudson-build.sh | 2 +- runtime/Python/setup.py | 7 +- runtime/Python/tests/t001lexer.py | 10 +- runtime/Python/tests/t002lexer.py | 8 +- runtime/Python/tests/t003lexer.py | 10 +- runtime/Python/tests/t004lexer.py | 4 +- runtime/Python/tests/t022scopes.py | 12 +- runtime/Python/tests/t033backtracking.py | 1 - runtime/Python/tests/t042ast.py | 158 ++++++------ runtime/Python/tests/t044trace.py | 6 +- runtime/Python/tests/t046rewrite.py | 2 +- runtime/Python/tests/t047treeparser.py | 6 +- runtime/Python/tests/t048rewrite.py | 100 ++++---- runtime/Python/tests/t049treeparser.py | 18 +- runtime/Python/tests/t051treeRewriteAST.py | 64 ++--- runtime/Python/tests/t052import.py | 16 +- runtime/Python/tests/t053hetero.py | 46 ++-- runtime/Python/tests/t054main.py | 16 +- runtime/Python/tests/t055templates.py | 24 +- runtime/Python/tests/t056lexer.py | 2 +- runtime/Python/tests/t057autoAST.py | 20 +- runtime/Python/tests/t058rewriteAST.py | 18 +- runtime/Python/unittests/testdfa.py | 2 +- runtime/Python/unittests/testrecognizers.py | 4 +- runtime/Python/unittests/teststreams.py | 232 +++++++++--------- runtime/Python/unittests/testtree.py | 230 ++++++++--------- runtime/Python/unittests/testtreewizard.py | 218 ++++++++-------- .../antlr/codegen/templates/Python/Python.stg | 21 +- 28 files changed, 631 insertions(+), 626 deletions(-) diff --git a/runtime/Python/hudson-build.sh b/runtime/Python/hudson-build.sh index fbe6f8428..f6af0a69d 100755 --- a/runtime/Python/hudson-build.sh +++ b/runtime/Python/hudson-build.sh @@ -24,7 +24,7 @@ cd $WORKSPACE # stringtemplate3 if [ ! -f stringtemplate3-$ST_VERSION.tar.gz ]; then - wget http://pypi.python.org/packages/source/s/stringtemplate3/stringtemplate3-$ST_VERSION.tar.gz + wget https://pypi.python.org/packages/source/s/stringtemplate3/stringtemplate3-$ST_VERSION.tar.gz fi (cd tmp; tar xzf ../stringtemplate3-$ST_VERSION.tar.gz) (cd tmp/stringtemplate3-$ST_VERSION; python setup.py install --install-lib=$WORKSPACE) diff --git a/runtime/Python/setup.py b/runtime/Python/setup.py index 17ef6d47e..7e52911e5 100644 --- a/runtime/Python/setup.py +++ b/runtime/Python/setup.py @@ -184,7 +184,7 @@ def run(self): testDir = os.path.join(os.path.dirname(__file__), 'tests') if not os.path.isdir(testDir): raise DistutilsFileError( - "There is not 'tests' directory. Did you fetch the " + "There is no 'tests' directory. Did you fetch the " "development version?", ) @@ -208,10 +208,7 @@ def run(self): ] classpath.extend([ - os.path.join(rootDir, 'lib', 'antlr-2.7.7.jar'), - os.path.join(rootDir, 'lib', 'stringtemplate-3.2.1.jar'), - os.path.join(rootDir, 'lib', 'ST-4.0.2.jar'), - os.path.join(rootDir, 'lib', 'junit-4.2.jar') + os.path.join(rootDir, 'antlr-complete', 'target', 'antlr-complete-3.5.3-SNAPSHOT.jar'), ]) os.environ['CLASSPATH'] = ':'.join(classpath) diff --git a/runtime/Python/tests/t001lexer.py b/runtime/Python/tests/t001lexer.py index 322823513..d369f4fd2 100644 --- a/runtime/Python/tests/t001lexer.py +++ b/runtime/Python/tests/t001lexer.py @@ -25,10 +25,10 @@ def testValid(self): lexer = self.getLexer(stream) token = lexer.nextToken() - self.failUnlessEqual(token.type, self.lexerModule.ZERO) + self.assertEqual(token.type, self.lexerModule.ZERO) token = lexer.nextToken() - self.failUnlessEqual(token.type, self.lexerModule.EOF) + self.assertEqual(token.type, self.lexerModule.EOF) def testIteratorInterface(self): @@ -37,7 +37,7 @@ def testIteratorInterface(self): types = [token.type for token in lexer] - self.failUnlessEqual(types, [self.lexerModule.ZERO]) + self.assertListEqual(types, [self.lexerModule.ZERO]) def testMalformedInput(self): @@ -49,8 +49,8 @@ def testMalformedInput(self): self.fail() except antlr3.MismatchedTokenException, exc: - self.failUnlessEqual(exc.expecting, '0') - self.failUnlessEqual(exc.unexpectedType, '1') + self.assertEqual(exc.expecting, '0') + self.assertEqual(exc.unexpectedType, '1') if __name__ == '__main__': diff --git a/runtime/Python/tests/t002lexer.py b/runtime/Python/tests/t002lexer.py index c2c03ba05..1005beaef 100644 --- a/runtime/Python/tests/t002lexer.py +++ b/runtime/Python/tests/t002lexer.py @@ -25,13 +25,13 @@ def testValid(self): lexer = self.getLexer(stream) token = lexer.nextToken() - self.failUnlessEqual(token.type, self.lexerModule.ZERO) + self.assertEqual(token.type, self.lexerModule.ZERO) token = lexer.nextToken() - self.failUnlessEqual(token.type, self.lexerModule.ONE) + self.assertEqual(token.type, self.lexerModule.ONE) token = lexer.nextToken() - self.failUnlessEqual(token.type, self.lexerModule.EOF) + self.assertEqual(token.type, self.lexerModule.EOF) def testMalformedInput(self): @@ -43,7 +43,7 @@ def testMalformedInput(self): self.fail() except antlr3.NoViableAltException, exc: - self.failUnlessEqual(exc.unexpectedType, '2') + self.assertEqual(exc.unexpectedType, '2') if __name__ == '__main__': diff --git a/runtime/Python/tests/t003lexer.py b/runtime/Python/tests/t003lexer.py index 3a3295596..b1e62e44a 100644 --- a/runtime/Python/tests/t003lexer.py +++ b/runtime/Python/tests/t003lexer.py @@ -25,16 +25,16 @@ def testValid(self): lexer = self.getLexer(stream) token = lexer.nextToken() - self.failUnlessEqual(token.type, self.lexerModule.ZERO) + self.assertEqual(token.type, self.lexerModule.ZERO) token = lexer.nextToken() - self.failUnlessEqual(token.type, self.lexerModule.FOOZE) + self.assertEqual(token.type, self.lexerModule.FOOZE) token = lexer.nextToken() - self.failUnlessEqual(token.type, self.lexerModule.ONE) + self.assertEqual(token.type, self.lexerModule.ONE) token = lexer.nextToken() - self.failUnlessEqual(token.type, self.lexerModule.EOF) + self.assertEqual(token.type, self.lexerModule.EOF) def testMalformedInput(self): @@ -46,7 +46,7 @@ def testMalformedInput(self): self.fail() except antlr3.NoViableAltException, exc: - self.failUnlessEqual(exc.unexpectedType, '2') + self.assertEqual(exc.unexpectedType, '2') if __name__ == '__main__': diff --git a/runtime/Python/tests/t004lexer.py b/runtime/Python/tests/t004lexer.py index 52b444c58..4c2deffb7 100644 --- a/runtime/Python/tests/t004lexer.py +++ b/runtime/Python/tests/t004lexer.py @@ -61,8 +61,8 @@ def testMalformedInput(self): self.fail() except antlr3.MismatchedTokenException, exc: - self.failUnlessEqual(exc.expecting, 'f') - self.failUnlessEqual(exc.unexpectedType, '2') + self.assertEqual(exc.expecting, 'f') + self.assertEqual(exc.unexpectedType, '2') if __name__ == '__main__': diff --git a/runtime/Python/tests/t022scopes.py b/runtime/Python/tests/t022scopes.py index 01bc59754..0fbd66819 100644 --- a/runtime/Python/tests/t022scopes.py +++ b/runtime/Python/tests/t022scopes.py @@ -66,7 +66,7 @@ def testc1(self): parser = self.getParser(tStream) symbols = parser.c() - self.failUnlessEqual( + self.assertEqual( symbols, set(['i', 'j']) ) @@ -91,7 +91,7 @@ def testc2(self): parser.c() self.fail() except RuntimeError, exc: - self.failUnlessEqual(exc.args[0], 'x') + self.assertEqual(exc.args[0], 'x') def testd1(self): @@ -114,7 +114,7 @@ def testd1(self): parser = self.getParser(tStream) symbols = parser.d() - self.failUnlessEqual( + self.assertEqual( symbols, set(['i', 'j']) ) @@ -131,7 +131,7 @@ def teste1(self): parser = self.getParser(tStream) res = parser.e() - self.failUnlessEqual(res, 12) + self.assertEqual(res, 12) def testf1(self): @@ -145,7 +145,7 @@ def testf1(self): parser = self.getParser(tStream) res = parser.f() - self.failUnlessEqual(res, None) + self.assertEqual(res, None) def testf2(self): @@ -159,7 +159,7 @@ def testf2(self): parser = self.getParser(tStream) res = parser.f() - self.failUnlessEqual(res, None) + self.assertEqual(res, None) diff --git a/runtime/Python/tests/t033backtracking.py b/runtime/Python/tests/t033backtracking.py index 8b5c66a3f..da425d4ef 100644 --- a/runtime/Python/tests/t033backtracking.py +++ b/runtime/Python/tests/t033backtracking.py @@ -17,7 +17,6 @@ def recover(self, input, re): return TParser - @testbase.broken("Some bug in the tool", SyntaxError) def testValid1(self): cStream = antlr3.StringStream('int a;') diff --git a/runtime/Python/tests/t042ast.py b/runtime/Python/tests/t042ast.py index e29c07778..64ea27a1f 100644 --- a/runtime/Python/tests/t042ast.py +++ b/runtime/Python/tests/t042ast.py @@ -38,7 +38,7 @@ def parse(self, text, method, rArgs=[], **kwargs): def testR1(self): r = self.parse("1 + 2", 'r1') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(+ 1 2)' ) @@ -46,7 +46,7 @@ def testR1(self): def testR2a(self): r = self.parse("assert 2+3;", 'r2') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(assert (+ 2 3))' ) @@ -54,7 +54,7 @@ def testR2a(self): def testR2b(self): r = self.parse("assert 2+3 : 5;", 'r2') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(assert (+ 2 3) 5)' ) @@ -62,7 +62,7 @@ def testR2b(self): def testR3a(self): r = self.parse("if 1 fooze", 'r3') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(if 1 fooze)' ) @@ -70,7 +70,7 @@ def testR3a(self): def testR3b(self): r = self.parse("if 1 fooze else fooze", 'r3') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(if 1 fooze fooze)' ) @@ -78,7 +78,7 @@ def testR3b(self): def testR4a(self): r = self.parse("while 2 fooze", 'r4') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(while 2 fooze)' ) @@ -86,7 +86,7 @@ def testR4a(self): def testR5a(self): r = self.parse("return;", 'r5') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'return' ) @@ -94,7 +94,7 @@ def testR5a(self): def testR5b(self): r = self.parse("return 2+3;", 'r5') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(return (+ 2 3))' ) @@ -102,7 +102,7 @@ def testR5b(self): def testR6a(self): r = self.parse("3", 'r6') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '3' ) @@ -110,7 +110,7 @@ def testR6a(self): def testR6b(self): r = self.parse("3 a", 'r6') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '3 a' ) @@ -118,14 +118,14 @@ def testR6b(self): def testR7(self): r = self.parse("3", 'r7') - self.failUnless( + self.assertTrue( r.tree is None ) def testR8(self): r = self.parse("var foo:bool", 'r8') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(var bool foo)' ) @@ -133,7 +133,7 @@ def testR8(self): def testR9(self): r = self.parse("int foo;", 'r9') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(VARDEF int foo)' ) @@ -141,7 +141,7 @@ def testR9(self): def testR10(self): r = self.parse("10", 'r10') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '10.0' ) @@ -149,7 +149,7 @@ def testR10(self): def testR11a(self): r = self.parse("1+2", 'r11') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(EXPR (+ 1 2))' ) @@ -157,7 +157,7 @@ def testR11a(self): def testR11b(self): r = self.parse("", 'r11') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'EXPR' ) @@ -165,7 +165,7 @@ def testR11b(self): def testR12a(self): r = self.parse("foo", 'r12') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'foo' ) @@ -173,7 +173,7 @@ def testR12a(self): def testR12b(self): r = self.parse("foo, bar, gnurz", 'r12') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'foo bar gnurz' ) @@ -181,7 +181,7 @@ def testR12b(self): def testR13a(self): r = self.parse("int foo;", 'r13') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(int foo)' ) @@ -189,7 +189,7 @@ def testR13a(self): def testR13b(self): r = self.parse("bool foo, bar, gnurz;", 'r13') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(bool foo bar gnurz)' ) @@ -197,7 +197,7 @@ def testR13b(self): def testR14a(self): r = self.parse("1+2 int", 'r14') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(EXPR (+ 1 2) int)' ) @@ -205,7 +205,7 @@ def testR14a(self): def testR14b(self): r = self.parse("1+2 int bool", 'r14') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(EXPR (+ 1 2) int bool)' ) @@ -213,7 +213,7 @@ def testR14b(self): def testR14c(self): r = self.parse("int bool", 'r14') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(EXPR int bool)' ) @@ -221,7 +221,7 @@ def testR14c(self): def testR14d(self): r = self.parse("fooze fooze int bool", 'r14') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(EXPR fooze fooze int bool)' ) @@ -229,7 +229,7 @@ def testR14d(self): def testR14e(self): r = self.parse("7+9 fooze fooze int bool", 'r14') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(EXPR (+ 7 9) fooze fooze int bool)' ) @@ -237,7 +237,7 @@ def testR14e(self): def testR15(self): r = self.parse("7", 'r15') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '7 7' ) @@ -245,7 +245,7 @@ def testR15(self): def testR16a(self): r = self.parse("int foo", 'r16') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(int foo)' ) @@ -254,7 +254,7 @@ def testR16a(self): def testR16b(self): r = self.parse("int foo, bar, gnurz", 'r16') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(int foo) (int bar) (int gnurz)' ) @@ -262,7 +262,7 @@ def testR16b(self): def testR17a(self): r = self.parse("for ( fooze ; 1 + 2 ; fooze ) fooze", 'r17') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(for fooze (+ 1 2) fooze fooze)' ) @@ -270,7 +270,7 @@ def testR17a(self): def testR18a(self): r = self.parse("for", 'r18') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'BLOCK' ) @@ -278,7 +278,7 @@ def testR18a(self): def testR19a(self): r = self.parse("for", 'r19') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'for' ) @@ -286,7 +286,7 @@ def testR19a(self): def testR20a(self): r = self.parse("for", 'r20') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'FOR' ) @@ -294,7 +294,7 @@ def testR20a(self): def testR21a(self): r = self.parse("for", 'r21') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'BLOCK' ) @@ -302,7 +302,7 @@ def testR21a(self): def testR22a(self): r = self.parse("for", 'r22') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'for' ) @@ -310,7 +310,7 @@ def testR22a(self): def testR23a(self): r = self.parse("for", 'r23') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'FOR' ) @@ -318,7 +318,7 @@ def testR23a(self): def testR24a(self): r = self.parse("fooze 1 + 2", 'r24') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(fooze (+ 1 2))' ) @@ -326,7 +326,7 @@ def testR24a(self): def testR25a(self): r = self.parse("fooze, fooze2 1 + 2", 'r25') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(fooze (+ 1 2))' ) @@ -334,7 +334,7 @@ def testR25a(self): def testR26a(self): r = self.parse("fooze, fooze2", 'r26') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(BLOCK fooze fooze2)' ) @@ -342,7 +342,7 @@ def testR26a(self): def testR27a(self): r = self.parse("fooze 1 + 2", 'r27') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(fooze (fooze (+ 1 2)))' ) @@ -350,7 +350,7 @@ def testR27a(self): def testR28(self): r = self.parse("foo28a", 'r28') - self.failUnless( + self.assertTrue( r.tree is None ) @@ -374,7 +374,7 @@ def testR29(self): def testR31a(self): r = self.parse("public int gnurz = 1 + 2;", 'r31', flag=0) - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(VARDEF gnurz public int (+ 1 2))' ) @@ -382,7 +382,7 @@ def testR31a(self): def testR31b(self): r = self.parse("public int gnurz = 1 + 2;", 'r31', flag=1) - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(VARIABLE gnurz public int (+ 1 2))' ) @@ -390,7 +390,7 @@ def testR31b(self): def testR31c(self): r = self.parse("public int gnurz = 1 + 2;", 'r31', flag=2) - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(FIELD gnurz public int (+ 1 2))' ) @@ -398,7 +398,7 @@ def testR31c(self): def testR32a(self): r = self.parse("gnurz 32", 'r32', [1], flag=2) - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'gnurz' ) @@ -406,7 +406,7 @@ def testR32a(self): def testR32b(self): r = self.parse("gnurz 32", 'r32', [2], flag=2) - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '32' ) @@ -414,14 +414,14 @@ def testR32b(self): def testR32c(self): r = self.parse("gnurz 32", 'r32', [3], flag=2) - self.failUnless( + self.assertTrue( r.tree is None ) def testR33a(self): r = self.parse("public private fooze", 'r33') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'fooze' ) @@ -429,7 +429,7 @@ def testR33a(self): def testR34a(self): r = self.parse("public class gnurz { fooze fooze2 }", 'r34') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(class gnurz public fooze fooze2)' ) @@ -437,7 +437,7 @@ def testR34a(self): def testR34b(self): r = self.parse("public class gnurz extends bool implements int, bool { fooze fooze2 }", 'r34') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(class gnurz public (extends bool) (implements int bool) fooze fooze2)' ) @@ -454,7 +454,7 @@ def testR35(self): def testR36a(self): r = self.parse("if ( 1 + 2 ) fooze", 'r36') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(if (EXPR (+ 1 2)) fooze)' ) @@ -462,7 +462,7 @@ def testR36a(self): def testR36b(self): r = self.parse("if ( 1 + 2 ) fooze else fooze2", 'r36') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(if (EXPR (+ 1 2)) fooze fooze2)' ) @@ -470,7 +470,7 @@ def testR36b(self): def testR37(self): r = self.parse("1 + 2 + 3", 'r37') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(+ (+ 1 2) 3)' ) @@ -478,7 +478,7 @@ def testR37(self): def testR38(self): r = self.parse("1 + 2 + 3", 'r38') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(+ (+ 1 2) 3)' ) @@ -486,7 +486,7 @@ def testR38(self): def testR39a(self): r = self.parse("gnurz[1]", 'r39') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(INDEX gnurz 1)' ) @@ -494,7 +494,7 @@ def testR39a(self): def testR39b(self): r = self.parse("gnurz(2)", 'r39') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(CALL gnurz 2)' ) @@ -502,7 +502,7 @@ def testR39b(self): def testR39c(self): r = self.parse("gnurz.gnarz", 'r39') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(FIELDACCESS gnurz gnarz)' ) @@ -510,7 +510,7 @@ def testR39c(self): def testR39d(self): r = self.parse("gnurz.gnarz.gnorz", 'r39') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(FIELDACCESS (FIELDACCESS gnurz gnarz) gnorz)' ) @@ -518,7 +518,7 @@ def testR39d(self): def testR40(self): r = self.parse("1 + 2 + 3;", 'r40') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(+ 1 2 3)' ) @@ -526,7 +526,7 @@ def testR40(self): def testR41(self): r = self.parse("1 + 2 + 3;", 'r41') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(3 (2 1))' ) @@ -534,7 +534,7 @@ def testR41(self): def testR42(self): r = self.parse("gnurz, gnarz, gnorz", 'r42') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'gnurz gnarz gnorz' ) @@ -542,10 +542,10 @@ def testR42(self): def testR43(self): r = self.parse("gnurz, gnarz, gnorz", 'r43') - self.failUnless( + self.assertTrue( r.tree is None ) - self.failUnlessEqual( + self.assertListEqual( r.res, ['gnurz', 'gnarz', 'gnorz'] ) @@ -553,7 +553,7 @@ def testR43(self): def testR44(self): r = self.parse("gnurz, gnarz, gnorz", 'r44') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(gnorz (gnarz gnurz))' ) @@ -561,7 +561,7 @@ def testR44(self): def testR45(self): r = self.parse("gnurz", 'r45') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'gnurz' ) @@ -569,10 +569,10 @@ def testR45(self): def testR46(self): r = self.parse("gnurz, gnarz, gnorz", 'r46') - self.failUnless( + self.assertTrue( r.tree is None ) - self.failUnlessEqual( + self.assertListEqual( r.res, ['gnurz', 'gnarz', 'gnorz'] ) @@ -580,7 +580,7 @@ def testR46(self): def testR47(self): r = self.parse("gnurz, gnarz, gnorz", 'r47') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'gnurz gnarz gnorz' ) @@ -588,7 +588,7 @@ def testR47(self): def testR48(self): r = self.parse("gnurz, gnarz, gnorz", 'r48') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'gnurz gnarz gnorz' ) @@ -596,7 +596,7 @@ def testR48(self): def testR49(self): r = self.parse("gnurz gnorz", 'r49') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(gnurz gnorz)' ) @@ -604,7 +604,7 @@ def testR49(self): def testR50(self): r = self.parse("gnurz", 'r50') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(1.0 gnurz)' ) @@ -612,7 +612,7 @@ def testR50(self): def testR51(self): r = self.parse("gnurza gnurzb gnurzc", 'r51') - self.failUnlessEqual( + self.assertEqual( r.res.toStringTree(), 'gnurzb' ) @@ -620,7 +620,7 @@ def testR51(self): def testR52(self): r = self.parse("gnurz", 'r52') - self.failUnlessEqual( + self.assertEqual( r.res.toStringTree(), 'gnurz' ) @@ -628,7 +628,7 @@ def testR52(self): def testR53(self): r = self.parse("gnurz", 'r53') - self.failUnlessEqual( + self.assertEqual( r.res.toStringTree(), 'gnurz' ) @@ -636,7 +636,7 @@ def testR53(self): def testR54(self): r = self.parse("gnurza 1 + 2 gnurzb", 'r54') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(+ 1 2)' ) @@ -644,7 +644,7 @@ def testR54(self): def testR55a(self): r = self.parse("public private 1 + 2", 'r55') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'public private (+ 1 2)' ) @@ -652,7 +652,7 @@ def testR55a(self): def testR55b(self): r = self.parse("public fooze", 'r55') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'public fooze' ) @@ -660,7 +660,7 @@ def testR55b(self): def testR56(self): r = self.parse("a b c d", 'r56') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'foo' ) @@ -668,7 +668,7 @@ def testR56(self): def testR57(self): r = self.parse("a b c d", 'r57') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), 'foo' ) @@ -676,7 +676,7 @@ def testR57(self): def testR59(self): r = self.parse("a b c fooze", 'r59') - self.failUnlessEqual( + self.assertEqual( r.tree.toStringTree(), '(a fooze) (b fooze) (c fooze)' ) diff --git a/runtime/Python/tests/t044trace.py b/runtime/Python/tests/t044trace.py index 13c9b761b..71126afca 100644 --- a/runtime/Python/tests/t044trace.py +++ b/runtime/Python/tests/t044trace.py @@ -64,7 +64,7 @@ def testTrace(self): parser = self.getParser(tStream) parser.a() - self.failUnlessEqual( + self.assertListEqual( lexer.traces, [ '>T__7', 'WS', 'INT', 'WS', 'T__6', 'WS', 'INT', 'WS', 'T__8', 'a', '>synpred1_t044trace_fragment', 'b', '>c', 'c', 'c', 'program', '>declaration', '>variable', '>type', 'declarator', ' within boundaries of " "previous " @@ -128,7 +128,7 @@ def testInsertThenReplaceSameIndex(self): result = tokens.toString() expecting = "0xbc" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def test2InsertMiddleIndex(self): @@ -138,7 +138,7 @@ def test2InsertMiddleIndex(self): result = tokens.toString() expecting = "ayxbc" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def test2InsertThenReplaceIndex0(self): @@ -149,7 +149,7 @@ def test2InsertThenReplaceIndex0(self): result = tokens.toString() expecting = "yxzbc" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def testReplaceThenInsertBeforeLastIndex(self): @@ -159,7 +159,7 @@ def testReplaceThenInsertBeforeLastIndex(self): result = tokens.toString() expecting = "abyx" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def testInsertThenReplaceLastIndex(self): @@ -169,7 +169,7 @@ def testInsertThenReplaceLastIndex(self): result = tokens.toString() expecting = "abyx" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def testReplaceThenInsertAfterLastIndex(self): @@ -179,7 +179,7 @@ def testReplaceThenInsertAfterLastIndex(self): result = tokens.toString() expecting = "abxy" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def testReplaceRangeThenInsertAtLeftEdge(self): @@ -189,7 +189,7 @@ def testReplaceRangeThenInsertAtLeftEdge(self): result = tokens.toString() expecting = "abyxba" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def testReplaceRangeThenInsertAtRightEdge(self): @@ -201,7 +201,7 @@ def testReplaceRangeThenInsertAtRightEdge(self): tokens.toString() self.fail() except ValueError, exc: - self.failUnlessEqual( + self.assertEqual( str(exc), "insert op within boundaries of " "previous ") @@ -214,7 +214,7 @@ def testReplaceRangeThenInsertAfterRightEdge(self): result = tokens.toString() expecting = "abxyba" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def testReplaceAll(self): @@ -223,7 +223,7 @@ def testReplaceAll(self): result = tokens.toString() expecting = "x" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def testReplaceSubsetThenFetch(self): @@ -232,7 +232,7 @@ def testReplaceSubsetThenFetch(self): result = tokens.toString(0, 6) expecting = "abxyzba" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def testReplaceThenReplaceSuperset(self): @@ -244,7 +244,7 @@ def testReplaceThenReplaceSuperset(self): tokens.toString() self.fail() except ValueError, exc: - self.failUnlessEqual( + self.assertEqual( str(exc), "replace op boundaries of overlap " "with previous ") @@ -259,7 +259,7 @@ def testReplaceThenReplaceLowerIndexedSuperset(self): tokens.toString() self.fail() except ValueError, exc: - self.failUnlessEqual( + self.assertEqual( str(exc), "replace op boundaries of overlap " "with previous ") @@ -272,7 +272,7 @@ def testReplaceSingleMiddleThenOverlappingSuperset(self): result = tokens.toString() expecting = "fooa" - self.failUnlessEqual(result, expecting) + self.assertEqual(result, expecting) def testCombineInserts(self): @@ -281,7 +281,7 @@ def testCombineInserts(self): tokens.insertBefore(0, "y") result = tokens.toString() expecting = "yxabc" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testCombine3Inserts(self): @@ -291,7 +291,7 @@ def testCombine3Inserts(self): tokens.insertBefore(1, "z") result = tokens.toString() expecting = "yazxbc" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testCombineInsertOnLeftWithReplace(self): @@ -300,7 +300,7 @@ def testCombineInsertOnLeftWithReplace(self): tokens.insertBefore(0, "z") # combine with left edge of rewrite result = tokens.toString() expecting = "zfoo" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testCombineInsertOnLeftWithDelete(self): @@ -309,7 +309,7 @@ def testCombineInsertOnLeftWithDelete(self): tokens.insertBefore(0, "z") # combine with left edge of rewrite result = tokens.toString() expecting = "z" # make sure combo is not znull - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testDisjointInserts(self): @@ -319,7 +319,7 @@ def testDisjointInserts(self): tokens.insertBefore(0, "z") result = tokens.toString() expecting = "zaxbyc" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testOverlappingReplace(self): @@ -328,7 +328,7 @@ def testOverlappingReplace(self): tokens.replace(0, 3, "bar") # wipes prior nested replace result = tokens.toString() expecting = "bar" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testOverlappingReplace2(self): @@ -340,7 +340,7 @@ def testOverlappingReplace2(self): tokens.toString() self.fail() except ValueError, exc: - self.failUnlessEqual( + self.assertEqual( str(exc), "replace op boundaries of overlap " "with previous ") @@ -352,7 +352,7 @@ def testOverlappingReplace3(self): tokens.replace(0, 2, "bar") # wipes prior nested replace result = tokens.toString() expecting = "barc" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testOverlappingReplace4(self): @@ -361,7 +361,7 @@ def testOverlappingReplace4(self): tokens.replace(1, 3, "bar") # wipes prior nested replace result = tokens.toString() expecting = "abar" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testDropIdenticalReplace(self): @@ -370,7 +370,7 @@ def testDropIdenticalReplace(self): tokens.replace(1, 2, "foo") # drop previous, identical result = tokens.toString() expecting = "afooc" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testDropPrevCoveredInsert(self): @@ -379,7 +379,7 @@ def testDropPrevCoveredInsert(self): tokens.replace(1, 2, "foo") # kill prev insert result = tokens.toString() expecting = "afoofoo" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testLeaveAloneDisjointInsert(self): @@ -388,7 +388,7 @@ def testLeaveAloneDisjointInsert(self): tokens.replace(2, 3, "foo") result = tokens.toString() expecting = "axbfoo" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testLeaveAloneDisjointInsert2(self): @@ -397,7 +397,7 @@ def testLeaveAloneDisjointInsert2(self): tokens.insertBefore(1, "x") result = tokens.toString() expecting = "axbfoo" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testInsertBeforeTokenThenDeleteThatToken(self): @@ -406,7 +406,7 @@ def testInsertBeforeTokenThenDeleteThatToken(self): tokens.delete(2) result = tokens.toString() expecting = "aby" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) class T2(testbase.ANTLRTest): @@ -431,19 +431,19 @@ def testToStringStartStop(self): result = tokens.toOriginalString() expecting = "x = 3 * 0;" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) result = tokens.toString() expecting = "x = 0;" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) result = tokens.toString(0, 9) expecting = "x = 0;" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) result = tokens.toString(4, 8) expecting = "0" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) def testToStringStartStop2(self): @@ -453,37 +453,37 @@ def testToStringStartStop2(self): result = tokens.toOriginalString() expecting = "x = 3 * 0 + 2 * 0;" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) tokens.replace(4, 8, "0") # replace 3 * 0 with 0 result = tokens.toString() expecting = "x = 0 + 2 * 0;" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) result = tokens.toString(0, 17) expecting = "x = 0 + 2 * 0;" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) result = tokens.toString(4, 8) expecting = "0" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) result = tokens.toString(0, 8) expecting = "x = 0" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) result = tokens.toString(12, 16) expecting = "2 * 0" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) tokens.insertAfter(17, "// comment") result = tokens.toString(12, 18) expecting = "2 * 0;// comment" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) result = tokens.toString(0, 8) # try again after insert at end expecting = "x = 0" - self.failUnlessEqual(expecting, result) + self.assertEqual(expecting, result) if __name__ == '__main__': diff --git a/runtime/Python/tests/t049treeparser.py b/runtime/Python/tests/t049treeparser.py index 9c7157d10..fc1074e69 100644 --- a/runtime/Python/tests/t049treeparser.py +++ b/runtime/Python/tests/t049treeparser.py @@ -79,7 +79,7 @@ def testFlatList(self): "abc 34" ) - self.failUnlessEqual("abc, 34", found) + self.assertEqual("abc, 34", found) @@ -113,7 +113,7 @@ def testSimpleTree(self): "abc 34" ) - self.failUnlessEqual("abc, 34", found) + self.assertEqual("abc, 34", found) def testFlatVsTreeDecision(self): @@ -148,7 +148,7 @@ def testFlatVsTreeDecision(self): treeGrammar, 'a', "a 1 b 2" ) - self.failUnlessEqual("^(a 1)b 2\n", found) + self.assertEqual("^(a 1)b 2\n", found) def testFlatVsTreeDecision2(self): @@ -183,7 +183,7 @@ def testFlatVsTreeDecision2(self): treeGrammar, 'a', "a 1 2 3 b 4 5" ) - self.failUnlessEqual("^(a 3)b 5\n", found) + self.assertEqual("^(a 3)b 5\n", found) def testCyclicDFALookahead(self): @@ -217,7 +217,7 @@ def testCyclicDFALookahead(self): treeGrammar, 'a', "a 1 2 3." ) - self.failUnlessEqual("alt 1", found) + self.assertEqual("alt 1", found) ## def testTemplateOutput(self): @@ -271,7 +271,7 @@ def testNullableChildList(self): treeGrammar, 'a', "abc" ) - self.failUnlessEqual("abc", found) + self.assertEqual("abc", found) def testNullableChildList2(self): @@ -304,7 +304,7 @@ def testNullableChildList2(self): treeGrammar, 'a', "abc;" ) - self.failUnlessEqual("abc", found) + self.assertEqual("abc", found) def testNullableChildList3(self): @@ -338,7 +338,7 @@ def testNullableChildList3(self): treeGrammar, 'a', "abc def;" ) - self.failUnlessEqual("abc, def", found) + self.assertEqual("abc, def", found) def testActionsAfterRoot(self): @@ -371,7 +371,7 @@ def testActionsAfterRoot(self): treeGrammar, 'a', "abc;" ) - self.failUnless("abc, 2\n", found) + self.assertTrue("abc, 2\n", found) def testWildcardLookahead(self): diff --git a/runtime/Python/tests/t051treeRewriteAST.py b/runtime/Python/tests/t051treeRewriteAST.py index 39253b4a4..2bec74a0f 100644 --- a/runtime/Python/tests/t051treeRewriteAST.py +++ b/runtime/Python/tests/t051treeRewriteAST.py @@ -79,7 +79,7 @@ def testFlatList(self): "abc 34" ) - self.failUnlessEqual("34 abc", found) + self.assertEqual("34 abc", found) def testSimpleTree(self): @@ -114,7 +114,7 @@ def testSimpleTree(self): "abc 34" ) - self.failUnlessEqual("(34 abc)", found) + self.assertEqual("(34 abc)", found) def testCombinedRewriteAndAuto(self): @@ -149,7 +149,7 @@ def testCombinedRewriteAndAuto(self): "abc 34" ) - self.failUnlessEqual("(34 abc)", found) + self.assertEqual("(34 abc)", found) found = self.execTreeParser( @@ -158,7 +158,7 @@ def testCombinedRewriteAndAuto(self): "34" ) - self.failUnlessEqual("34", found) + self.assertEqual("34", found) def testAvoidDup(self): @@ -193,7 +193,7 @@ def testAvoidDup(self): "abc" ) - self.failUnlessEqual("(abc abc)", found) + self.assertEqual("(abc abc)", found) def testLoop(self): @@ -228,7 +228,7 @@ def testLoop(self): "a b c 3 4 5" ) - self.failUnlessEqual("3 4 5 a b c", found) + self.assertEqual("3 4 5 a b c", found) def testAutoDup(self): @@ -263,7 +263,7 @@ def testAutoDup(self): "abc" ) - self.failUnlessEqual("abc", found) + self.assertEqual("abc", found) def testAutoDupRule(self): @@ -300,7 +300,7 @@ def testAutoDupRule(self): "a 1" ) - self.failUnlessEqual("a 1", found) + self.assertEqual("a 1", found) def testAutoWildcard(self): @@ -468,7 +468,7 @@ def testAutoDupMultiple(self): "a b 3" ) - self.failUnlessEqual("a b 3", found) + self.assertEqual("a b 3", found) def testAutoDupTree(self): @@ -504,7 +504,7 @@ def testAutoDupTree(self): "a 3" ) - self.failUnlessEqual("(a 3)", found) + self.assertEqual("(a 3)", found) def testAutoDupTreeWithLabels(self): @@ -540,7 +540,7 @@ def testAutoDupTreeWithLabels(self): "a 3" ) - self.failUnlessEqual("(a 3)", found) + self.assertEqual("(a 3)", found) def testAutoDupTreeWithListLabels(self): @@ -576,7 +576,7 @@ def testAutoDupTreeWithListLabels(self): "a 3" ) - self.failUnlessEqual("(a 3)", found) + self.assertEqual("(a 3)", found) def testAutoDupTreeWithRuleRoot(self): @@ -612,7 +612,7 @@ def testAutoDupTreeWithRuleRoot(self): "a 3" ) - self.failUnlessEqual("(a 3)", found) + self.assertEqual("(a 3)", found) def testAutoDupTreeWithRuleRootAndLabels(self): @@ -648,7 +648,7 @@ def testAutoDupTreeWithRuleRootAndLabels(self): "a 3" ) - self.failUnlessEqual("(a 3)", found) + self.assertEqual("(a 3)", found) def testAutoDupTreeWithRuleRootAndListLabels(self): @@ -685,7 +685,7 @@ def testAutoDupTreeWithRuleRootAndListLabels(self): "a 3" ) - self.failUnlessEqual("(a 3)", found) + self.assertEqual("(a 3)", found) def testAutoDupNestedTree(self): @@ -721,7 +721,7 @@ def testAutoDupNestedTree(self): "a b 3" ) - self.failUnlessEqual("(a (b 3))", found) + self.assertEqual("(a (b 3))", found) def testDelete(self): @@ -757,7 +757,7 @@ def testDelete(self): "abc" ) - self.failUnlessEqual("", found) + self.assertEqual("", found) def testSetMatchNoRewrite(self): grammar = textwrap.dedent( @@ -792,7 +792,7 @@ def testSetMatchNoRewrite(self): "abc 34" ) - self.failUnlessEqual("abc 34", found) + self.assertEqual("abc 34", found) def testSetOptionalMatchNoRewrite(self): @@ -826,7 +826,7 @@ def testSetOptionalMatchNoRewrite(self): treeGrammar, 'a', "abc 34") - self.failUnlessEqual("abc 34", found) + self.assertEqual("abc 34", found) def testSetMatchNoRewriteLevel2(self): @@ -861,7 +861,7 @@ def testSetMatchNoRewriteLevel2(self): "abc 34" ) - self.failUnlessEqual("(abc 34)", found) + self.assertEqual("(abc 34)", found) def testSetMatchNoRewriteLevel2Root(self): @@ -896,7 +896,7 @@ def testSetMatchNoRewriteLevel2Root(self): "abc 34" ) - self.failUnlessEqual("(abc 34)", found) + self.assertEqual("(abc 34)", found) ## REWRITE MODE @@ -936,7 +936,7 @@ def testRewriteModeCombinedRewriteAndAuto(self): "abc 34" ) - self.failUnlessEqual("(ick 34)", found) + self.assertEqual("(ick 34)", found) found = self.execTreeParser( @@ -945,7 +945,7 @@ def testRewriteModeCombinedRewriteAndAuto(self): "34" ) - self.failUnlessEqual("34", found) + self.assertEqual("34", found) def testRewriteModeFlatTree(self): @@ -1180,7 +1180,7 @@ def testRewriteOfRuleRef(self): grammar, 'a', treeGrammar, 's', "abc 34") - self.failUnlessEqual("abc 34", found) + self.assertEqual("abc 34", found) def testRewriteOfRuleRefRoot(self): @@ -1209,7 +1209,7 @@ def testRewriteOfRuleRefRoot(self): # emits whole tree when you ref the root since I can't know whether # you want the children or not. You might be returning a whole new # tree. Hmm...still seems weird. oh well. - self.failUnlessEqual("(12 (abc 34))", found) + self.assertEqual("(12 (abc 34))", found) def testRewriteOfRuleRefRootLabeled(self): @@ -1238,7 +1238,7 @@ def testRewriteOfRuleRefRootLabeled(self): # emits whole tree when you ref the root since I can't know whether # you want the children or not. You might be returning a whole new # tree. Hmm...still seems weird. oh well. - self.failUnlessEqual("(12 (abc 34))", found) + self.assertEqual("(12 (abc 34))", found) def testRewriteOfRuleRefRootListLabeled(self): @@ -1267,7 +1267,7 @@ def testRewriteOfRuleRefRootListLabeled(self): # emits whole tree when you ref the root since I can't know whether # you want the children or not. You might be returning a whole new # tree. Hmm...still seems weird. oh well. - self.failUnlessEqual("(12 (abc 34))", found) + self.assertEqual("(12 (abc 34))", found) def testRewriteOfRuleRefChild(self): @@ -1293,7 +1293,7 @@ def testRewriteOfRuleRefChild(self): grammar, 'a', treeGrammar, 's', "abc 34") - self.failUnlessEqual("(34 34)", found) + self.assertEqual("(34 34)", found) def testRewriteOfRuleRefLabel(self): @@ -1319,7 +1319,7 @@ def testRewriteOfRuleRefLabel(self): grammar, 'a', treeGrammar, 's', "abc 34") - self.failUnlessEqual("(34 34)", found) + self.assertEqual("(34 34)", found) def testRewriteOfRuleRefListLabel(self): @@ -1345,7 +1345,7 @@ def testRewriteOfRuleRefListLabel(self): grammar, 'a', treeGrammar, 's', "abc 34") - self.failUnlessEqual("(34 34)", found) + self.assertEqual("(34 34)", found) @@ -1385,7 +1385,7 @@ def testRewriteModeWithPredicatedRewrites(self): "abc 34" ) - self.failUnlessEqual("(root (ick 34))", found) + self.assertEqual("(root (ick 34))", found) def testWildcardSingleNode(self): @@ -1421,7 +1421,7 @@ def testWildcardSingleNode(self): "abc 34" ) - self.failUnlessEqual("34", found) + self.assertEqual("34", found) def testWildcardUnlabeledSingleNode(self): grammar = textwrap.dedent( diff --git a/runtime/Python/tests/t052import.py b/runtime/Python/tests/t052import.py index 892446216..2eb42186a 100644 --- a/runtime/Python/tests/t052import.py +++ b/runtime/Python/tests/t052import.py @@ -160,7 +160,7 @@ def capture(self, t): input="b" ) - self.failUnlessEqual("S.a", found) + self.assertEqual("S.a", found) # @Test public void testDelegatorInvokesDelegateRuleWithReturnStruct() throws Exception { @@ -216,7 +216,7 @@ def capture(self, t): input="b" ) - self.failUnlessEqual("S.a1000", found) + self.assertEqual("S.a1000", found) def testDelegatorAccessesDelegateMembers(self): @@ -253,7 +253,7 @@ def foo(self): input="b" ) - self.failUnlessEqual("foo", found) + self.assertEqual("foo", found) def testDelegatorInvokesFirstVersionOfDelegateRule(self): @@ -302,7 +302,7 @@ def capture(self, t): input="b" ) - self.failUnlessEqual("S.a", found) + self.assertEqual("S.a", found) def testDelegatesSeeSameTokenType(self): @@ -354,7 +354,7 @@ def capture(self, t): input="aa" ) - self.failUnlessEqual("S.x T.y", found) + self.assertEqual("S.x T.y", found) # @Test public void testDelegatesSeeSameTokenType2() throws Exception { @@ -702,7 +702,7 @@ def capture(self, t): input="c" ) - self.failUnlessEqual("S.a", found) + self.assertEqual("S.a", found) # @Test public void testDelegatorRuleOverridesLookaheadInDelegate() throws Exception { @@ -789,7 +789,7 @@ def capture(self, t): input="abc" ) - self.failUnlessEqual("S.A abc", found) + self.assertEqual("S.A abc", found) def testLexerDelegatorRuleOverridesDelegate(self): @@ -823,7 +823,7 @@ def capture(self, t): input="a" ) - self.failUnlessEqual("M.A a", found) + self.assertEqual("M.A a", found) # @Test public void testLexerDelegatorRuleOverridesDelegateLeavingNoRules() throws Exception { # // M.Tokens has nothing to predict tokens from S. Should diff --git a/runtime/Python/tests/t053hetero.py b/runtime/Python/tests/t053hetero.py index db3e9dbe2..49ed49fa4 100644 --- a/runtime/Python/tests/t053hetero.py +++ b/runtime/Python/tests/t053hetero.py @@ -122,7 +122,7 @@ def toString(self): input="a" ) - self.failUnlessEqual("a", found) + self.assertEqual("a", found) def testTokenCommonTree(self): @@ -142,7 +142,7 @@ def testTokenCommonTree(self): grammar, 'a', input="a") - self.failUnlessEqual("a", found) + self.assertEqual("a", found) def testTokenWithQualifiedType(self): @@ -169,7 +169,7 @@ def toString(self): input="a" ) - self.failUnlessEqual("a", found) + self.assertEqual("a", found) def testNamedType(self): @@ -220,7 +220,7 @@ def toString(self): input="a" ) - self.failUnlessEqual("a", found) + self.assertEqual("a", found) def testTokenWithListLabel(self): @@ -248,7 +248,7 @@ def toString(self): input="a" ) - self.failUnlessEqual("a", found) + self.assertEqual("a", found) def testTokenRoot(self): @@ -276,7 +276,7 @@ def toString(self): input="a" ) - self.failUnlessEqual("a", found) + self.assertEqual("a", found) def testTokenRootWithListLabel(self): @@ -304,7 +304,7 @@ def toString(self): input="a" ) - self.failUnlessEqual("a", found) + self.assertEqual("a", found) def testString(self): @@ -332,7 +332,7 @@ def toString(self): input="begin" ) - self.failUnlessEqual("begin", found) + self.assertEqual("begin", found) def testStringRoot(self): @@ -360,7 +360,7 @@ def toString(self): input="begin" ) - self.failUnlessEqual("begin", found) + self.assertEqual("begin", found) # PARSERS -- REWRITE AST @@ -390,7 +390,7 @@ def toString(self): input="a" ) - self.failUnlessEqual("a", found) + self.assertEqual("a", found) def testRewriteTokenWithArgs(self): @@ -444,7 +444,7 @@ def toString(self): input="a" ) - self.failUnlessEqual(";421930 a;9900", found) + self.assertEqual(";421930 a;9900", found) def testRewriteTokenRoot(self): @@ -473,7 +473,7 @@ def toString(self): input="a 2" ) - self.failUnlessEqual("(a 2)", found) + self.assertEqual("(a 2)", found) def testRewriteString(self): @@ -501,7 +501,7 @@ def toString(self): input="begin" ) - self.failUnlessEqual("begin", found) + self.assertEqual("begin", found) def testRewriteStringRoot(self): @@ -530,7 +530,7 @@ def toString(self): input="begin 2" ) - self.failUnlessEqual("(begin 2)", found) + self.assertEqual("(begin 2)", found) def testRewriteRuleResults(self): grammar = textwrap.dedent( @@ -567,7 +567,7 @@ def toString(self): grammar, 'a', input="a,b,c") - self.failUnlessEqual("(LIST a b c)", found) + self.assertEqual("(LIST a b c)", found) def testCopySemanticsWithHetero(self): grammar = textwrap.dedent( @@ -597,7 +597,7 @@ def toString(self): found = self.execParser( grammar, 'a', input="int a, b, c;") - self.failUnlessEqual("(int a) (int b) (int c)", found) + self.assertEqual("(int a) (int b) (int c)", found) # TREE PARSERS -- REWRITE AST @@ -646,7 +646,7 @@ def toString(self): input="abc 34" ) - self.failUnlessEqual("34 abc", found) + self.assertEqual("34 abc", found) def testTreeParserRewriteTree(self): @@ -694,7 +694,7 @@ def toString(self): input="abc 34" ) - self.failUnlessEqual("(34 abc)", found) + self.assertEqual("(34 abc)", found) def testTreeParserRewriteImaginary(self): @@ -742,7 +742,7 @@ def toString(self): input="abc" ) - self.failUnlessEqual("ROOT abc", found) + self.assertEqual("ROOT abc", found) def testTreeParserRewriteImaginaryWithArgs(self): @@ -790,7 +790,7 @@ def toString(self): input="abc" ) - self.failUnlessEqual("ROOT;42 abc", found) + self.assertEqual("ROOT;42 abc", found) def testTreeParserRewriteImaginaryRoot(self): @@ -837,7 +837,7 @@ def toString(self): input="abc" ) - self.failUnlessEqual("(ROOT abc)", found) + self.assertEqual("(ROOT abc)", found) def testTreeParserRewriteImaginaryFromReal(self): @@ -888,7 +888,7 @@ def toString(self): input="abc" ) - self.failUnlessEqual("ROOT@1", found) + self.assertEqual("ROOT@1", found) def testTreeParserAutoHeteroAST(self): @@ -932,7 +932,7 @@ def toString(self): input="abc;" ) - self.failUnlessEqual("abc ;", found) + self.assertEqual("abc ;", found) if __name__ == '__main__': diff --git a/runtime/Python/tests/t054main.py b/runtime/Python/tests/t054main.py index bb26510ca..2434d5534 100644 --- a/runtime/Python/tests/t054main.py +++ b/runtime/Python/tests/t054main.py @@ -70,7 +70,7 @@ def testLexerFromFile(self): stdout=stdout ) - self.failUnlessEqual(len(stdout.getvalue().splitlines()), 3) + self.assertEqual(len(stdout.getvalue().splitlines()), 3) def testLexerFromStdIO(self): @@ -96,7 +96,7 @@ def testLexerFromStdIO(self): stdout=stdout ) - self.failUnlessEqual(len(stdout.getvalue().splitlines()), 3) + self.assertEqual(len(stdout.getvalue().splitlines()), 3) def testLexerEncoding(self): @@ -122,7 +122,7 @@ def testLexerEncoding(self): stdout=stdout ) - self.failUnlessEqual(len(stdout.getvalue().splitlines()), 3) + self.assertEqual(len(stdout.getvalue().splitlines()), 3) def testCombined(self): @@ -151,7 +151,7 @@ def testCombined(self): ) stdout = stdout.getvalue() - self.failUnlessEqual(len(stdout.splitlines()), 1, stdout) + self.assertEqual(len(stdout.splitlines()), 1, stdout) def testCombinedOutputAST(self): @@ -182,7 +182,7 @@ def testCombinedOutputAST(self): ) stdout = stdout.getvalue().strip() - self.failUnlessEqual(stdout, "(+ foo bar)") + self.assertEqual(stdout, "(+ foo bar)") def testTreeParser(self): @@ -223,7 +223,7 @@ def testTreeParser(self): ) stdout = stdout.getvalue().strip() - self.failUnlessEqual(stdout, "u'a + b'") + self.assertEqual(stdout, "u'a + b'") def testTreeParserRewrite(self): @@ -266,7 +266,7 @@ def testTreeParserRewrite(self): ) stdout = stdout.getvalue().strip() - self.failUnlessEqual(stdout, "(+ (ARG a) (ARG b))") + self.assertEqual(stdout, "(+ (ARG a) (ARG b))") @@ -311,7 +311,7 @@ def testGrammarImport(self): ) stdout = stdout.getvalue().strip() - self.failUnlessEqual(stdout, "u'b'") + self.assertEqual(stdout, "u'b'") if __name__ == '__main__': diff --git a/runtime/Python/tests/t055templates.py b/runtime/Python/tests/t055templates.py index 5090b01b3..e98981045 100644 --- a/runtime/Python/tests/t055templates.py +++ b/runtime/Python/tests/t055templates.py @@ -47,7 +47,7 @@ def testInlineTemplate(self): "abc 34" ) - self.failUnlessEqual("id=abc, int=34", found) + self.assertEqual("id=abc, int=34", found) def testExternalTemplate(self): @@ -88,7 +88,7 @@ def testExternalTemplate(self): group ) - self.failUnlessEqual("[a+b]", found) + self.assertEqual("[a+b]", found) def testEmptyTemplate(self): @@ -113,7 +113,7 @@ def testEmptyTemplate(self): "abc 34" ) - self.failUnless(found is None) + self.assertTrue(found is None) def testList(self): @@ -142,7 +142,7 @@ def testList(self): "abc def ghi" ) - self.failUnlessEqual("abc,def,ghi", found) + self.assertEqual("abc,def,ghi", found) def testAction(self): @@ -166,7 +166,7 @@ def testAction(self): "abc" ) - self.failUnlessEqual("hello", found) + self.assertEqual("hello", found) def testTemplateExpressionInAction(self): @@ -190,7 +190,7 @@ def testTemplateExpressionInAction(self): "abc" ) - self.failUnlessEqual("hello", found) + self.assertEqual("hello", found) def testTemplateExpressionInAction2(self): @@ -218,7 +218,7 @@ def testTemplateExpressionInAction2(self): "abc" ) - self.failUnlessEqual("hello world", found) + self.assertEqual("hello world", found) def testIndirectTemplateConstructor(self): @@ -259,7 +259,7 @@ def testIndirectTemplateConstructor(self): group ) - self.failUnlessEqual("[1+2+3]", found) + self.assertEqual("[1+2+3]", found) def testPredicates(self): @@ -289,7 +289,7 @@ def testPredicates(self): "b 34" ) - self.failUnlessEqual("B: 34", found) + self.assertEqual("B: 34", found) def testBacktrackingMode(self): @@ -316,7 +316,7 @@ def testBacktrackingMode(self): "abc 34" ) - self.failUnlessEqual("id=abc, int=34", found) + self.assertEqual("id=abc, int=34", found) def testRewrite(self): @@ -388,7 +388,7 @@ def testRewrite(self): ''' ) - self.failUnlessEqual(expected, found) + self.assertEqual(expected, found) def testTreeRewrite(self): @@ -501,7 +501,7 @@ def testTreeRewrite(self): ''' ) - self.failUnlessEqual(expected, found) + self.assertEqual(expected, found) if __name__ == '__main__': diff --git a/runtime/Python/tests/t056lexer.py b/runtime/Python/tests/t056lexer.py index a53f92a3d..33f78c1b6 100644 --- a/runtime/Python/tests/t056lexer.py +++ b/runtime/Python/tests/t056lexer.py @@ -42,7 +42,7 @@ def testRefToRuleDoesNotSetChannel(self): "- 34" ) - self.failUnlessEqual("- 34, channel=0", found) + self.assertEqual("- 34, channel=0", found) if __name__ == '__main__': diff --git a/runtime/Python/tests/t057autoAST.py b/runtime/Python/tests/t057autoAST.py index e5c1d35da..c79b948e4 100644 --- a/runtime/Python/tests/t057autoAST.py +++ b/runtime/Python/tests/t057autoAST.py @@ -491,8 +491,6 @@ def testSetRoot(self): self.assertEquals("(+ abc)", found) - @testbase.broken( - "FAILS until antlr.g rebuilt in v3", testbase.GrammarCompileError) def testSetRootWithLabel(self): grammar = textwrap.dedent( r''' @@ -846,7 +844,7 @@ def testExtraTokenInSimpleDecl(self): found, errors = self.execParser(grammar, "decl", "int 34 x=1;", expectErrors=True) - self.assertEquals(["line 1:4 extraneous input u'34' expecting ID"], + self.assertListEqual(["line 1:4 extraneous input u'34' expecting ID"], errors) self.assertEquals("(int x 1)", found) # tree gets correct x and 1 tokens @@ -866,7 +864,7 @@ def testMissingIDInSimpleDecl(self): found, errors = self.execParser(grammar, "decl", "int =1;", expectErrors=True) - self.assertEquals(["line 1:4 missing ID at u'='"], errors) + self.assertListEqual(["line 1:4 missing ID at u'='"], errors) self.assertEquals("(int 1)", found) # tree gets invented ID token @@ -885,7 +883,7 @@ def testMissingSetInSimpleDecl(self): found, errors = self.execParser(grammar, "decl", "x=1;", expectErrors=True) - self.assertEquals(["line 1:0 mismatched input u'x' expecting set None"], errors) + self.assertListEqual(["line 1:0 mismatched input u'x' expecting set None"], errors) self.assertEquals("( x 1)", found) # tree gets invented ID token @@ -901,7 +899,7 @@ def testMissingTokenGivesErrorNode(self): ''') found, errors = self.execParser(grammar, "a", "abc", expectErrors=True) - self.assertEquals(["line 1:3 missing INT at ''"], errors) + self.assertListEqual(["line 1:3 missing INT at ''"], errors) self.assertEquals("abc ", found) @@ -918,7 +916,7 @@ def testMissingTokenGivesErrorNodeInInvokedRule(self): ''') found, errors = self.execParser(grammar, "a", "abc", expectErrors=True) - self.assertEquals(["line 1:3 mismatched input '' expecting INT"], errors) + self.assertListEqual(["line 1:3 mismatched input '' expecting INT"], errors) self.assertEquals(", resync=abc>", found) @@ -937,7 +935,7 @@ def testExtraTokenGivesErrorNode(self): found, errors = self.execParser(grammar, "a", "abc ick 34", expectErrors=True) - self.assertEquals(["line 1:4 extraneous input u'ick' expecting INT"], + self.assertListEqual(["line 1:4 extraneous input u'ick' expecting INT"], errors) self.assertEquals("abc 34", found) @@ -954,7 +952,7 @@ def testMissingFirstTokenGivesErrorNode(self): ''') found, errors = self.execParser(grammar, "a", "34", expectErrors=True) - self.assertEquals(["line 1:0 missing ID at u'34'"], errors) + self.assertListEqual(["line 1:0 missing ID at u'34'"], errors) self.assertEquals(" 34", found) @@ -976,7 +974,7 @@ def testMissingFirstTokenGivesErrorNode2(self): # finds an error at the first token, 34, and re-syncs. # re-synchronizing does not consume a token because 34 follows # ref to rule b (start of c). It then matches 34 in c. - self.assertEquals(["line 1:0 missing ID at u'34'"], errors) + self.assertListEqual(["line 1:0 missing ID at u'34'"], errors) self.assertEquals(" 34", found) @@ -995,7 +993,7 @@ def testNoViableAltGivesErrorNode(self): ''') found, errors = self.execParser(grammar, "a", "*", expectErrors=True) - self.assertEquals(["line 1:0 no viable alternative at input u'*'"], + self.assertListEqual(["line 1:0 no viable alternative at input u'*'"], errors) self.assertEquals(",1:0], resync=*>", found) diff --git a/runtime/Python/tests/t058rewriteAST.py b/runtime/Python/tests/t058rewriteAST.py index 15036f478..d3aee77cb 100644 --- a/runtime/Python/tests/t058rewriteAST.py +++ b/runtime/Python/tests/t058rewriteAST.py @@ -1202,8 +1202,6 @@ def testSet2(self): self.assertEquals("2", found) - @testbase.broken("http://www.antlr.org:8888/browse/ANTLR-162", - antlr3.tree.RewriteEmptyStreamException) def testSetWithLabel(self): grammar = textwrap.dedent( r''' @@ -1367,7 +1365,7 @@ def testExtraTokenInSimpleDecl(self): found, errors = self.execParser(grammar, "decl", "int 34 x=1;", expectErrors=True) - self.assertEquals(["line 1:4 extraneous input u'34' expecting ID"], + self.assertListEqual(["line 1:4 extraneous input u'34' expecting ID"], errors) self.assertEquals("(EXPR int x 1)", found) # tree gets correct x and 1 tokens @@ -1388,7 +1386,7 @@ def testMissingIDInSimpleDecl(self): found, errors = self.execParser(grammar, "decl", "int =1;", expectErrors=True) - self.assertEquals(["line 1:4 missing ID at u'='"], errors) + self.assertListEqual(["line 1:4 missing ID at u'='"], errors) self.assertEquals("(EXPR int 1)", found) # tree gets invented ID token @@ -1407,7 +1405,7 @@ def testMissingSetInSimpleDecl(self): found, errors = self.execParser(grammar, "decl", "x=1;", expectErrors=True) - self.assertEquals(["line 1:0 mismatched input u'x' expecting set None"], + self.assertListEqual(["line 1:0 mismatched input u'x' expecting set None"], errors); self.assertEquals("(EXPR x 1)", found) # tree gets invented ID token @@ -1425,7 +1423,7 @@ def testMissingTokenGivesErrorNode(self): found, errors = self.execParser(grammar, "a", "abc", expectErrors=True) - self.assertEquals(["line 1:3 missing INT at ''"], errors) + self.assertListEqual(["line 1:3 missing INT at ''"], errors) # doesn't do in-line recovery for sets (yet?) self.assertEquals("abc ", found) @@ -1445,7 +1443,7 @@ def testExtraTokenGivesErrorNode(self): found, errors = self.execParser(grammar, "a", "abc ick 34", expectErrors=True) - self.assertEquals(["line 1:4 extraneous input u'ick' expecting INT"], + self.assertListEqual(["line 1:4 extraneous input u'ick' expecting INT"], errors) self.assertEquals("abc 34", found) @@ -1463,7 +1461,7 @@ def testMissingFirstTokenGivesErrorNode(self): ''') found, errors = self.execParser(grammar, "a", "34", expectErrors=True) - self.assertEquals(["line 1:0 missing ID at u'34'"], errors) + self.assertListEqual(["line 1:0 missing ID at u'34'"], errors) self.assertEquals(" 34", found) @@ -1485,7 +1483,7 @@ def testMissingFirstTokenGivesErrorNode2(self): # finds an error at the first token, 34, and re-syncs. # re-synchronizing does not consume a token because 34 follows # ref to rule b (start of c). It then matches 34 in c. - self.assertEquals(["line 1:0 missing ID at u'34'"], errors) + self.assertListEqual(["line 1:0 missing ID at u'34'"], errors) self.assertEquals(" 34", found) @@ -1507,7 +1505,7 @@ def testNoViableAltGivesErrorNode(self): # finds an error at the first token, 34, and re-syncs. # re-synchronizing does not consume a token because 34 follows # ref to rule b (start of c). It then matches 34 in c. - self.assertEquals(["line 1:0 no viable alternative at input u'*'"], + self.assertListEqual(["line 1:0 no viable alternative at input u'*'"], errors); self.assertEquals(",1:0], resync=*>", found) diff --git a/runtime/Python/unittests/testdfa.py b/runtime/Python/unittests/testdfa.py index 7df3fb85b..2f0ccf503 100644 --- a/runtime/Python/unittests/testdfa.py +++ b/runtime/Python/unittests/testdfa.py @@ -42,7 +42,7 @@ def testInit(self): def testUnpack(self): """DFA.unpack()""" - self.failUnlessEqual( + self.assertListEqual( antlr3.DFA.unpack( u"\1\3\1\4\2\uffff\1\5\22\uffff\1\2\31\uffff\1\6\6\uffff" u"\32\6\4\uffff\1\6\1\uffff\32\6" diff --git a/runtime/Python/unittests/testrecognizers.py b/runtime/Python/unittests/testrecognizers.py index 1fd87916f..f1e638247 100644 --- a/runtime/Python/unittests/testrecognizers.py +++ b/runtime/Python/unittests/testrecognizers.py @@ -11,7 +11,7 @@ def testGetRuleInvocationStack(self): """BaseRecognizer._getRuleInvocationStack()""" rules = antlr3.BaseRecognizer._getRuleInvocationStack(__name__) - self.failUnlessEqual( + self.assertListEqual( rules, ['testGetRuleInvocationStack'] ) @@ -47,7 +47,7 @@ def nextToken(self): for token in src: tokens.append(token.type) - self.failUnlessEqual(tokens, [1, 2, 3, 4]) + self.assertListEqual(tokens, [1, 2, 3, 4]) diff --git a/runtime/Python/unittests/teststreams.py b/runtime/Python/unittests/teststreams.py index f8430ba95..a55971246 100644 --- a/runtime/Python/unittests/teststreams.py +++ b/runtime/Python/unittests/teststreams.py @@ -14,7 +14,7 @@ def testSize(self): stream = antlr3.StringStream('foo') - self.failUnlessEqual(stream.size(), 3) + self.assertEqual(stream.size(), 3) def testIndex(self): @@ -22,7 +22,7 @@ def testIndex(self): stream = antlr3.StringStream('foo') - self.failUnlessEqual(stream.index(), 0) + self.assertEqual(stream.index(), 0) def testConsume(self): @@ -31,49 +31,49 @@ def testConsume(self): stream = antlr3.StringStream('foo\nbar') stream.consume() # f - self.failUnlessEqual(stream.index(), 1) - self.failUnlessEqual(stream.charPositionInLine, 1) - self.failUnlessEqual(stream.line, 1) + self.assertEqual(stream.index(), 1) + self.assertEqual(stream.charPositionInLine, 1) + self.assertEqual(stream.line, 1) stream.consume() # o - self.failUnlessEqual(stream.index(), 2) - self.failUnlessEqual(stream.charPositionInLine, 2) - self.failUnlessEqual(stream.line, 1) + self.assertEqual(stream.index(), 2) + self.assertEqual(stream.charPositionInLine, 2) + self.assertEqual(stream.line, 1) stream.consume() # o - self.failUnlessEqual(stream.index(), 3) - self.failUnlessEqual(stream.charPositionInLine, 3) - self.failUnlessEqual(stream.line, 1) + self.assertEqual(stream.index(), 3) + self.assertEqual(stream.charPositionInLine, 3) + self.assertEqual(stream.line, 1) stream.consume() # \n - self.failUnlessEqual(stream.index(), 4) - self.failUnlessEqual(stream.charPositionInLine, 0) - self.failUnlessEqual(stream.line, 2) + self.assertEqual(stream.index(), 4) + self.assertEqual(stream.charPositionInLine, 0) + self.assertEqual(stream.line, 2) stream.consume() # b - self.failUnlessEqual(stream.index(), 5) - self.failUnlessEqual(stream.charPositionInLine, 1) - self.failUnlessEqual(stream.line, 2) + self.assertEqual(stream.index(), 5) + self.assertEqual(stream.charPositionInLine, 1) + self.assertEqual(stream.line, 2) stream.consume() # a - self.failUnlessEqual(stream.index(), 6) - self.failUnlessEqual(stream.charPositionInLine, 2) - self.failUnlessEqual(stream.line, 2) + self.assertEqual(stream.index(), 6) + self.assertEqual(stream.charPositionInLine, 2) + self.assertEqual(stream.line, 2) stream.consume() # r - self.failUnlessEqual(stream.index(), 7) - self.failUnlessEqual(stream.charPositionInLine, 3) - self.failUnlessEqual(stream.line, 2) + self.assertEqual(stream.index(), 7) + self.assertEqual(stream.charPositionInLine, 3) + self.assertEqual(stream.line, 2) stream.consume() # EOF - self.failUnlessEqual(stream.index(), 7) - self.failUnlessEqual(stream.charPositionInLine, 3) - self.failUnlessEqual(stream.line, 2) + self.assertEqual(stream.index(), 7) + self.assertEqual(stream.charPositionInLine, 3) + self.assertEqual(stream.line, 2) stream.consume() # EOF - self.failUnlessEqual(stream.index(), 7) - self.failUnlessEqual(stream.charPositionInLine, 3) - self.failUnlessEqual(stream.line, 2) + self.assertEqual(stream.index(), 7) + self.assertEqual(stream.charPositionInLine, 3) + self.assertEqual(stream.line, 2) def testReset(self): @@ -85,10 +85,10 @@ def testReset(self): stream.consume() stream.reset() - self.failUnlessEqual(stream.index(), 0) - self.failUnlessEqual(stream.line, 1) - self.failUnlessEqual(stream.charPositionInLine, 0) - self.failUnlessEqual(stream.LT(1), 'f') + self.assertEqual(stream.index(), 0) + self.assertEqual(stream.line, 1) + self.assertEqual(stream.charPositionInLine, 0) + self.assertEqual(stream.LT(1), 'f') def testLA(self): @@ -96,16 +96,16 @@ def testLA(self): stream = antlr3.StringStream('foo') - self.failUnlessEqual(stream.LT(1), 'f') - self.failUnlessEqual(stream.LT(2), 'o') - self.failUnlessEqual(stream.LT(3), 'o') + self.assertEqual(stream.LT(1), 'f') + self.assertEqual(stream.LT(2), 'o') + self.assertEqual(stream.LT(3), 'o') stream.consume() stream.consume() - self.failUnlessEqual(stream.LT(1), 'o') - self.failUnlessEqual(stream.LT(2), antlr3.EOF) - self.failUnlessEqual(stream.LT(3), antlr3.EOF) + self.assertEqual(stream.LT(1), 'o') + self.assertEqual(stream.LT(2), antlr3.EOF) + self.assertEqual(stream.LT(3), antlr3.EOF) def testSubstring(self): @@ -113,10 +113,10 @@ def testSubstring(self): stream = antlr3.StringStream('foobar') - self.failUnlessEqual(stream.substring(0, 0), 'f') - self.failUnlessEqual(stream.substring(0, 1), 'fo') - self.failUnlessEqual(stream.substring(0, 5), 'foobar') - self.failUnlessEqual(stream.substring(3, 5), 'bar') + self.assertEqual(stream.substring(0, 0), 'f') + self.assertEqual(stream.substring(0, 1), 'fo') + self.assertEqual(stream.substring(0, 5), 'foobar') + self.assertEqual(stream.substring(3, 5), 'bar') def testSeekForward(self): @@ -126,10 +126,10 @@ def testSeekForward(self): stream.seek(4) - self.failUnlessEqual(stream.index(), 4) - self.failUnlessEqual(stream.line, 2) - self.failUnlessEqual(stream.charPositionInLine, 0) - self.failUnlessEqual(stream.LT(1), 'b') + self.assertEqual(stream.index(), 4) + self.assertEqual(stream.line, 2) + self.assertEqual(stream.charPositionInLine, 0) + self.assertEqual(stream.LT(1), 'b') ## # not yet implemented @@ -141,10 +141,10 @@ def testSeekForward(self): ## stream.seek(4) ## stream.seek(1) -## self.failUnlessEqual(stream.index(), 1) -## self.failUnlessEqual(stream.line, 1) -## self.failUnlessEqual(stream.charPositionInLine, 1) -## self.failUnlessEqual(stream.LA(1), 'o') +## self.assertEqual(stream.index(), 1) +## self.assertEqual(stream.line, 1) +## self.assertEqual(stream.charPositionInLine, 1) +## self.assertEqual(stream.LA(1), 'o') def testMark(self): @@ -155,13 +155,13 @@ def testMark(self): stream.seek(4) marker = stream.mark() - self.failUnlessEqual(marker, 1) - self.failUnlessEqual(stream.markDepth, 1) + self.assertEqual(marker, 1) + self.assertEqual(stream.markDepth, 1) stream.consume() marker = stream.mark() - self.failUnlessEqual(marker, 2) - self.failUnlessEqual(stream.markDepth, 2) + self.assertEqual(marker, 2) + self.assertEqual(stream.markDepth, 2) def testReleaseLast(self): @@ -176,11 +176,11 @@ def testReleaseLast(self): marker2 = stream.mark() stream.release() - self.failUnlessEqual(stream.markDepth, 1) + self.assertEqual(stream.markDepth, 1) # release same marker again, nothing has changed stream.release() - self.failUnlessEqual(stream.markDepth, 1) + self.assertEqual(stream.markDepth, 1) def testReleaseNested(self): @@ -198,7 +198,7 @@ def testReleaseNested(self): marker3 = stream.mark() stream.release(marker2) - self.failUnlessEqual(stream.markDepth, 1) + self.assertEqual(stream.markDepth, 1) def testRewindLast(self): @@ -213,11 +213,11 @@ def testRewindLast(self): stream.consume() stream.rewind() - self.failUnlessEqual(stream.markDepth, 0) - self.failUnlessEqual(stream.index(), 4) - self.failUnlessEqual(stream.line, 2) - self.failUnlessEqual(stream.charPositionInLine, 0) - self.failUnlessEqual(stream.LT(1), 'b') + self.assertEqual(stream.markDepth, 0) + self.assertEqual(stream.index(), 4) + self.assertEqual(stream.line, 2) + self.assertEqual(stream.charPositionInLine, 0) + self.assertEqual(stream.LT(1), 'b') def testRewindNested(self): @@ -235,11 +235,11 @@ def testRewindNested(self): marker3 = stream.mark() stream.rewind(marker2) - self.failUnlessEqual(stream.markDepth, 1) - self.failUnlessEqual(stream.index(), 5) - self.failUnlessEqual(stream.line, 2) - self.failUnlessEqual(stream.charPositionInLine, 1) - self.failUnlessEqual(stream.LT(1), 'a') + self.assertEqual(stream.markDepth, 1) + self.assertEqual(stream.index(), 5) + self.assertEqual(stream.line, 2) + self.assertEqual(stream.charPositionInLine, 1) + self.assertEqual(stream.LT(1), 'a') class TestFileStream(unittest.TestCase): @@ -261,12 +261,12 @@ def testNoEncoding(self): marker3 = stream.mark() stream.rewind(marker2) - self.failUnlessEqual(stream.markDepth, 1) - self.failUnlessEqual(stream.index(), 5) - self.failUnlessEqual(stream.line, 2) - self.failUnlessEqual(stream.charPositionInLine, 1) - self.failUnlessEqual(stream.LT(1), 'a') - self.failUnlessEqual(stream.LA(1), ord('a')) + self.assertEqual(stream.markDepth, 1) + self.assertEqual(stream.index(), 5) + self.assertEqual(stream.line, 2) + self.assertEqual(stream.charPositionInLine, 1) + self.assertEqual(stream.LT(1), 'a') + self.assertEqual(stream.LA(1), ord('a')) def testEncoded(self): @@ -284,12 +284,12 @@ def testEncoded(self): marker3 = stream.mark() stream.rewind(marker2) - self.failUnlessEqual(stream.markDepth, 1) - self.failUnlessEqual(stream.index(), 5) - self.failUnlessEqual(stream.line, 2) - self.failUnlessEqual(stream.charPositionInLine, 1) - self.failUnlessEqual(stream.LT(1), u'ä') - self.failUnlessEqual(stream.LA(1), ord(u'ä')) + self.assertEqual(stream.markDepth, 1) + self.assertEqual(stream.index(), 5) + self.assertEqual(stream.line, 2) + self.assertEqual(stream.charPositionInLine, 1) + self.assertEqual(stream.LT(1), u'ä') + self.assertEqual(stream.LA(1), ord(u'ä')) @@ -311,12 +311,12 @@ def testNoEncoding(self): marker3 = stream.mark() stream.rewind(marker2) - self.failUnlessEqual(stream.markDepth, 1) - self.failUnlessEqual(stream.index(), 5) - self.failUnlessEqual(stream.line, 2) - self.failUnlessEqual(stream.charPositionInLine, 1) - self.failUnlessEqual(stream.LT(1), 'a') - self.failUnlessEqual(stream.LA(1), ord('a')) + self.assertEqual(stream.markDepth, 1) + self.assertEqual(stream.index(), 5) + self.assertEqual(stream.line, 2) + self.assertEqual(stream.charPositionInLine, 1) + self.assertEqual(stream.LT(1), 'a') + self.assertEqual(stream.LA(1), ord('a')) def testEncoded(self): @@ -334,12 +334,12 @@ def testEncoded(self): marker3 = stream.mark() stream.rewind(marker2) - self.failUnlessEqual(stream.markDepth, 1) - self.failUnlessEqual(stream.index(), 5) - self.failUnlessEqual(stream.line, 2) - self.failUnlessEqual(stream.charPositionInLine, 1) - self.failUnlessEqual(stream.LT(1), u'ä') - self.failUnlessEqual(stream.LA(1), ord(u'ä')) + self.assertEqual(stream.markDepth, 1) + self.assertEqual(stream.index(), 5) + self.assertEqual(stream.line, 2) + self.assertEqual(stream.charPositionInLine, 1) + self.assertEqual(stream.LT(1), u'ä') + self.assertEqual(stream.LA(1), ord(u'ä')) class TestCommonTokenStream(unittest.TestCase): @@ -373,7 +373,7 @@ def testInit(self): """CommonTokenStream.__init__()""" stream = antlr3.CommonTokenStream(self.source) - self.failUnlessEqual(stream.index(), -1) + self.assertEqual(stream.index(), -1) def testSetTokenSource(self): @@ -381,8 +381,8 @@ def testSetTokenSource(self): stream = antlr3.CommonTokenStream(None) stream.setTokenSource(self.source) - self.failUnlessEqual(stream.index(), -1) - self.failUnlessEqual(stream.channel, antlr3.DEFAULT_CHANNEL) + self.assertEqual(stream.index(), -1) + self.assertEqual(stream.channel, antlr3.DEFAULT_CHANNEL) def testLTEmptySource(self): @@ -391,7 +391,7 @@ def testLTEmptySource(self): stream = antlr3.CommonTokenStream(self.source) lt1 = stream.LT(1) - self.failUnlessEqual(lt1.type, antlr3.EOF) + self.assertEqual(lt1.type, antlr3.EOF) def testLT1(self): @@ -404,7 +404,7 @@ def testLT1(self): stream = antlr3.CommonTokenStream(self.source) lt1 = stream.LT(1) - self.failUnlessEqual(lt1.type, 12) + self.assertEqual(lt1.type, 12) def testLT1WithHidden(self): @@ -421,7 +421,7 @@ def testLT1WithHidden(self): stream = antlr3.CommonTokenStream(self.source) lt1 = stream.LT(1) - self.failUnlessEqual(lt1.type, 13) + self.assertEqual(lt1.type, 13) def testLT2BeyondEnd(self): @@ -438,7 +438,7 @@ def testLT2BeyondEnd(self): stream = antlr3.CommonTokenStream(self.source) lt1 = stream.LT(2) - self.failUnlessEqual(lt1.type, antlr3.EOF) + self.assertEqual(lt1.type, antlr3.EOF) # not yet implemented @@ -458,7 +458,7 @@ def testLTNegative(self): stream.consume() lt1 = stream.LT(-1) - self.failUnlessEqual(lt1.type, 12) + self.assertEqual(lt1.type, 12) def testLB1(self): @@ -476,7 +476,7 @@ def testLB1(self): stream.fillBuffer() stream.consume() - self.failUnlessEqual(stream.LB(1).type, 12) + self.assertEqual(stream.LB(1).type, 12) def testLTZero(self): @@ -493,7 +493,7 @@ def testLTZero(self): stream = antlr3.CommonTokenStream(self.source) lt1 = stream.LT(0) - self.failUnless(lt1 is None) + self.assertTrue(lt1 is None) def testLBBeyondBegin(self): @@ -516,11 +516,11 @@ def testLBBeyondBegin(self): ) stream = antlr3.CommonTokenStream(self.source) - self.failUnless(stream.LB(1) is None) + self.assertTrue(stream.LB(1) is None) stream.consume() stream.consume() - self.failUnless(stream.LB(3) is None) + self.assertTrue(stream.LB(3) is None) def testFillBuffer(self): @@ -545,10 +545,10 @@ def testFillBuffer(self): stream = antlr3.CommonTokenStream(self.source) stream.fillBuffer() - self.failUnlessEqual(len(stream.tokens), 3) - self.failUnlessEqual(stream.tokens[0].type, 12) - self.failUnlessEqual(stream.tokens[1].type, 13) - self.failUnlessEqual(stream.tokens[2].type, 14) + self.assertEqual(len(stream.tokens), 3) + self.assertEqual(stream.tokens[0].type, 12) + self.assertEqual(stream.tokens[1].type, 13) + self.assertEqual(stream.tokens[2].type, 14) def testConsume(self): @@ -567,16 +567,16 @@ def testConsume(self): ) stream = antlr3.CommonTokenStream(self.source) - self.failUnlessEqual(stream.LA(1), 12) + self.assertEqual(stream.LA(1), 12) stream.consume() - self.failUnlessEqual(stream.LA(1), 13) + self.assertEqual(stream.LA(1), 13) stream.consume() - self.failUnlessEqual(stream.LA(1), antlr3.EOF) + self.assertEqual(stream.LA(1), antlr3.EOF) stream.consume() - self.failUnlessEqual(stream.LA(1), antlr3.EOF) + self.assertEqual(stream.LA(1), antlr3.EOF) def testSeek(self): @@ -595,13 +595,13 @@ def testSeek(self): ) stream = antlr3.CommonTokenStream(self.source) - self.failUnlessEqual(stream.LA(1), 12) + self.assertEqual(stream.LA(1), 12) stream.seek(2) - self.failUnlessEqual(stream.LA(1), antlr3.EOF) + self.assertEqual(stream.LA(1), antlr3.EOF) stream.seek(0) - self.failUnlessEqual(stream.LA(1), 12) + self.assertEqual(stream.LA(1), 12) def testMarkRewind(self): @@ -628,7 +628,7 @@ def testMarkRewind(self): stream.consume() stream.rewind(marker) - self.failUnlessEqual(stream.LA(1), 13) + self.assertEqual(stream.LA(1), 13) def testToString(self): diff --git a/runtime/Python/unittests/testtree.py b/runtime/Python/unittests/testtree.py index 1f4e36ff9..6014bd90c 100644 --- a/runtime/Python/unittests/testtree.py +++ b/runtime/Python/unittests/testtree.py @@ -27,11 +27,11 @@ def testSingleNode(self): stream = self.newStream(t) expecting = "101" found = self.toNodesOnlyString(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) expecting = "101" found = str(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testTwoChildrenOfNilRoot(self): @@ -76,11 +76,11 @@ def test4Nodes(self): stream = self.newStream(t) expecting = "101 102 103 104" found = self.toNodesOnlyString(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) expecting = "101 2 102 2 103 3 104 3" found = str(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testList(self): @@ -99,11 +99,11 @@ def testList(self): stream = CommonTreeNodeStream(root) expecting = "101 102 103 104 105" found = self.toNodesOnlyString(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) expecting = "101 2 102 2 103 3 104 3 105" found = str(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testFlatList(self): @@ -116,11 +116,11 @@ def testFlatList(self): stream = CommonTreeNodeStream(root) expecting = "101 102 103" found = self.toNodesOnlyString(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) expecting = "101 102 103" found = str(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testListWithOneNode(self): @@ -131,11 +131,11 @@ def testListWithOneNode(self): stream = CommonTreeNodeStream(root) expecting = "101" found = self.toNodesOnlyString(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) expecting = "101" found = str(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testAoverB(self): @@ -145,11 +145,11 @@ def testAoverB(self): stream = self.newStream(t) expecting = "101 102" found = self.toNodesOnlyString(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) expecting = "101 2 102 3" found = str(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testLT(self): @@ -160,17 +160,17 @@ def testLT(self): t.addChild(CommonTree(CommonToken(104))) stream = self.newStream(t) - self.failUnlessEqual(101, stream.LT(1).getType()) - self.failUnlessEqual(DOWN, stream.LT(2).getType()) - self.failUnlessEqual(102, stream.LT(3).getType()) - self.failUnlessEqual(DOWN, stream.LT(4).getType()) - self.failUnlessEqual(103, stream.LT(5).getType()) - self.failUnlessEqual(UP, stream.LT(6).getType()) - self.failUnlessEqual(104, stream.LT(7).getType()) - self.failUnlessEqual(UP, stream.LT(8).getType()) - self.failUnlessEqual(EOF, stream.LT(9).getType()) + self.assertEqual(101, stream.LT(1).getType()) + self.assertEqual(DOWN, stream.LT(2).getType()) + self.assertEqual(102, stream.LT(3).getType()) + self.assertEqual(DOWN, stream.LT(4).getType()) + self.assertEqual(103, stream.LT(5).getType()) + self.assertEqual(UP, stream.LT(6).getType()) + self.assertEqual(104, stream.LT(7).getType()) + self.assertEqual(UP, stream.LT(8).getType()) + self.assertEqual(EOF, stream.LT(9).getType()) # check way ahead - self.failUnlessEqual(EOF, stream.LT(100).getType()) + self.assertEqual(EOF, stream.LT(100).getType()) def testMarkRewindEntire(self): @@ -193,8 +193,8 @@ def testMarkRewindEntire(self): stream.LT(1) stream.consume() - self.failUnlessEqual(EOF, stream.LT(1).getType()) - self.failUnlessEqual(UP, stream.LT(-1).getType()) #TODO: remove? + self.assertEqual(EOF, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(-1).getType()) #TODO: remove? stream.rewind(m) # REWIND # consume til end again :) @@ -202,8 +202,8 @@ def testMarkRewindEntire(self): stream.LT(1) stream.consume() - self.failUnlessEqual(EOF, stream.LT(1).getType()) - self.failUnlessEqual(UP, stream.LT(-1).getType()) #TODO: remove? + self.assertEqual(EOF, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(-1).getType()) #TODO: remove? def testMarkRewindInMiddle(self): @@ -225,7 +225,7 @@ def testMarkRewindInMiddle(self): #System.out.println(tream.LT(1).getType()) stream.consume() - self.failUnlessEqual(107, stream.LT(1).getType()) + self.assertEqual(107, stream.LT(1).getType()) m = stream.mark() # MARK stream.consume() # consume 107 stream.consume() # consume UP @@ -233,21 +233,21 @@ def testMarkRewindInMiddle(self): stream.consume() # consume 104 stream.rewind(m) # REWIND - self.failUnlessEqual(107, stream.LT(1).getType()) + self.assertEqual(107, stream.LT(1).getType()) stream.consume() - self.failUnlessEqual(UP, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(1).getType()) stream.consume() - self.failUnlessEqual(UP, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(1).getType()) stream.consume() - self.failUnlessEqual(104, stream.LT(1).getType()) + self.assertEqual(104, stream.LT(1).getType()) stream.consume() # now we're past rewind position - self.failUnlessEqual(105, stream.LT(1).getType()) + self.assertEqual(105, stream.LT(1).getType()) stream.consume() - self.failUnlessEqual(UP, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(1).getType()) stream.consume() - self.failUnlessEqual(EOF, stream.LT(1).getType()) - self.failUnlessEqual(UP, stream.LT(-1).getType()) + self.assertEqual(EOF, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(-1).getType()) def testMarkRewindNested(self): @@ -274,19 +274,19 @@ def testMarkRewindNested(self): stream.consume() # consume 103 stream.consume() # consume 106 stream.rewind(m2) # REWIND to 102 - self.failUnlessEqual(102, stream.LT(1).getType()) + self.assertEqual(102, stream.LT(1).getType()) stream.consume() - self.failUnlessEqual(DOWN, stream.LT(1).getType()) + self.assertEqual(DOWN, stream.LT(1).getType()) stream.consume() # stop at 103 and rewind to start stream.rewind(m) # REWIND to 101 - self.failUnlessEqual(101, stream.LT(1).getType()) + self.assertEqual(101, stream.LT(1).getType()) stream.consume() - self.failUnlessEqual(DOWN, stream.LT(1).getType()) + self.assertEqual(DOWN, stream.LT(1).getType()) stream.consume() - self.failUnlessEqual(102, stream.LT(1).getType()) + self.assertEqual(102, stream.LT(1).getType()) stream.consume() - self.failUnlessEqual(DOWN, stream.LT(1).getType()) + self.assertEqual(DOWN, stream.LT(1).getType()) def testSeek(self): @@ -308,11 +308,11 @@ def testSeek(self): stream.consume() # consume DN stream.consume() # consume 102 stream.seek(7) # seek to 107 - self.failUnlessEqual(107, stream.LT(1).getType()) + self.assertEqual(107, stream.LT(1).getType()) stream.consume() # consume 107 stream.consume() # consume UP stream.consume() # consume UP - self.failUnlessEqual(104, stream.LT(1).getType()) + self.assertEqual(104, stream.LT(1).getType()) def testSeekFromStart(self): @@ -331,11 +331,11 @@ def testSeekFromStart(self): stream = CommonTreeNodeStream(r0) stream.seek(7) # seek to 107 - self.failUnlessEqual(107, stream.LT(1).getType()) + self.assertEqual(107, stream.LT(1).getType()) stream.consume() # consume 107 stream.consume() # consume UP stream.consume() # consume UP - self.failUnlessEqual(104, stream.LT(1).getType()) + self.assertEqual(104, stream.LT(1).getType()) def testReset(self): @@ -412,7 +412,7 @@ def testPushPop(self): stream = CommonTreeNodeStream(r0) expecting = "101 2 102 2 103 3 104 2 105 3 106 2 107 3 108 109 3" found = str(stream) - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) # Assume we want to hit node 107 and then "call 102" then return @@ -422,18 +422,18 @@ def testPushPop(self): stream.consume() # CALL 102 - self.failUnlessEqual(107, stream.LT(1).getType()) + self.assertEqual(107, stream.LT(1).getType()) stream.push(indexOf102) - self.failUnlessEqual(102, stream.LT(1).getType()) + self.assertEqual(102, stream.LT(1).getType()) stream.consume() # consume 102 - self.failUnlessEqual(DOWN, stream.LT(1).getType()) + self.assertEqual(DOWN, stream.LT(1).getType()) stream.consume() # consume DN - self.failUnlessEqual(103, stream.LT(1).getType()) + self.assertEqual(103, stream.LT(1).getType()) stream.consume() # consume 103 - self.failUnlessEqual(UP, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(1).getType()) # RETURN stream.pop() - self.failUnlessEqual(107, stream.LT(1).getType()) + self.assertEqual(107, stream.LT(1).getType()) def testNestedPushPop(self): @@ -463,33 +463,33 @@ def testNestedPushPop(self): for _ in range(indexOf107): # consume til 107 node stream.consume() - self.failUnlessEqual(107, stream.LT(1).getType()) + self.assertEqual(107, stream.LT(1).getType()) # CALL 102 stream.push(indexOf102) - self.failUnlessEqual(102, stream.LT(1).getType()) + self.assertEqual(102, stream.LT(1).getType()) stream.consume() # consume 102 - self.failUnlessEqual(DOWN, stream.LT(1).getType()) + self.assertEqual(DOWN, stream.LT(1).getType()) stream.consume() # consume DN - self.failUnlessEqual(103, stream.LT(1).getType()) + self.assertEqual(103, stream.LT(1).getType()) stream.consume() # consume 103 # CALL 104 indexOf104 = 6 stream.push(indexOf104) - self.failUnlessEqual(104, stream.LT(1).getType()) + self.assertEqual(104, stream.LT(1).getType()) stream.consume() # consume 102 - self.failUnlessEqual(DOWN, stream.LT(1).getType()) + self.assertEqual(DOWN, stream.LT(1).getType()) stream.consume() # consume DN - self.failUnlessEqual(105, stream.LT(1).getType()) + self.assertEqual(105, stream.LT(1).getType()) stream.consume() # consume 103 - self.failUnlessEqual(UP, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(1).getType()) # RETURN (to UP node in 102 subtree) stream.pop() - self.failUnlessEqual(UP, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(1).getType()) # RETURN (to empty stack) stream.pop() - self.failUnlessEqual(107, stream.LT(1).getType()) + self.assertEqual(107, stream.LT(1).getType()) def testPushPopFromEOF(self): @@ -516,33 +516,33 @@ def testPushPopFromEOF(self): indexOf102 = 2 indexOf104 = 6 - self.failUnlessEqual(EOF, stream.LT(1).getType()) + self.assertEqual(EOF, stream.LT(1).getType()) # CALL 102 stream.push(indexOf102) - self.failUnlessEqual(102, stream.LT(1).getType()) + self.assertEqual(102, stream.LT(1).getType()) stream.consume() # consume 102 - self.failUnlessEqual(DOWN, stream.LT(1).getType()) + self.assertEqual(DOWN, stream.LT(1).getType()) stream.consume() # consume DN - self.failUnlessEqual(103, stream.LT(1).getType()) + self.assertEqual(103, stream.LT(1).getType()) stream.consume() # consume 103 - self.failUnlessEqual(UP, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(1).getType()) # RETURN (to empty stack) stream.pop() - self.failUnlessEqual(EOF, stream.LT(1).getType()) + self.assertEqual(EOF, stream.LT(1).getType()) # CALL 104 stream.push(indexOf104) - self.failUnlessEqual(104, stream.LT(1).getType()) + self.assertEqual(104, stream.LT(1).getType()) stream.consume() # consume 102 - self.failUnlessEqual(DOWN, stream.LT(1).getType()) + self.assertEqual(DOWN, stream.LT(1).getType()) stream.consume() # consume DN - self.failUnlessEqual(105, stream.LT(1).getType()) + self.assertEqual(105, stream.LT(1).getType()) stream.consume() # consume 103 - self.failUnlessEqual(UP, stream.LT(1).getType()) + self.assertEqual(UP, stream.LT(1).getType()) # RETURN (to empty stack) stream.pop() - self.failUnlessEqual(EOF, stream.LT(1).getType()) + self.assertEqual(EOF, stream.LT(1).getType()) class TestCommonTree(unittest.TestCase): @@ -556,8 +556,8 @@ def setUp(self): def testSingleNode(self): t = CommonTree(CommonToken(101)) - self.failUnless(t.parent is None) - self.failUnlessEqual(-1, t.childIndex) + self.assertTrue(t.parent is None) + self.assertEqual(-1, t.childIndex) def test4Nodes(self): @@ -567,8 +567,8 @@ def test4Nodes(self): r0.getChild(0).addChild(CommonTree(CommonToken(103))) r0.addChild(CommonTree(CommonToken(104))) - self.failUnless(r0.parent is None) - self.failUnlessEqual(-1, r0.childIndex) + self.assertTrue(r0.parent is None) + self.assertEqual(-1, r0.childIndex) def testList(self): @@ -581,14 +581,14 @@ def testList(self): c2=CommonTree(CommonToken(103)) r0.addChild(c2) - self.failUnless(r0.parent is None) - self.failUnlessEqual(-1, r0.childIndex) - self.failUnlessEqual(r0, c0.parent) - self.failUnlessEqual(0, c0.childIndex) - self.failUnlessEqual(r0, c1.parent) - self.failUnlessEqual(1, c1.childIndex) - self.failUnlessEqual(r0, c2.parent) - self.failUnlessEqual(2, c2.childIndex) + self.assertTrue(r0.parent is None) + self.assertEqual(-1, r0.childIndex) + self.assertEqual(r0, c0.parent) + self.assertEqual(0, c0.childIndex) + self.assertEqual(r0, c1.parent) + self.assertEqual(1, c1.childIndex) + self.assertEqual(r0, c2.parent) + self.assertEqual(2, c2.childIndex) def testList2(self): @@ -607,15 +607,15 @@ def testList2(self): root.addChild(r0) - self.failUnless(root.parent is None) - self.failUnlessEqual(-1, root.childIndex) + self.assertTrue(root.parent is None) + self.assertEqual(-1, root.childIndex) # check children of root all point at root - self.failUnlessEqual(root, c0.parent) - self.failUnlessEqual(0, c0.childIndex) - self.failUnlessEqual(root, c0.parent) - self.failUnlessEqual(1, c1.childIndex) - self.failUnlessEqual(root, c0.parent) - self.failUnlessEqual(2, c2.childIndex) + self.assertEqual(root, c0.parent) + self.assertEqual(0, c0.childIndex) + self.assertEqual(root, c0.parent) + self.assertEqual(1, c1.childIndex) + self.assertEqual(root, c0.parent) + self.assertEqual(2, c2.childIndex) def testAddListToExistChildren(self): @@ -635,15 +635,15 @@ def testAddListToExistChildren(self): root.addChild(r0) - self.failUnless(root.parent is None) - self.failUnlessEqual(-1, root.childIndex) + self.assertTrue(root.parent is None) + self.assertEqual(-1, root.childIndex) # check children of root all point at root - self.failUnlessEqual(root, c0.parent) - self.failUnlessEqual(1, c0.childIndex) - self.failUnlessEqual(root, c0.parent) - self.failUnlessEqual(2, c1.childIndex) - self.failUnlessEqual(root, c0.parent) - self.failUnlessEqual(3, c2.childIndex) + self.assertEqual(root, c0.parent) + self.assertEqual(1, c0.childIndex) + self.assertEqual(root, c0.parent) + self.assertEqual(2, c1.childIndex) + self.assertEqual(root, c0.parent) + self.assertEqual(3, c2.childIndex) def testDupTree(self): @@ -660,8 +660,8 @@ def testDupTree(self): dup = self.adaptor.dupTree(r0) - self.failUnless(dup.parent is None) - self.failUnlessEqual(-1, dup.childIndex) + self.assertTrue(dup.parent is None) + self.assertEqual(-1, dup.childIndex) dup.sanityCheckParentAndChildIndexes() @@ -742,7 +742,7 @@ def testReplaceWithNoChildren(self): except IndexError: error = True - self.failUnless(error) + self.assertTrue(error) def testReplaceWithOneChildren(self): @@ -754,7 +754,7 @@ def testReplaceWithOneChildren(self): newChild = CommonTree(CommonToken(99, text="c")) t.replaceChildren(0, 0, newChild) expecting = "(a c)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() @@ -767,7 +767,7 @@ def testReplaceInMiddle(self): newChild = CommonTree(CommonToken(99, text="x")) t.replaceChildren(1, 1, newChild) expecting = "(a b x d)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() @@ -780,7 +780,7 @@ def testReplaceAtLeft(self): newChild = CommonTree(CommonToken(99, text="x")) t.replaceChildren(0, 0, newChild) expecting = "(a x c d)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() @@ -793,7 +793,7 @@ def testReplaceAtRight(self): newChild = CommonTree(CommonToken(99, text="x")) t.replaceChildren(2, 2, newChild) expecting = "(a b c x)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() @@ -809,7 +809,7 @@ def testReplaceOneWithTwoAtLeft(self): t.replaceChildren(0, 0, newChildren) expecting = "(a x y c d)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() @@ -825,7 +825,7 @@ def testReplaceOneWithTwoAtRight(self): t.replaceChildren(2, 2, newChildren) expecting = "(a b c x y)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() @@ -841,7 +841,7 @@ def testReplaceOneWithTwoInMiddle(self): t.replaceChildren(1, 1, newChildren) expecting = "(a b x y d)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() @@ -855,7 +855,7 @@ def testReplaceTwoWithOneAtLeft(self): t.replaceChildren(0, 1, newChild) expecting = "(a x d)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() @@ -869,7 +869,7 @@ def testReplaceTwoWithOneAtRight(self): t.replaceChildren(1, 2, newChild) expecting = "(a b x)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() @@ -883,7 +883,7 @@ def testReplaceAllWithOne(self): t.replaceChildren(0, 2, newChild) expecting = "(a x)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() @@ -899,7 +899,7 @@ def testReplaceAllWithTwo(self): t.replaceChildren(0, 2, newChildren) expecting = "(a x y)" - self.failUnlessEqual(expecting, t.toStringTree()) + self.assertEqual(expecting, t.toStringTree()) t.sanityCheckParentAndChildIndexes() diff --git a/runtime/Python/unittests/testtreewizard.py b/runtime/Python/unittests/testtreewizard.py index 2ad99bed0..a777a1a7d 100644 --- a/runtime/Python/unittests/testtreewizard.py +++ b/runtime/Python/unittests/testtreewizard.py @@ -18,16 +18,16 @@ def testNone(self): """computeTokenTypes(None) -> {}""" typeMap = computeTokenTypes(None) - self.failUnless(isinstance(typeMap, dict)) - self.failUnlessEqual(typeMap, {}) + self.assertTrue(isinstance(typeMap, dict)) + self.assertEqual(typeMap, {}) def testList(self): """computeTokenTypes(['a', 'b']) -> { 'a': 0, 'b': 1 }""" typeMap = computeTokenTypes(['a', 'b']) - self.failUnless(isinstance(typeMap, dict)) - self.failUnlessEqual(typeMap, { 'a': 0, 'b': 1 }) + self.assertTrue(isinstance(typeMap, dict)) + self.assertEqual(typeMap, { 'a': 0, 'b': 1 }) class TestTreePatternLexer(unittest.TestCase): @@ -38,9 +38,9 @@ def testBegin(self): lexer = TreePatternLexer('(') type = lexer.nextToken() - self.failUnlessEqual(type, BEGIN) - self.failUnlessEqual(lexer.sval, '') - self.failUnlessEqual(lexer.error, False) + self.assertEqual(type, BEGIN) + self.assertEqual(lexer.sval, '') + self.assertEqual(lexer.error, False) def testEnd(self): @@ -48,9 +48,9 @@ def testEnd(self): lexer = TreePatternLexer(')') type = lexer.nextToken() - self.failUnlessEqual(type, END) - self.failUnlessEqual(lexer.sval, '') - self.failUnlessEqual(lexer.error, False) + self.assertEqual(type, END) + self.assertEqual(lexer.sval, '') + self.assertEqual(lexer.error, False) def testPercent(self): @@ -58,9 +58,9 @@ def testPercent(self): lexer = TreePatternLexer('%') type = lexer.nextToken() - self.failUnlessEqual(type, PERCENT) - self.failUnlessEqual(lexer.sval, '') - self.failUnlessEqual(lexer.error, False) + self.assertEqual(type, PERCENT) + self.assertEqual(lexer.sval, '') + self.assertEqual(lexer.error, False) def testDot(self): @@ -68,9 +68,9 @@ def testDot(self): lexer = TreePatternLexer('.') type = lexer.nextToken() - self.failUnlessEqual(type, DOT) - self.failUnlessEqual(lexer.sval, '') - self.failUnlessEqual(lexer.error, False) + self.assertEqual(type, DOT) + self.assertEqual(lexer.sval, '') + self.assertEqual(lexer.error, False) def testColon(self): @@ -78,9 +78,9 @@ def testColon(self): lexer = TreePatternLexer(':') type = lexer.nextToken() - self.failUnlessEqual(type, COLON) - self.failUnlessEqual(lexer.sval, '') - self.failUnlessEqual(lexer.error, False) + self.assertEqual(type, COLON) + self.assertEqual(lexer.sval, '') + self.assertEqual(lexer.error, False) def testEOF(self): @@ -88,9 +88,9 @@ def testEOF(self): lexer = TreePatternLexer(' \n \r \t ') type = lexer.nextToken() - self.failUnlessEqual(type, EOF) - self.failUnlessEqual(lexer.sval, '') - self.failUnlessEqual(lexer.error, False) + self.assertEqual(type, EOF) + self.assertEqual(lexer.sval, '') + self.assertEqual(lexer.error, False) def testID(self): @@ -98,9 +98,9 @@ def testID(self): lexer = TreePatternLexer('_foo12_bar') type = lexer.nextToken() - self.failUnlessEqual(type, ID) - self.failUnlessEqual(lexer.sval, '_foo12_bar') - self.failUnlessEqual(lexer.error, False) + self.assertEqual(type, ID) + self.assertEqual(lexer.sval, '_foo12_bar') + self.assertEqual(lexer.error, False) def testARG(self): @@ -108,9 +108,9 @@ def testARG(self): lexer = TreePatternLexer('[ \\]bla\\n]') type = lexer.nextToken() - self.failUnlessEqual(type, ARG) - self.failUnlessEqual(lexer.sval, ' ]bla\\n') - self.failUnlessEqual(lexer.error, False) + self.assertEqual(type, ARG) + self.assertEqual(lexer.sval, ' ]bla\\n') + self.assertEqual(lexer.error, False) def testError(self): @@ -118,9 +118,9 @@ def testError(self): lexer = TreePatternLexer('1') type = lexer.nextToken() - self.failUnlessEqual(type, EOF) - self.failUnlessEqual(lexer.sval, '') - self.failUnlessEqual(lexer.error, True) + self.assertEqual(type, EOF) + self.assertEqual(lexer.sval, '') + self.assertEqual(lexer.error, True) class TestTreePatternParser(unittest.TestCase): @@ -146,9 +146,9 @@ def testSingleNode(self): lexer = TreePatternLexer('ID') parser = TreePatternParser(lexer, self.wizard, self.adaptor) tree = parser.pattern() - self.failUnless(isinstance(tree, CommonTree)) - self.failUnlessEqual(tree.getType(), 10) - self.failUnlessEqual(tree.getText(), 'ID') + self.assertTrue(isinstance(tree, CommonTree)) + self.assertEqual(tree.getType(), 10) + self.assertEqual(tree.getText(), 'ID') def testSingleNodeWithArg(self): @@ -156,9 +156,9 @@ def testSingleNodeWithArg(self): lexer = TreePatternLexer('ID[foo]') parser = TreePatternParser(lexer, self.wizard, self.adaptor) tree = parser.pattern() - self.failUnless(isinstance(tree, CommonTree)) - self.failUnlessEqual(tree.getType(), 10) - self.failUnlessEqual(tree.getText(), 'foo') + self.assertTrue(isinstance(tree, CommonTree)) + self.assertEqual(tree.getType(), 10) + self.assertEqual(tree.getText(), 'foo') def testSingleLevelTree(self): @@ -166,12 +166,12 @@ def testSingleLevelTree(self): lexer = TreePatternLexer('(A B)') parser = TreePatternParser(lexer, self.wizard, self.adaptor) tree = parser.pattern() - self.failUnless(isinstance(tree, CommonTree)) - self.failUnlessEqual(tree.getType(), 5) - self.failUnlessEqual(tree.getText(), 'A') - self.failUnlessEqual(tree.getChildCount(), 1) - self.failUnlessEqual(tree.getChild(0).getType(), 6) - self.failUnlessEqual(tree.getChild(0).getText(), 'B') + self.assertTrue(isinstance(tree, CommonTree)) + self.assertEqual(tree.getType(), 5) + self.assertEqual(tree.getText(), 'A') + self.assertEqual(tree.getChildCount(), 1) + self.assertEqual(tree.getChild(0).getType(), 6) + self.assertEqual(tree.getChild(0).getText(), 'B') def testNil(self): @@ -179,9 +179,9 @@ def testNil(self): lexer = TreePatternLexer('nil') parser = TreePatternParser(lexer, self.wizard, self.adaptor) tree = parser.pattern() - self.failUnless(isinstance(tree, CommonTree)) - self.failUnlessEqual(tree.getType(), 0) - self.failUnlessEqual(tree.getText(), None) + self.assertTrue(isinstance(tree, CommonTree)) + self.assertEqual(tree.getType(), 0) + self.assertEqual(tree.getText(), None) def testWildcard(self): @@ -189,7 +189,7 @@ def testWildcard(self): lexer = TreePatternLexer('(.)') parser = TreePatternParser(lexer, self.wizard, self.adaptor) tree = parser.pattern() - self.failUnless(isinstance(tree, WildcardTreePattern)) + self.assertTrue(isinstance(tree, WildcardTreePattern)) def testLabel(self): @@ -197,8 +197,8 @@ def testLabel(self): lexer = TreePatternLexer('(%a:A)') parser = TreePatternParser(lexer, self.wizard, TreePatternTreeAdaptor()) tree = parser.pattern() - self.failUnless(isinstance(tree, TreePattern)) - self.failUnlessEqual(tree.label, 'a') + self.assertTrue(isinstance(tree, TreePattern)) + self.assertEqual(tree.label, 'a') def testError1(self): @@ -206,7 +206,7 @@ def testError1(self): lexer = TreePatternLexer(')') parser = TreePatternParser(lexer, self.wizard, self.adaptor) tree = parser.pattern() - self.failUnless(tree is None) + self.assertTrue(tree is None) def testError2(self): @@ -214,7 +214,7 @@ def testError2(self): lexer = TreePatternLexer('()') parser = TreePatternParser(lexer, self.wizard, self.adaptor) tree = parser.pattern() - self.failUnless(tree is None) + self.assertTrue(tree is None) def testError3(self): @@ -222,7 +222,7 @@ def testError3(self): lexer = TreePatternLexer('(A ])') parser = TreePatternParser(lexer, self.wizard, self.adaptor) tree = parser.pattern() - self.failUnless(tree is None) + self.assertTrue(tree is None) class TestTreeWizard(unittest.TestCase): @@ -250,8 +250,8 @@ def testInit(self): tokenNames=['a', 'b'] ) - self.failUnless(wiz.adaptor is self.adaptor) - self.failUnlessEqual( + self.assertTrue(wiz.adaptor is self.adaptor) + self.assertEqual( wiz.tokenNameToTypeMap, { 'a': 0, 'b': 1 } ) @@ -265,17 +265,17 @@ def testGetTokenType(self): tokenNames=self.tokens ) - self.failUnlessEqual( + self.assertEqual( wiz.getTokenType('A'), 5 ) - self.failUnlessEqual( + self.assertEqual( wiz.getTokenType('VAR'), 11 ) - self.failUnlessEqual( + self.assertEqual( wiz.getTokenType('invalid'), INVALID_TOKEN_TYPE ) @@ -285,7 +285,7 @@ def testSingleNode(self): t = wiz.create("ID") found = t.toStringTree() expecting = "ID" - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testSingleNodeWithArg(self): @@ -293,7 +293,7 @@ def testSingleNodeWithArg(self): t = wiz.create("ID[foo]") found = t.toStringTree() expecting = "foo" - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testSingleNodeTree(self): @@ -301,7 +301,7 @@ def testSingleNodeTree(self): t = wiz.create("(A)") found = t.toStringTree() expecting = "A" - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testSingleLevelTree(self): @@ -309,7 +309,7 @@ def testSingleLevelTree(self): t = wiz.create("(A B C D)") found = t.toStringTree() expecting = "(A B C D)" - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testListTree(self): @@ -317,13 +317,13 @@ def testListTree(self): t = wiz.create("(nil A B C)") found = t.toStringTree() expecting = "A B C" - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testInvalidListTree(self): wiz = TreeWizard(self.adaptor, self.tokens) t = wiz.create("A B C") - self.failUnless(t is None) + self.assertTrue(t is None) def testDoubleLevelTree(self): @@ -331,7 +331,7 @@ def testDoubleLevelTree(self): t = wiz.create("(A (B C) (B D) E)") found = t.toStringTree() expecting = "(A (B C) (B D) E)" - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def __simplifyIndexMap(self, indexMap): @@ -346,7 +346,7 @@ def testSingleNodeIndex(self): indexMap = wiz.index(tree) found = self.__simplifyIndexMap(indexMap) expecting = { 10: ["ID"] } - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testNoRepeatsIndex(self): @@ -355,7 +355,7 @@ def testNoRepeatsIndex(self): indexMap = wiz.index(tree) found = self.__simplifyIndexMap(indexMap) expecting = { 8:['D'], 6:['B'], 7:['C'], 5:['A'] } - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testRepeatsIndex(self): @@ -364,7 +364,7 @@ def testRepeatsIndex(self): indexMap = wiz.index(tree) found = self.__simplifyIndexMap(indexMap) expecting = { 8: ['D', 'D'], 6: ['B', 'B', 'B'], 7: ['C'], 5: ['A', 'A'] } - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testNoRepeatsVisit(self): @@ -378,7 +378,7 @@ def visitor(node, parent, childIndex, labels): wiz.visit(tree, wiz.getTokenType("B"), visitor) expecting = ['B'] - self.failUnlessEqual(expecting, elements) + self.assertEqual(expecting, elements) def testNoRepeatsVisit2(self): @@ -392,7 +392,7 @@ def visitor(node, parent, childIndex, labels): wiz.visit(tree, wiz.getTokenType("C"), visitor) expecting = ['C'] - self.failUnlessEqual(expecting, elements) + self.assertEqual(expecting, elements) def testRepeatsVisit(self): @@ -406,7 +406,7 @@ def visitor(node, parent, childIndex, labels): wiz.visit(tree, wiz.getTokenType("B"), visitor) expecting = ['B', 'B', 'B'] - self.failUnlessEqual(expecting, elements) + self.assertEqual(expecting, elements) def testRepeatsVisit2(self): @@ -420,7 +420,7 @@ def visitor(node, parent, childIndex, labels): wiz.visit(tree, wiz.getTokenType("A"), visitor) expecting = ['A', 'A'] - self.failUnlessEqual(expecting, elements) + self.assertEqual(expecting, elements) def testRepeatsVisitWithContext(self): @@ -434,7 +434,7 @@ def visitor(node, parent, childIndex, labels): wiz.visit(tree, wiz.getTokenType("B"), visitor) expecting = ['B@A[0]', 'B@A[1]', 'B@A[2]'] - self.failUnlessEqual(expecting, elements) + self.assertEqual(expecting, elements) def testRepeatsVisitWithNullParentAndContext(self): @@ -451,7 +451,7 @@ def visitor(node, parent, childIndex, labels): wiz.visit(tree, wiz.getTokenType("A"), visitor) expecting = ['A@nil[0]', 'A@A[1]'] - self.failUnlessEqual(expecting, elements) + self.assertEqual(expecting, elements) def testVisitPattern(self): @@ -467,7 +467,7 @@ def visitor(node, parent, childIndex, labels): wiz.visit(tree, '(A B)', visitor) expecting = ['A'] # shouldn't match overall root, just (A B) - self.failUnlessEqual(expecting, elements) + self.assertEqual(expecting, elements) def testVisitPatternMultiple(self): @@ -484,7 +484,7 @@ def visitor(node, parent, childIndex, labels): wiz.visit(tree, '(A B)', visitor) expecting = ['A@A[2]', 'A@D[0]'] - self.failUnlessEqual(expecting, elements) + self.assertEqual(expecting, elements) def testVisitPatternMultipleWithLabels(self): @@ -506,56 +506,56 @@ def visitor(node, parent, childIndex, labels): wiz.visit(tree, '(%a:A %b:B)', visitor) expecting = ['foo@A[2]foo&bar', 'big@D[0]big&dog'] - self.failUnlessEqual(expecting, elements) + self.assertEqual(expecting, elements) def testParse(self): wiz = TreeWizard(self.adaptor, self.tokens) t = wiz.create("(A B C)") valid = wiz.parse(t, "(A B C)") - self.failUnless(valid) + self.assertTrue(valid) def testParseSingleNode(self): wiz = TreeWizard(self.adaptor, self.tokens) t = wiz.create("A") valid = wiz.parse(t, "A") - self.failUnless(valid) + self.assertTrue(valid) def testParseSingleNodeFails(self): wiz = TreeWizard(self.adaptor, self.tokens) t = wiz.create("A") valid = wiz.parse(t, "B") - self.failUnless(not valid) + self.assertTrue(not valid) def testParseFlatTree(self): wiz = TreeWizard(self.adaptor, self.tokens) t = wiz.create("(nil A B C)") valid = wiz.parse(t, "(nil A B C)") - self.failUnless(valid) + self.assertTrue(valid) def testParseFlatTreeFails(self): wiz = TreeWizard(self.adaptor, self.tokens) t = wiz.create("(nil A B C)") valid = wiz.parse(t, "(nil A B)") - self.failUnless(not valid) + self.assertTrue(not valid) def testParseFlatTreeFails2(self): wiz = TreeWizard(self.adaptor, self.tokens) t = wiz.create("(nil A B C)") valid = wiz.parse(t, "(nil A B A)") - self.failUnless(not valid) + self.assertTrue(not valid) def testWildcard(self): wiz = TreeWizard(self.adaptor, self.tokens) t = wiz.create("(A B C)") valid = wiz.parse(t, "(A . .)") - self.failUnless(valid) + self.assertTrue(valid) def testParseWithText(self): @@ -564,7 +564,7 @@ def testParseWithText(self): # C pattern has no text arg so despite [bar] in t, no need # to match text--check structure only. valid = wiz.parse(t, "(A B[foo] C)") - self.failUnless(valid) + self.assertTrue(valid) def testParseWithText2(self): @@ -580,7 +580,7 @@ def testParseWithTextFails(self): wiz = TreeWizard(self.adaptor, self.tokens) t = wiz.create("(A B C)") valid = wiz.parse(t, "(A[foo] B C)") - self.failUnless(not valid) # fails + self.assertTrue(not valid) # fails def testParseLabels(self): @@ -588,10 +588,10 @@ def testParseLabels(self): t = wiz.create("(A B C)") labels = {} valid = wiz.parse(t, "(%a:A %b:B %c:C)", labels) - self.failUnless(valid) - self.failUnlessEqual("A", str(labels["a"])) - self.failUnlessEqual("B", str(labels["b"])) - self.failUnlessEqual("C", str(labels["c"])) + self.assertTrue(valid) + self.assertEqual("A", str(labels["a"])) + self.assertEqual("B", str(labels["b"])) + self.assertEqual("C", str(labels["c"])) def testParseWithWildcardLabels(self): @@ -599,9 +599,9 @@ def testParseWithWildcardLabels(self): t = wiz.create("(A B C)") labels = {} valid = wiz.parse(t, "(A %b:. %c:.)", labels) - self.failUnless(valid) - self.failUnlessEqual("B", str(labels["b"])) - self.failUnlessEqual("C", str(labels["c"])) + self.assertTrue(valid) + self.assertEqual("B", str(labels["b"])) + self.assertEqual("C", str(labels["c"])) def testParseLabelsAndTestText(self): @@ -609,10 +609,10 @@ def testParseLabelsAndTestText(self): t = wiz.create("(A B[foo] C)") labels = {} valid = wiz.parse(t, "(%a:A %b:B[foo] %c:C)", labels) - self.failUnless(valid) - self.failUnlessEqual("A", str(labels["a"])) - self.failUnlessEqual("foo", str(labels["b"])) - self.failUnlessEqual("C", str(labels["c"])) + self.assertTrue(valid) + self.assertEqual("A", str(labels["a"])) + self.assertEqual("foo", str(labels["b"])) + self.assertEqual("C", str(labels["c"])) def testParseLabelsInNestedTree(self): @@ -620,12 +620,12 @@ def testParseLabelsInNestedTree(self): t = wiz.create("(A (B C) (D E))") labels = {} valid = wiz.parse(t, "(%a:A (%b:B %c:C) (%d:D %e:E) )", labels) - self.failUnless(valid) - self.failUnlessEqual("A", str(labels["a"])) - self.failUnlessEqual("B", str(labels["b"])) - self.failUnlessEqual("C", str(labels["c"])) - self.failUnlessEqual("D", str(labels["d"])) - self.failUnlessEqual("E", str(labels["e"])) + self.assertTrue(valid) + self.assertEqual("A", str(labels["a"])) + self.assertEqual("B", str(labels["b"])) + self.assertEqual("C", str(labels["c"])) + self.assertEqual("D", str(labels["d"])) + self.assertEqual("E", str(labels["e"])) def testEquals(self): @@ -633,7 +633,7 @@ def testEquals(self): t1 = wiz.create("(A B C)") t2 = wiz.create("(A B C)") same = wiz.equals(t1, t2) - self.failUnless(same) + self.assertTrue(same) def testEqualsWithText(self): @@ -641,7 +641,7 @@ def testEqualsWithText(self): t1 = wiz.create("(A B[foo] C)") t2 = wiz.create("(A B[foo] C)") same = wiz.equals(t1, t2) - self.failUnless(same) + self.assertTrue(same) def testEqualsWithMismatchedText(self): @@ -649,7 +649,7 @@ def testEqualsWithMismatchedText(self): t1 = wiz.create("(A B[foo] C)") t2 = wiz.create("(A B C)") same = wiz.equals(t1, t2) - self.failUnless(not same) + self.assertTrue(not same) def testEqualsWithMismatchedList(self): @@ -657,7 +657,7 @@ def testEqualsWithMismatchedList(self): t1 = wiz.create("(A B C)") t2 = wiz.create("(A B A)") same = wiz.equals(t1, t2) - self.failUnless(not same) + self.assertTrue(not same) def testEqualsWithMismatchedListLength(self): @@ -665,7 +665,7 @@ def testEqualsWithMismatchedListLength(self): t1 = wiz.create("(A B C)") t2 = wiz.create("(A B)") same = wiz.equals(t1, t2) - self.failUnless(not same) + self.assertTrue(not same) def testFindPattern(self): @@ -674,7 +674,7 @@ def testFindPattern(self): subtrees = wiz.find(t, "(A B)") found = [str(node) for node in subtrees] expecting = ['foo', 'big'] - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) def testFindTokenType(self): @@ -683,7 +683,7 @@ def testFindTokenType(self): subtrees = wiz.find(t, wiz.getTokenType('A')) found = [str(node) for node in subtrees] expecting = ['A', 'foo', 'big'] - self.failUnlessEqual(expecting, found) + self.assertEqual(expecting, found) diff --git a/tool/src/main/resources/org/antlr/codegen/templates/Python/Python.stg b/tool/src/main/resources/org/antlr/codegen/templates/Python/Python.stg index cffdf8677..21049ee7e 100644 --- a/tool/src/main/resources/org/antlr/codegen/templates/Python/Python.stg +++ b/tool/src/main/resources/org/antlr/codegen/templates/Python/Python.stg @@ -291,7 +291,7 @@ class (<@superClassName><@end>): - _in_ = frozenset([};separator=", ">])<\n>}> + _in_ = frozenset([};separator=", ">])<\n>}> >> @@ -766,7 +766,7 @@ element(e) ::= << /** match a token optionally with a label in front */ tokenRef(token,label,elementIndex,terminalOptions={}) ::= << -