rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dedupe code in test_readline.

Browse Source 
Many of the tests repeated the same block of logic, so consolidate it
into one function.
This commit is contained in:
Ryan Roden-Corrent 2016-07-30 22:00:12 -04:00
parent a086095954
commit 86a08d17c2
1 changed files with 32 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
tests/unit/misc/test_readline.py
View File

@ -96,6 +96,26 @@ class LineEdit(QLineEdit):
return ''.join(chars) return ''.join(chars)
def _validate_deletion(lineedit, bridge, method, text, deleted, rest):
"""Run and validate a text deletion method on the ReadLine bridge.
Args:
lineedit: The LineEdit instance.
bridge: The ReadlineBridge instance.
method: Reference to the method on the bridge to test.
text: The starting 'augmented' text (see LineEdit.set_aug_text)
deleted: The text that should be deleted when the method is invoked.
rest: The augmented text that should remain after method is invoked.
"""
lineedit.set_aug_text(text)
method()
assert bridge._deleted[lineedit] == deleted
assert lineedit.aug_text() == rest
lineedit.clear()
bridge.rl_yank()
assert lineedit.aug_text() == deleted + '|'
@pytest.fixture @pytest.fixture
def lineedit(qtbot, monkeypatch): def lineedit(qtbot, monkeypatch):
"""Fixture providing a LineEdit.""" """Fixture providing a LineEdit."""
@ -206,13 +226,8 @@ def test_rl_backward_delete_char(text, expected, lineedit, bridge):
]) ])
def test_rl_unix_line_discard(lineedit, bridge, text, deleted, rest): def test_rl_unix_line_discard(lineedit, bridge, text, deleted, rest):
"""Delete from the cursor to the beginning of the line and yank back.""" """Delete from the cursor to the beginning of the line and yank back."""
lineedit.set_aug_text(text) _validate_deletion(lineedit, bridge, bridge.rl_unix_line_discard, text,
bridge.rl_unix_line_discard() deleted, rest)
assert bridge._deleted[lineedit] == deleted
assert lineedit.aug_text() == rest
lineedit.clear()
bridge.rl_yank()
assert lineedit.aug_text() == deleted + '|'
@pytest.mark.parametrize('text, deleted, rest', [ @pytest.mark.parametrize('text, deleted, rest', [
@ -222,13 +237,8 @@ def test_rl_unix_line_discard(lineedit, bridge, text, deleted, rest):
]) ])
def test_rl_kill_line(lineedit, bridge, text, deleted, rest): def test_rl_kill_line(lineedit, bridge, text, deleted, rest):
"""Delete from the cursor to the end of line and yank back.""" """Delete from the cursor to the end of line and yank back."""
lineedit.set_aug_text(text) _validate_deletion(lineedit, bridge, bridge.rl_kill_line, text, deleted,
bridge.rl_kill_line() rest)
assert bridge._deleted[lineedit] == deleted
assert lineedit.aug_text() == rest
lineedit.clear()
bridge.rl_yank()
assert lineedit.aug_text() == deleted + '|'
@pytest.mark.parametrize('text, deleted, rest', [ @pytest.mark.parametrize('text, deleted, rest', [
@ -241,13 +251,8 @@ def test_rl_kill_line(lineedit, bridge, text, deleted, rest):
]) ])
def test_rl_unix_word_rubout(lineedit, bridge, text, deleted, rest): def test_rl_unix_word_rubout(lineedit, bridge, text, deleted, rest):
"""Delete to word beginning and see if it comes back with yank.""" """Delete to word beginning and see if it comes back with yank."""
lineedit.set_aug_text(text) _validate_deletion(lineedit, bridge, bridge.rl_unix_word_rubout, text,
bridge.rl_unix_word_rubout() deleted, rest)
assert bridge._deleted[lineedit] == deleted
assert lineedit.aug_text() == rest
lineedit.clear()
bridge.rl_yank()
assert lineedit.aug_text() == deleted + '|'
@pytest.mark.parametrize('text, deleted, rest', [ @pytest.mark.parametrize('text, deleted, rest', [
@ -259,13 +264,8 @@ def test_rl_unix_word_rubout(lineedit, bridge, text, deleted, rest):
]) ])
def test_rl_unix_filename_rubout(lineedit, bridge, text, deleted, rest): def test_rl_unix_filename_rubout(lineedit, bridge, text, deleted, rest):
"""Delete filename segment and see if it comes back with yank.""" """Delete filename segment and see if it comes back with yank."""
lineedit.set_aug_text(text) _validate_deletion(lineedit, bridge, bridge.rl_unix_filename_rubout, text,
bridge.rl_unix_filename_rubout() deleted, rest)
assert bridge._deleted[lineedit] == deleted
assert lineedit.aug_text() == rest
lineedit.clear()
bridge.rl_yank()
assert lineedit.aug_text() == deleted + '|'
@pytest.mark.parametrize('text, deleted, rest', [ @pytest.mark.parametrize('text, deleted, rest', [
@ -278,13 +278,8 @@ def test_rl_unix_filename_rubout(lineedit, bridge, text, deleted, rest):
]) ])
def test_rl_kill_word(lineedit, bridge, text, deleted, rest): def test_rl_kill_word(lineedit, bridge, text, deleted, rest):
"""Delete to word end and see if it comes back with yank.""" """Delete to word end and see if it comes back with yank."""
lineedit.set_aug_text(text) _validate_deletion(lineedit, bridge, bridge.rl_kill_word, text, deleted,
bridge.rl_kill_word() rest)
assert bridge._deleted[lineedit] == deleted
assert lineedit.aug_text() == rest
lineedit.clear()
bridge.rl_yank()
assert lineedit.aug_text() == deleted + '|'
@pytest.mark.parametrize('text, deleted, rest', [ @pytest.mark.parametrize('text, deleted, rest', [
@ -298,13 +293,8 @@ def test_rl_kill_word(lineedit, bridge, text, deleted, rest):
]) ])
def test_rl_backward_kill_word(lineedit, bridge, text, deleted, rest): def test_rl_backward_kill_word(lineedit, bridge, text, deleted, rest):
"""Delete to word beginning and see if it comes back with yank.""" """Delete to word beginning and see if it comes back with yank."""
lineedit.set_aug_text(text) _validate_deletion(lineedit, bridge, bridge.rl_backward_kill_word, text,
bridge.rl_backward_kill_word() deleted, rest)
assert bridge._deleted[lineedit] == deleted
assert lineedit.aug_text() == rest
lineedit.clear()
bridge.rl_yank()
assert lineedit.aug_text() == deleted + '|'
def test_rl_yank_no_text(lineedit, bridge): def test_rl_yank_no_text(lineedit, bridge):