From 917f2a30de5e0f104e555a718a8d33b6898c9a73 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Fri, 29 Dec 2017 13:23:38 +0100
Subject: [PATCH] Get tests to collect

---
 qutebrowser/keyinput/keyutils.py     |  1 +
 tests/unit/keyinput/test_keyutils.py | 41 ++++++++--------------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/qutebrowser/keyinput/keyutils.py b/qutebrowser/keyinput/keyutils.py
index 43808f8a5..3a107142b 100644
--- a/qutebrowser/keyinput/keyutils.py
+++ b/qutebrowser/keyinput/keyutils.py
@@ -232,6 +232,7 @@ class KeySequence:
 
     def __init__(self, *args):
         self._sequence = QKeySequence(*args)
+        # FIXME handle more than 4 keys
 
     def __str__(self):
         return self._sequence.toString()
diff --git a/tests/unit/keyinput/test_keyutils.py b/tests/unit/keyinput/test_keyutils.py
index e901de0b5..4311a4aeb 100644
--- a/tests/unit/keyinput/test_keyutils.py
+++ b/tests/unit/keyinput/test_keyutils.py
@@ -99,21 +99,20 @@ class TestKeyEventToString:
 
 
 @pytest.mark.parametrize('keystr, expected', [
-    ('<Control-x>', keyutils.KeyInfo(Qt.Key_X, Qt.ControlModifier, '')),
-    ('<Meta-x>', keyutils.KeyInfo(Qt.Key_X, Qt.MetaModifier, '')),
+    ('<Control-x>', keyutils.KeySequence(Qt.ControlModifier | Qt.Key_X)),
+    ('<Meta-x>', keyutils.KeySequence(Qt.MetaModifier | Qt.Key_X)),
     ('<Ctrl-Alt-y>',
-     keyutils.KeyInfo(Qt.Key_Y, Qt.ControlModifier | Qt.AltModifier, '')),
-    ('x', keyutils.KeyInfo(Qt.Key_X, Qt.NoModifier, 'x')),
-    ('X', keyutils.KeyInfo(Qt.Key_X, Qt.ShiftModifier, 'X')),
-    ('<Escape>', keyutils.KeyInfo(Qt.Key_Escape, Qt.NoModifier, '')),
-
-    ('foobar', keyutils.KeyParseError),
-    ('x, y', keyutils.KeyParseError),
-    ('xyz', keyutils.KeyParseError),
-    ('Escape', keyutils.KeyParseError),
-    ('<Ctrl-x>, <Ctrl-y>', keyutils.KeyParseError),
+     keyutils.KeySequence(Qt.ControlModifier | Qt.AltModifier | Qt.Key_Y)),
+    ('x', keyutils.KeySequence(Qt.Key_X)),
+    ('X', keyutils.KeySequence(Qt.ShiftModifier | Qt.Key_X)),
+    ('<Escape>', keyutils.KeySequence(Qt.Key_Escape)),
+    ('xyz', keyutils.KeySequence(Qt.Key_X, Qt.Key_Y, Qt.Key_Z)),
+    ('<Control-x><Meta-y>', keyutils.KeySequence(Qt.ControlModifier | Qt.Key_X,
+                                                 Qt.MetaModifier | Qt.Key_Y)),
+    # FIXME
+    # ('<Ctrl-x>, <Ctrl-y>', keyutils.KeyParseError),
 ])
-def test_parse_single_key(keystr, expected):
+def test_parse(keystr, expected):
     if expected is keyutils.KeyParseError:
         with pytest.raises(keyutils.KeyParseError):
             keyutils._parse_single_key(keystr)
@@ -121,22 +120,6 @@ def test_parse_single_key(keystr, expected):
         assert keyutils._parse_single_key(keystr) == expected
 
 
-@pytest.mark.parametrize('keystr, expected', [
-    ('<Control-x>', [keyutils.KeyInfo(Qt.Key_X, Qt.ControlModifier, '')]),
-    ('x', [keyutils.KeyInfo(Qt.Key_X, Qt.NoModifier, 'x')]),
-    ('xy', [keyutils.KeyInfo(Qt.Key_X, Qt.NoModifier, 'x'),
-            keyutils.KeyInfo(Qt.Key_Y, Qt.NoModifier, 'y')]),
-
-    ('<Control-x><Meta-x>', keyutils.KeyParseError),
-])
-def test_parse_keystring(keystr, expected):
-    if expected is keyutils.KeyParseError:
-        with pytest.raises(keyutils.KeyParseError):
-            keyutils.parse_keystring(keystr)
-    else:
-        assert keyutils.parse_keystring(keystr) == expected
-
-
 @pytest.mark.parametrize('orig, repl', [
     ('Control+x', 'ctrl+x'),
     ('Windows+x', 'meta+x'),