Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the Python codegen target & tests #196

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update the Python codegen target & tests #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion runtime/Python/hudson-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 2 additions & 5 deletions runtime/Python/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?",
)

Expand All @@ -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)

Expand Down
10 changes: 5 additions & 5 deletions runtime/Python/tests/t001lexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand All @@ -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__':
Expand Down
8 changes: 4 additions & 4 deletions runtime/Python/tests/t002lexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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__':
Expand Down
10 changes: 5 additions & 5 deletions runtime/Python/tests/t003lexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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__':
Expand Down
4 changes: 2 additions & 2 deletions runtime/Python/tests/t004lexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__':
Expand Down
12 changes: 6 additions & 6 deletions runtime/Python/tests/t022scopes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ def testc1(self):
parser = self.getParser(tStream)
symbols = parser.c()

self.failUnlessEqual(
self.assertEqual(
symbols,
set(['i', 'j'])
)
Expand All @@ -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):
Expand All @@ -114,7 +114,7 @@ def testd1(self):
parser = self.getParser(tStream)
symbols = parser.d()

self.failUnlessEqual(
self.assertEqual(
symbols,
set(['i', 'j'])
)
Expand All @@ -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):
Expand All @@ -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):
Expand All @@ -159,7 +159,7 @@ def testf2(self):
parser = self.getParser(tStream)
res = parser.f()

self.failUnlessEqual(res, None)
self.assertEqual(res, None)



Expand Down
1 change: 0 additions & 1 deletion runtime/Python/tests/t033backtracking.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;')

Expand Down
Loading