VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

Replace the old tokenizer tests with the refactored attributes.

Browse Source
This commit is contained in:
Dave Halter
2014-12-07 14:19:21 +01:00
parent ea4f7053d6
commit fe1d7b7030
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test/test_parser/test_tokenize.py
View File

@@ -32,8 +32,8 @@ asdfasdf""" + "h"
tokens = parser.tokenize.generate_tokens(simple_docstring_io.readline) tokens = parser.tokenize.generate_tokens(simple_docstring_io.readline)
token_list = list(tokens) token_list = list(tokens)
string_token = token_list[0] string_token = token_list[0]
self.assertEqual(string_token._preceding_whitespace, '') self.assertEqual(string_token.prefix, '')
self.assertEqual(string_token.string, '"""simple one line docstring"""') self.assertEqual(string_token.value, '"""simple one line docstring"""')
def test_simple_with_whitespace(self): def test_simple_with_whitespace(self):
# Test a simple one line string with preceding whitespace and newline # Test a simple one line string with preceding whitespace and newline
@@ -42,11 +42,11 @@ asdfasdf""" + "h"
tokens = parser.tokenize.generate_tokens(simple_docstring_io.readline) tokens = parser.tokenize.generate_tokens(simple_docstring_io.readline)
token_list = list(tokens) token_list = list(tokens)
string_token = token_list[0] string_token = token_list[0]
self.assertEqual(string_token._preceding_whitespace, ' ') self.assertEqual(string_token.prefix, ' ')
self.assertEqual(string_token.string, '"""simple one line docstring"""') self.assertEqual(string_token.value, '"""simple one line docstring"""')
self.assertEqual(string_token.type, STRING) self.assertEqual(string_token.type, STRING)
newline_token = token_list[1] newline_token = token_list[1]
self.assertEqual(newline_token._preceding_whitespace, ' ') self.assertEqual(newline_token.prefix, ' ')
self.assertEqual(newline_token.type, NEWLINE) self.assertEqual(newline_token.type, NEWLINE)
def test_function_whitespace(self): def test_function_whitespace(self):
@@ -61,18 +61,18 @@ asdfasdf""" + "h"
token_list = list(tokens) token_list = list(tokens)
print(token_list) print(token_list)
for t in token_list: for t in token_list:
if t.string == 'test_whitespace': if t.value == 'test_whitespace':
self.assertEqual(t._preceding_whitespace, ' ') self.assertEqual(t.prefix, ' ')
if t.string == '(': if t.value == '(':
self.assertEqual(t._preceding_whitespace, '') self.assertEqual(t.prefix, '')
if t.string == '*': if t.value == '*':
self.assertEqual(t._preceding_whitespace, '') self.assertEqual(t.prefix, '')
if t.string == '**': if t.value == '**':
self.assertEqual(t._preceding_whitespace, ' ') self.assertEqual(t.prefix, ' ')
if t.string == 'print': if t.value == 'print':
self.assertEqual(t._preceding_whitespace, ' ') self.assertEqual(t.prefix, ' ')
if t.string == 'if': if t.value == 'if':
self.assertEqual(t._preceding_whitespace, ' ') self.assertEqual(t.prefix, ' ')
def test_tokenizer_with_string_literal_backslash(): def test_tokenizer_with_string_literal_backslash():