[feaLib.lexer_test] fix up tests after changes to make_lexer_

This commit is contained in:
Cosimo Lupo 2016-03-21 18:54:06 +00:00
parent 0f8f71d5ec
commit 3affc725aa

View File

@ -131,7 +131,7 @@ class IncludingLexerTest(unittest.TestCase):
return os.path.join(path, "testdata", filename) return os.path.join(path, "testdata", filename)
def test_include(self): def test_include(self):
lexer = IncludingLexer((self.getpath("include4.fea"), None)) lexer = IncludingLexer(self.getpath("include4.fea"))
result = ['%s %s:%d' % (token, os.path.split(loc[0])[1], loc[1]) result = ['%s %s:%d' % (token, os.path.split(loc[0])[1], loc[1])
for _, token, loc in lexer] for _, token, loc in lexer]
self.assertEqual(result, [ self.assertEqual(result, [
@ -150,15 +150,15 @@ class IncludingLexerTest(unittest.TestCase):
]) ])
def test_include_limit(self): def test_include_limit(self):
lexer = IncludingLexer((self.getpath("include6.fea"), None)) lexer = IncludingLexer(self.getpath("include6.fea"))
self.assertRaises(FeatureLibError, lambda: list(lexer)) self.assertRaises(FeatureLibError, lambda: list(lexer))
def test_include_self(self): def test_include_self(self):
lexer = IncludingLexer((self.getpath("includeself.fea"), None)) lexer = IncludingLexer(self.getpath("includeself.fea"))
self.assertRaises(FeatureLibError, lambda: list(lexer)) self.assertRaises(FeatureLibError, lambda: list(lexer))
def test_include_missing_file(self): def test_include_missing_file(self):
lexer = IncludingLexer((self.getpath("includemissingfile.fea"), None)) lexer = IncludingLexer(self.getpath("includemissingfile.fea"))
self.assertRaises(FeatureLibError, lambda: list(lexer)) self.assertRaises(FeatureLibError, lambda: list(lexer))