VimPlug/jedi
1
0
Fork 1
mirror of https://github.com/davidhalter/jedi.git synced 2025-12-06 14:04:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Windows uses backslashes for paths

Browse Source
This commit is contained in:
Dave Halter
2020-02-28 12:42:39 +01:00
parent 58ba47841c
commit d1873f8e1e
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/refactor.py
View File

@@ -7,8 +7,11 @@ valuable - just ignore them.**
""" """
from __future__ import with_statement from __future__ import with_statement
import os import os
import platform
import re import re
from parso import split_lines
from functools import reduce from functools import reduce
import jedi import jedi
from .helpers import test_dir from .helpers import test_dir
@@ -24,7 +27,18 @@ class RefactoringCase(object):
self._path = path self._path = path
self._kwargs = kwargs self._kwargs = kwargs
self.type = type_ self.type = type_
self.desired_result = desired_result self._desired_result = desired_result
def get_desired_result(self):
if platform.system().lower() == 'windows' and self.type == 'diff':
# Windows uses backslashes to separate paths.
lines = split_lines(self._desired_result, keepends=True)
for i, line in enumerate(lines):
if re.search(' import_tree/', line):
lines[i] = line.replace('/', '\\')
return ''.join(lines)
return self._desired_result
@property @property
def refactor_type(self): def refactor_type(self):
@@ -58,7 +72,7 @@ def _collect_file_tests(code, path, lines_to_execute):
continue continue
until = p.group(1) until = p.group(1)
index = int(p.group(2)) index = int(p.group(2))
type_ = p.group(3).strip() type_ = p.group(3).strip() or 'diff'
if p.group(4): if p.group(4):
kwargs = eval(p.group(4)) kwargs = eval(p.group(4))
else: else:

7
test/test_integration.py
View File

@@ -66,15 +66,16 @@ def test_refactor(refactor_case, skip_pre_python36, environment):
if sys.version_info < (3, 6): if sys.version_info < (3, 6):
pytest.skip() pytest.skip()
desired_result = refactor_case.get_desired_result()
if refactor_case.type == 'error': if refactor_case.type == 'error':
with pytest.raises(RefactoringError) as e: with pytest.raises(RefactoringError) as e:
refactor_case.refactor(environment) refactor_case.refactor(environment)
assert e.value.args[0] == refactor_case.desired_result.strip() assert e.value.args[0] == desired_result.strip()
elif refactor_case.type == 'text': elif refactor_case.type == 'text':
refactoring = refactor_case.refactor(environment) refactoring = refactor_case.refactor(environment)
assert not refactoring.get_renames() assert not refactoring.get_renames()
text = ''.join(f.get_new_code() for f in refactoring.get_changed_files().values()) text = ''.join(f.get_new_code() for f in refactoring.get_changed_files().values())
assert_case_equal(refactor_case, text, refactor_case.desired_result) assert_case_equal(refactor_case, text, desired_result)
else: else:
diff = refactor_case.refactor(environment).get_diff() diff = refactor_case.refactor(environment).get_diff()
assert_case_equal(refactor_case, diff, refactor_case.desired_result) assert_case_equal(refactor_case, diff, desired_result)