diff options
Diffstat (limited to 'sources/pyside6/tests/pysidetest/mixin_signal_slots_test.py')
| -rw-r--r-- | sources/pyside6/tests/pysidetest/mixin_signal_slots_test.py | 77 |
1 files changed, 29 insertions, 48 deletions
diff --git a/sources/pyside6/tests/pysidetest/mixin_signal_slots_test.py b/sources/pyside6/tests/pysidetest/mixin_signal_slots_test.py index b192a5180..1d536c0ae 100644 --- a/sources/pyside6/tests/pysidetest/mixin_signal_slots_test.py +++ b/sources/pyside6/tests/pysidetest/mixin_signal_slots_test.py @@ -1,32 +1,6 @@ #!/usr/bin/python - -############################################################################# -## -## Copyright (C) 2016 The Qt Company Ltd. -## Contact: https://www.qt.io/licensing/ -## -## This file is part of the test suite of Qt for Python. -## -## $QT_BEGIN_LICENSE:GPL-EXCEPT$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see https://www.qt.io/terms-conditions. For further -## information use the contact form at https://www.qt.io/contact-us. -## -## GNU General Public License Usage -## Alternatively, this file may be used under the terms of the GNU -## General Public License version 3 as published by the Free Software -## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -## included in the packaging of this file. Please review the following -## information to ensure the GNU General Public License requirements will -## be met: https://www.gnu.org/licenses/gpl-3.0.html. -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 ''' PYSIDE-315: https://bugreports.qt.io/browse/PYSIDE-315 Test that all signals and slots of a class (including any mixin classes) @@ -42,57 +16,63 @@ sys.path.append(os.fspath(Path(__file__).resolve().parents[1])) from init_paths import init_test_paths init_test_paths(False) -from PySide6 import QtCore +from PySide6.QtCore import QObject, Signal, Slot + class Mixin(object): - mixinSignal = QtCore.Signal() + mixinSignal = Signal() + def __init__(self, *args, **kwargs): - super(Mixin,self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) + class MixinTwo(Mixin): - mixinTwoSignal = QtCore.Signal() + mixinTwoSignal = Signal() def __init__(self, *args, **kwargs): - super(MixinTwo,self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.mixinTwoSlotCalled = False - @QtCore.Slot() + @Slot() def mixinTwoSlot(self): self.mixinTwoSlotCalled = True + class MixinThree(object): - mixinThreeSignal = QtCore.Signal() + mixinThreeSignal = Signal() def __init__(self, *args, **kwargs): - super(MixinThree,self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.mixinThreeSlotCalled = False - @QtCore.Slot() + @Slot() def mixinThreeSlot(self): self.mixinThreeSlotCalled = True -class Derived(Mixin, QtCore.QObject): - derivedSignal = QtCore.Signal(str) + +class Derived(Mixin, QObject): + derivedSignal = Signal(str) def __init__(self): - super(Derived,self).__init__() + super().__init__() self.derivedSlotCalled = False self.derivedSlotString = '' - @QtCore.Slot(str) + @Slot(str) def derivedSlot(self, theString): self.derivedSlotCalled = True self.derivedSlotString = theString -class MultipleDerived(MixinTwo, MixinThree, Mixin, QtCore.QObject): - derivedSignal = QtCore.Signal(str) + +class MultipleDerived(MixinTwo, MixinThree, Mixin, QObject): + derivedSignal = Signal(str) def __init__(self): - super(MultipleDerived,self).__init__() + super().__init__() self.derivedSlotCalled = False self.derivedSlotString = '' - @QtCore.Slot(str) + @Slot(str) def derivedSlot(self, theString): self.derivedSlotCalled = True self.derivedSlotString = theString @@ -120,7 +100,8 @@ class MixinTest(unittest.TestCase): # Check derivedSignal emission after mixingSignal connection self.outsideSlotCalled = False - @QtCore.Slot() + + @Slot() def outsideSlot(): self.outsideSlotCalled = True @@ -145,7 +126,6 @@ class MixinTest(unittest.TestCase): signature = m.method(i).methodSignature() self.assertEqual(methodIndices[signature], i) - def testMixinSignalSlotRegistrationWithMultipleInheritance(self): obj = MultipleDerived() m = obj.metaObject() @@ -169,7 +149,8 @@ class MixinTest(unittest.TestCase): # Check derivedSignal emission after mixinThreeSignal connection self.outsideSlotCalled = False - @QtCore.Slot() + + @Slot() def outsideSlot(): self.outsideSlotCalled = True |