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

improved static analysis test base

Browse Source
This commit is contained in:
Dave Halter
2014-05-11 13:30:29 +02:00
parent 40a54961cd
commit c92113a7b1
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jedi/api/__init__.py
View File

@@ -585,7 +585,7 @@ class Script(object):
return [classes.CallSignature(self._evaluator, o, call, index, key_name) return [classes.CallSignature(self._evaluator, o, call, index, key_name)
for o in origins if o.is_callable()] for o in origins if o.is_callable()]
def analysis(self): def _analysis(self):
statements = set(chain(*self._parser.module().used_names.values())) statements = set(chain(*self._parser.module().used_names.values()))
for stmt in statements: for stmt in statements:
if stmt.start_pos[0] != 254: if stmt.start_pos[0] != 254:
@@ -595,10 +595,8 @@ class Script(object):
else: else:
self._evaluator.eval_statement(stmt) self._evaluator.eval_statement(stmt)
for error in sorted(self._evaluator.analysis, key=lambda x: x.line): analysis = self._evaluator.analysis
print(repr(error)) return sorted(analysis, key=lambda x: x.line)
raise AssertionError
return self._evaluator.analysis
class Interpreter(Script): class Interpreter(Script):

12
test/conftest.py
View File

@@ -68,10 +68,10 @@ def pytest_generate_tests(metafunc):
refactor.collect_dir_tests(base_dir, test_files)) refactor.collect_dir_tests(base_dir, test_files))
if 'static_analysis_case' in metafunc.fixturenames: if 'static_analysis_case' in metafunc.fixturenames:
base_dir = os.path.dirname(__file__) + 'static_analysis' base_dir = os.path.join(os.path.dirname(__file__), 'static_analysis')
metafunc.parametrize( metafunc.parametrize(
'static_analysis_case', 'static_analysis_case',
refactor.collect_dir_tests(base_dir, test_files)) collect_static_analysis_tests(base_dir, test_files))
def collect_static_analysis_tests(base_dir, test_files): def collect_static_analysis_tests(base_dir, test_files):
@@ -88,6 +88,7 @@ class StaticAnalysisCase(object):
The tests also start with `#!`, like the goto_definition tests. The tests also start with `#!`, like the goto_definition tests.
""" """
def __init__(self, path): def __init__(self, path):
self.skip = False
self._path = path self._path = path
with open(path) as f: with open(path) as f:
self._source = f.read() self._source = f.read()
@@ -101,9 +102,12 @@ class StaticAnalysisCase(object):
return cases return cases
def run(self, compare_cb): def run(self, compare_cb):
analysis = jedi.Script(self._source).analysis() analysis = jedi.Script(self._source)._analysis()
analysis = [(r.line, r.name) for r in analysis] analysis = [(r.line, r.name) for r in analysis]
assert compare_cb(self, self.collect_comparison(), analysis) assert compare_cb(self, analysis, self.collect_comparison())
def __repr__(self):
return "<%s: %s>" % (self.__class__.__name__, os.path.basename(self._path))
@pytest.fixture() @pytest.fixture()

6
test/test_integration.py
View File

@@ -20,7 +20,7 @@ desired = %s
""" % (case, actual, desired) """ % (case, actual, desired)
def test_integration(case, monkeypatch, pytestconfig): def test_integration(case, monkeypatch):
if case.skip is not None: if case.skip is not None:
pytest.skip(case.skip) pytest.skip(case.skip)
repo_root = helpers.root_dir repo_root = helpers.root_dir
@@ -28,9 +28,7 @@ def test_integration(case, monkeypatch, pytestconfig):
case.run(assert_case_equal) case.run(assert_case_equal)
def test_static_analysis(static_analysis_case, monkeypatch, pytestconfig): def test_static_analysis(static_analysis_case):
if static_analysis_case.skip is not None:
pytest.skip(static_analysis_case.skip)
static_analysis_case.run(assert_case_equal) static_analysis_case.run(assert_case_equal)