Merge pull request #11 from hackebrot/convert-qenum-key-tests

Convert qenum key tests

qutebrowser/test/utils/debug/test_qenum_key.py

@@ -0,0 +1,65 @@
+# Copyright 2014-2015 Florian Bruhin (The Compiler) <mail@qutebrowser.org>
+# vim: ft=python fileencoding=utf-8 sts=4 sw=4 et:
+
+#
+# This file is part of qutebrowser.
+#
+# qutebrowser is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# qutebrowser is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with qutebrowser.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Tests for qutebrowser.utils.debug.qenum_key."""
+
+import pytest
+
+from PyQt5.QtCore import Qt
+from PyQt5.QtWidgets import QStyle, QFrame
+
+from qutebrowser.utils import debug
+
+
+def test_no_metaobj():
+    """Test with an enum with no meta-object."""
+    assert not hasattr(QStyle.PrimitiveElement, 'staticMetaObject')
+    key = debug.qenum_key(QStyle, QStyle.PE_PanelButtonCommand)
+    assert key == 'PE_PanelButtonCommand'
+
+
+def test_metaobj():
+    """Test with an enum with meta-object."""
+    assert hasattr(QFrame, 'staticMetaObject')
+    key = debug.qenum_key(QFrame, QFrame.Sunken)
+    assert key == 'Sunken'
+
+
+def test_add_base():
+    """Test with add_base=True."""
+    key = debug.qenum_key(QFrame, QFrame.Sunken, add_base=True)
+    assert key == 'QFrame.Sunken'
+
+
+def test_int_noklass():
+    """Test passing an int without explicit klass given."""
+    with pytest.raises(TypeError):
+        debug.qenum_key(QFrame, 42)
+
+
+def test_int():
+    """Test passing an int with explicit klass given."""
+    key = debug.qenum_key(QFrame, 0x0030, klass=QFrame.Shadow)
+    assert key == 'Sunken'
+
+
+def test_unknown():
+    """Test passing an unknown value."""
+    key = debug.qenum_key(QFrame, 0x1337, klass=QFrame.Shadow)
+    assert key == '0x1337'

qutebrowser/test/utils/test_debug.py

@@ -25,58 +25,11 @@ import unittest
 import logging
 
 from PyQt5.QtCore import Qt
-from PyQt5.QtWidgets import QStyle, QFrame
 
 from qutebrowser.utils import debug
 from qutebrowser.test import stubs
 
 
-class QEnumKeyTests(unittest.TestCase):
-
-    """Tests for qenum_key."""
-
-    def test_no_metaobj(self):
-        """Test with an enum with no meta-object."""
-        with self.assertRaises(AttributeError):
-            # Make sure it doesn't have a meta object
-            # pylint: disable=pointless-statement,no-member
-            QStyle.PrimitiveElement.staticMetaObject
-        key = debug.qenum_key(QStyle, QStyle.PE_PanelButtonCommand)
-        self.assertEqual(key, 'PE_PanelButtonCommand')
-
-    def test_metaobj(self):
-        """Test with an enum with meta-object."""
-        # pylint: disable=pointless-statement
-        QFrame.staticMetaObject  # make sure it has a meta-object
-        key = debug.qenum_key(QFrame, QFrame.Sunken)
-        self.assertEqual(key, 'Sunken')
-
-    def test_add_base(self):
-        """Test with add_base=True."""
-        key = debug.qenum_key(QFrame, QFrame.Sunken, add_base=True)
-        self.assertEqual(key, 'QFrame.Sunken')
-
-    def test_int_noklass(self):
-        """Test passing an int without explicit klass given."""
-        with self.assertRaises(TypeError):
-            debug.qenum_key(QFrame, 42)
-
-    def test_int(self):
-        """Test passing an int with explicit klass given."""
-        key = debug.qenum_key(QFrame, 0x0030, klass=QFrame.Shadow)
-        self.assertEqual(key, 'Sunken')
-
-    def test_unknown(self):
-        """Test passing an unknown value."""
-        key = debug.qenum_key(QFrame, 0x1337, klass=QFrame.Shadow)
-        self.assertEqual(key, '0x1337')
-
-    def test_reconverted(self):
-        """Test passing a flag value which was re-converted to an enum."""
-        # FIXME maybe this should return the right thing anyways?
-        debug.qenum_key(Qt, Qt.Alignment(int(Qt.AlignLeft)))
-
-
 class QFlagsKeyTests(unittest.TestCase):
 
     """Tests for qflags_key()."""