From 3c57f781dd03ebea483e83f35eefc813c1763050 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Mon, 15 May 2017 15:18:42 -0400 Subject: [PATCH] Move another few tests. --- test/test_parser/test_diff_parser.py | 33 --------------------- test/test_parser/test_tokenize.py | 6 ---- test/test_parso_integration/test_basic.py | 35 +++++++++++++++++++++++ 3 files changed, 35 insertions(+), 39 deletions(-) diff --git a/test/test_parser/test_diff_parser.py b/test/test_parser/test_diff_parser.py index 8231a9ee..a8127fc0 100644 --- a/test/test_parser/test_diff_parser.py +++ b/test/test_parser/test_diff_parser.py @@ -2,7 +2,6 @@ from textwrap import dedent import pytest -import jedi from jedi import debug from jedi.common import splitlines from jedi import cache @@ -386,38 +385,6 @@ def test_node_insertion(differ): differ.parse(code2, parsers=1, copies=2) -def test_add_to_end(): - """ - fast_parser doesn't parse everything again. It just updates with the - help of caches, this is an example that didn't work. - """ - - a = dedent("""\ - class Abc(): - def abc(self): - self.x = 3 - - class Two(Abc): - def g(self): - self - """) # ^ here is the first completion - - b = " def h(self):\n" \ - " self." - - def complete(code, line=None, column=None): - script = jedi.Script(code, line, column, 'example.py') - assert script.completions() - _assert_valid_graph(script._get_module()) - - complete(a, 7, 12) - complete(a + b) - - a = a[:-1] + '.\n' - complete(a, 7, 13) - complete(a + b) - - def test_whitespace_at_end(differ): code = dedent('str\n\n') diff --git a/test/test_parser/test_tokenize.py b/test/test_parser/test_tokenize.py index 4cddf9c1..a2563a06 100644 --- a/test/test_parser/test_tokenize.py +++ b/test/test_parser/test_tokenize.py @@ -147,12 +147,6 @@ class TokenTest(unittest.TestCase): assert safe_literal_eval(string_tok.value) == 'test' -def test_tokenizer_with_string_literal_backslash(): - import jedi - c = jedi.Script("statement = u'foo\\\n'; statement").goto_definitions() - assert c[0]._name._context.obj == 'foo' - - def test_ur_literals(): """ Decided to parse `u''` literals regardless of Python version. This makes diff --git a/test/test_parso_integration/test_basic.py b/test/test_parso_integration/test_basic.py index e3c3da15..8840ca1f 100644 --- a/test/test_parso_integration/test_basic.py +++ b/test/test_parso_integration/test_basic.py @@ -50,3 +50,38 @@ def test_class_and_if(): assert [d.name for d in jedi.Script(src).goto_definitions()] == ['int'] +def test_add_to_end(): + """ + The diff parser doesn't parse everything again. It just updates with the + help of caches, this is an example that didn't work. + """ + + a = dedent("""\ + class Abc(): + def abc(self): + self.x = 3 + + class Two(Abc): + def g(self): + self + """) # ^ here is the first completion + + b = " def h(self):\n" \ + " self." + + def complete(code, line=None, column=None): + script = jedi.Script(code, line, column, 'example.py') + assert script.completions() + + complete(a, 7, 12) + complete(a + b) + + a = a[:-1] + '.\n' + complete(a, 7, 13) + complete(a + b) + + +def test_tokenizer_with_string_literal_backslash(): + import jedi + c = jedi.Script("statement = u'foo\\\n'; statement").goto_definitions() + assert c[0]._name._context.obj == 'foo'