This commit is contained in:
Florian Bruhin 2014-07-04 07:41:03 +02:00
parent 37ed9deecf
commit 117755863d
3 changed files with 7 additions and 8 deletions

View File

@ -21,7 +21,7 @@
import os
from contextlib import contextmanager
from unittest.mock import Mock, create_autospec
from unittest.mock import create_autospec
from PyQt5.QtGui import QKeyEvent

View File

@ -22,7 +22,7 @@
"""Tests for BaseKeyParser."""
import unittest
from unittest.mock import Mock, create_autospec, patch
from unittest.mock import Mock, patch
import qutebrowser.keyinput.basekeyparser as basekeyparser
from qutebrowser.test.stubs import ConfigStub
@ -143,7 +143,7 @@ class SpecialKeysTests(unittest.TestCase):
def test_invalid_key(self):
"""Test an invalid special keyevent."""
self.kp.handle(fake_keyevent(Qt.Key_A, (Qt.ControlModifier |
Qt.AltModifier)))
Qt.AltModifier)))
self.assertFalse(self.kp.execute.called)
def test_keychain(self):
@ -182,7 +182,7 @@ class KeyChainTests(unittest.TestCase):
def test_invalid_special_key(self):
"""Test invalid special key."""
self.kp.handle(fake_keyevent(Qt.Key_A, (Qt.ControlModifier |
Qt.AltModifier)))
Qt.AltModifier)))
self.assertFalse(self.kp.execute.called)
self.assertEqual(self.kp._keystring, '')

View File

@ -534,10 +534,9 @@ class KeyEventToStringTests(unittest.TestCase):
def test_key_and_modifiers(self):
"""Test with key and multiple modifier pressed."""
evt = fake_keyevent(key=Qt.Key_A, modifiers=Qt.ControlModifier |
Qt.AltModifier |
Qt.MetaModifier |
Qt.ShiftModifier)
evt = fake_keyevent(key=Qt.Key_A,
modifiers=(Qt.ControlModifier | Qt.AltModifier |
Qt.MetaModifier | Qt.ShiftModifier))
self.assertEqual(utils.keyevent_to_string(evt),
'Ctrl+Alt+Meta+Shift+A')