diff options
Diffstat (limited to 'sources/pyside6/tests/QtCore/qflags_test.py')
| -rw-r--r-- | sources/pyside6/tests/QtCore/qflags_test.py | 65 |
1 files changed, 41 insertions, 24 deletions
diff --git a/sources/pyside6/tests/QtCore/qflags_test.py b/sources/pyside6/tests/QtCore/qflags_test.py index e38166fb9..2a5306685 100644 --- a/sources/pyside6/tests/QtCore/qflags_test.py +++ b/sources/pyside6/tests/QtCore/qflags_test.py @@ -41,22 +41,19 @@ class QFlagOperatorTest(unittest.TestCase): def testInvert(self): '''QFlags ~ (invert) operator''' - self.assertEqual(type(~QIODevice.ReadOnly), QIODevice.OpenModeFlag - if sys.pyside63_option_python_enum else QIODevice.OpenMode) + self.assertEqual(type(~QIODevice.ReadOnly), QIODevice.OpenMode) def testOr(self): '''QFlags | (or) operator''' - self.assertEqual(type(QIODevice.ReadOnly | QIODevice.WriteOnly), QIODevice.OpenModeFlag - if sys.pyside63_option_python_enum else QIODevice.OpenMode) + self.assertEqual(type(QIODevice.ReadOnly | QIODevice.WriteOnly), QIODevice.OpenMode) def testAnd(self): '''QFlags & (and) operator''' - self.assertEqual(type(QIODevice.ReadOnly & QIODevice.WriteOnly), QIODevice.OpenModeFlag - if sys.pyside63_option_python_enum else QIODevice.OpenMode) + self.assertEqual(type(QIODevice.ReadOnly & QIODevice.WriteOnly), QIODevice.OpenMode) def testIOr(self): '''QFlags |= (ior) operator''' - flag = Qt.WindowType(1) if sys.pyside63_option_python_enum else Qt.WindowFlags() + flag = Qt.WindowFlags() self.assertTrue(Qt.Widget == 0) self.assertFalse(flag & Qt.Widget) result = flag & Qt.Widget @@ -66,8 +63,7 @@ class QFlagOperatorTest(unittest.TestCase): def testInvertOr(self): '''QFlags ~ (invert) operator over the result of an | (or) operator''' - self.assertEqual(type(~(Qt.ItemIsSelectable | Qt.ItemIsEditable)), Qt.ItemFlag - if sys.pyside63_option_python_enum else Qt.ItemFlags) + self.assertEqual(type(~(Qt.ItemIsSelectable | Qt.ItemIsEditable)), Qt.ItemFlags) def testEqual(self): '''QFlags == operator''' @@ -76,8 +72,7 @@ class QFlagOperatorTest(unittest.TestCase): flag_type = (flags & Qt.WindowType_Mask) self.assertEqual(flag_type, Qt.Window) - self.assertEqual((Qt.KeyboardModifier if sys.pyside63_option_python_enum else - Qt.KeyboardModifiers)(Qt.ControlModifier), Qt.ControlModifier) + self.assertEqual(Qt.KeyboardModifiers(Qt.ControlModifier), Qt.ControlModifier) def testOperatorBetweenFlags(self): '''QFlags & QFlags''' @@ -90,24 +85,46 @@ class QFlagOperatorTest(unittest.TestCase): flags = Qt.NoItemFlags | Qt.ItemIsUserCheckable self.assertEqual(flags | Qt.ItemIsEnabled, Qt.ItemIsEnabled | flags) + def testEqualNonNumericalObject(self): + '''QFlags ==,!= non-numerical object ''' + flags = Qt.NoItemFlags | Qt.ItemIsUserCheckable + + self.assertTrue(flags != None) # noqa: E711 + self.assertFalse(flags == None) # noqa: E711 + + self.assertTrue(flags != "tomato") + self.assertFalse(flags == "tomato") + + with self.assertRaises(TypeError): + flags > None + with self.assertRaises(TypeError): + flags >= None + with self.assertRaises(TypeError): + flags < None + with self.assertRaises(TypeError): + flags <= None + class QFlagsOnQVariant(unittest.TestCase): def testQFlagsOnQVariant(self): o = QObject() o.setProperty("foo", QIODevice.ReadOnly | QIODevice.WriteOnly) - self.assertEqual(type(o.property("foo")), QIODevice.OpenModeFlag - if sys.pyside63_option_python_enum else QIODevice.OpenMode) - - -class QFlagsWrongType(unittest.TestCase): - def testWrongType(self): - '''Wrong type passed to QFlags binary operators''' - for op in operator.or_, operator.and_, operator.xor: - for x in '43', 'jabba', QObject, object: - self.assertRaises(TypeError, op, Qt.NoItemFlags, x) - self.assertRaises(TypeError, op, x, Qt.NoItemFlags) - # making sure this actually does not fail all the time - self.assertEqual(operator.or_(Qt.NoItemFlags, 43), 43) + self.assertEqual(type(o.property("foo")), QIODevice.OpenMode) + + +class QEnumFlagDefault(unittest.TestCase): + """ + Check that old flag and enum syntax can be used. + The signatures of these surrogate functions intentionally do not exist + because people should learn to use the new Enums correctly. + """ + def testOldQFlag(self): + self.assertEqual(Qt.AlignmentFlag(), Qt.AlignmentFlag(0)) + oldFlag = Qt.Alignment() + oldEnum = Qt.AlignmentFlag() + self.assertEqual(type(oldFlag), Qt.Alignment) + self.assertEqual(type(oldEnum), Qt.AlignmentFlag) + self.assertEqual(type(oldFlag), type(oldEnum)) if __name__ == '__main__': |