aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-06-09 10:45:46 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-06-11 21:25:53 +0000
commit3f21d3e34c5a70c1e929ca323879255a4f688ea2 (patch)
treec410d9e35b0831e656fb07504967e9504d259549
parent93669bcdaf2fb646e0c2125335cf2e7ae6a5c756 (diff)
PySide6: Add QSignalSpy
Task-number: PYSIDE-1482 Change-Id: I7a413a5ca3e64e9270026d4ea5d73d28df20ca5c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> (cherry picked from commit d9070999d95ed1aec9768425e70f6d300fa5bef1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--sources/pyside6/PySide6/QtTest/CMakeLists.txt1
-rw-r--r--sources/pyside6/PySide6/QtTest/typesystem_test.xml7
-rw-r--r--sources/pyside6/tests/QtTest/CMakeLists.txt1
-rw-r--r--sources/pyside6/tests/QtTest/qsignalspy_test.py62
4 files changed, 70 insertions, 1 deletions
diff --git a/sources/pyside6/PySide6/QtTest/CMakeLists.txt b/sources/pyside6/PySide6/QtTest/CMakeLists.txt
index 4b14fabbf..0e54461c1 100644
--- a/sources/pyside6/PySide6/QtTest/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtTest/CMakeLists.txt
@@ -3,6 +3,7 @@ project(QtTest)
set(QtTest_SRC
${QtTest_GEN_DIR}/qtest_pysideqtoucheventsequence_wrapper.cpp
${QtTest_GEN_DIR}/qabstractitemmodeltester_wrapper.cpp
+${QtTest_GEN_DIR}/qsignalspy_wrapper.cpp
${QtTest_GEN_DIR}/qtest_wrapper.cpp
# module is always needed
${QtTest_GEN_DIR}/qttest_module_wrapper.cpp
diff --git a/sources/pyside6/PySide6/QtTest/typesystem_test.xml b/sources/pyside6/PySide6/QtTest/typesystem_test.xml
index a90904f3d..20dcf3672 100644
--- a/sources/pyside6/PySide6/QtTest/typesystem_test.xml
+++ b/sources/pyside6/PySide6/QtTest/typesystem_test.xml
@@ -106,6 +106,12 @@
<enum-type name="FailureReportingMode"/>
</object-type>
+ <object-type name="QSignalSpy"> <!-- Inherits QList<QVariantList> -->
+ <declare-function signature="count()const" return-type="qsizetype"/>
+ <declare-function signature="size()const" return-type="qsizetype"/>
+ <declare-function signature="at(qsizetype)const" return-type="QVariantList"/>
+ </object-type>
+
<namespace-type name="QTest">
<!-- Qt5: private <enum-type name="AttributeIndex" since="4.6"/> -->
<enum-type name="KeyAction"/>
@@ -167,6 +173,5 @@
</modify-function>
</namespace-type>
- <rejection class="QSignalSpy"/>
<rejection class="QTestEventList"/>
</typesystem>
diff --git a/sources/pyside6/tests/QtTest/CMakeLists.txt b/sources/pyside6/tests/QtTest/CMakeLists.txt
index cf72dfa5c..c7d142dc4 100644
--- a/sources/pyside6/tests/QtTest/CMakeLists.txt
+++ b/sources/pyside6/tests/QtTest/CMakeLists.txt
@@ -2,4 +2,5 @@ PYSIDE_TEST(click_test.py)
PYSIDE_TEST(eventfilter_test.py)
# The test is currently permanently broken, needs to be fixed.
#PYSIDE_TEST(touchevent_test.py)
+PYSIDE_TEST(qsignalspy_test.py)
PYSIDE_TEST(qvalidator_test.py)
diff --git a/sources/pyside6/tests/QtTest/qsignalspy_test.py b/sources/pyside6/tests/QtTest/qsignalspy_test.py
new file mode 100644
index 000000000..4e5786ed6
--- /dev/null
+++ b/sources/pyside6/tests/QtTest/qsignalspy_test.py
@@ -0,0 +1,62 @@
+#############################################################################
+##
+## Copyright (C) 2021 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$
+##
+#############################################################################
+
+'''QtTest QSignalSpy'''
+
+import os
+import sys
+import unittest
+
+from pathlib import Path
+sys.path.append(os.fspath(Path(__file__).resolve().parents[1]))
+from init_paths import init_test_paths
+init_test_paths(False)
+
+from PySide6.QtCore import Qt, QObject, SIGNAL
+from PySide6.QtGui import QStandardItem, QStandardItemModel
+from PySide6.QtTest import QTest, QSignalSpy
+
+from helper.usesqapplication import UsesQApplication
+
+
+class QSignalSpyTest(UsesQApplication):
+
+ def setUp(self):
+ super().setUp()
+ self._model = QStandardItemModel(0, 1)
+ self._model.appendRow(QStandardItem('text1'))
+
+ def testStringBased(self):
+ s = SIGNAL('dataChanged(QModelIndex,QModelIndex,QList<int>)')
+ spy = QSignalSpy(self._model, s)
+ self._model.item(0, 0).setText('text2')
+ self.assertEqual(spy.count(), 1)
+
+
+if __name__ == '__main__':
+ unittest.main()