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

use lines_to_execute also in refactoring.py

Browse Source
This commit is contained in:
David Halter
2013-01-06 17:42:07 +01:00
parent 37bbf1af1a
commit 00f78bc50d
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/refactor.py
View File

@@ -5,7 +5,7 @@ import traceback
import re import re
import base import base
from _compatibility import unicode, reduce from _compatibility import reduce
import api import api
import refactoring import refactoring
@@ -27,15 +27,14 @@ def run_test(source, f_name, lines_to_execute):
""" """
fails = 0 fails = 0
tests = 0 tests = 0
s = unicode(source)
# parse the refactor format # parse the refactor format
r = r'^# --- ?([^\n]*)\n((?:(?!\n# \+\+\+).)*)' \ r = r'^# --- ?([^\n]*)\n((?:(?!\n# \+\+\+).)*)' \
r'\n# \+\+\+((?:(?!\n# ---).)*)' r'\n# \+\+\+((?:(?!\n# ---).)*)'
for match in re.finditer(r, s, re.DOTALL | re.MULTILINE): for match in re.finditer(r, source, re.DOTALL | re.MULTILINE):
name = match.group(1).strip() name = match.group(1).strip()
first = match.group(2).strip() first = match.group(2).strip()
second = match.group(3).strip() second = match.group(3).strip()
start_line_test = s[:match.start()].count('\n') + 1 start_line_test = source[:match.start()].count('\n') + 1
# get the line with the position of the operation # get the line with the position of the operation
p = re.match(r'((?:(?!#\?).)*)#\? (\d*) ?([^\n]*)', first, re.DOTALL) p = re.match(r'((?:(?!#\?).)*)#\? (\d*) ?([^\n]*)', first, re.DOTALL)
@@ -47,10 +46,12 @@ def run_test(source, f_name, lines_to_execute):
new_name = p.group(3) new_name = p.group(3)
line_nr = start_line_test + until.count('\n') + 2 line_nr = start_line_test + until.count('\n') + 2
if lines_to_execute and line_nr - 1 not in lines_to_execute:
continue
path = refactoring_test_dir + os.path.sep + f_name path = refactoring_test_dir + os.path.sep + f_name
try: try:
script = api.Script(source, line_nr, index, path) script = api.Script(source, line_nr + 1, index, path)
refactor_func = getattr(refactoring, f_name.replace('.py', '')) refactor_func = getattr(refactoring, f_name.replace('.py', ''))
args = (script, new_name) if new_name else (script,) args = (script, new_name) if new_name else (script,)
refactor_object = refactor_func(*args) refactor_object = refactor_func(*args)