diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-06 08:55:11 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-07 11:12:55 +0000 |
| commit | efffa046b8aed56a832f5159ca172e0393c24f1d (patch) | |
| tree | edfe1f95b6045f53b9857a64a61cf75ed9d72de4 | |
| parent | 018207374a4640f2caa961a7b2455e9d7ca60894 (diff) | |
Fix further tests
- Remove bug_632.py which was testing removed function
QLineEdit::getTextMargins()
- Enable the qshortcut test
- Remove check for QWidget::getContentsMargins() from
returnquadruplesofnumbers_test.py
- Adapt error message in qdomdocument_test.py
- QByteArray: exclude overloads of number functions added by
qtbase/66d6943478c3ae76f996c2cd2fdf04fee4fcb767.
As a drive by, remove operator[](uint).
Change-Id: I8f40dad1c1a446865e9de34a5df293cce09a1510
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
7 files changed, 7 insertions, 67 deletions
diff --git a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml index 216b02a4d..b8a78f8de 100644 --- a/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml +++ b/sources/pyside2/PySide2/QtCore/typesystem_core_common.xml @@ -1929,15 +1929,18 @@ <modify-function signature="operator>(const char*,QByteArray)" remove="all"/> <modify-function signature="operator>=(const char*,QByteArray)" remove="all"/> <modify-function signature="operator[](int)const" remove="all"/> - <modify-function signature="operator[](uint)const" remove="all"/> <!-- Those types have the same representation in Python, an overload would be useless and cause overflow errors. --> <modify-function signature="setNum(uint,int)" remove="all"/> <modify-function signature="setNum(ushort,int)" remove="all"/> <modify-function signature="setNum(float,char,int)" remove="all"/> <modify-function signature="setNum(short,int)" remove="all"/> + <modify-function signature="setNum(long,int)" remove="all"/> + <modify-function signature="setNum(ulong,int)" remove="all"/> <modify-function signature="setNum(qulonglong,int)" remove="all"/> <modify-function signature="number(uint,int)" remove="all"/> + <modify-function signature="number(long,int)" remove="all"/> + <modify-function signature="number(ulong,int)" remove="all"/> <modify-function signature="number(qulonglong,int)" remove="all"/> <!--### --> diff --git a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml index 3819c2a42..06ea29d14 100644 --- a/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml +++ b/sources/pyside2/PySide2/QtGui/typesystem_gui_common.xml @@ -272,15 +272,13 @@ </modify-function> </object-type> <object-type name="QShortcut"> -<!-- FIXME: Qt 6 - <add-function signature="QShortcut(QKeySequence&,QWidget*,PyCallable*,Qt::ShortcutContext)"> + <add-function signature="QShortcut(QKeySequence&,QObject*,PyCallable*,Qt::ShortcutContext)"> <modify-argument index="4"> <replace-default-expression with="Qt::WindowShortcut"/> </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtwidgets.cpp" snippet="qshortcut-1"/> <inject-code class="target" position="end" file="../glue/qtwidgets.cpp" snippet="qshortcut-2"/> </add-function> ---> </object-type> <value-type name="QTransform"> diff --git a/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py b/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py index 573ca9940..0a3a72fc0 100644 --- a/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py +++ b/sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py @@ -71,12 +71,6 @@ class ReturnsQuadruplesOfNumbers(UsesQApplication): obj = GraphicsLayoutItem() self.assertTrue(self.compareTuples(obj.getContentsMargins(), (0.0, 0.0, 0.0, 0.0))) - def testQWidgetGetContentsMargins(self): - obj = QWidget() - values = (10, 20, 30, 40) - obj.setContentsMargins(*values) - self.assertTrue(self.compareTuples(obj.getContentsMargins(), values)) - def testQLayoutGetContentsMargins(self): obj = Layout() values = (10, 20, 30, 40) diff --git a/sources/pyside2/tests/QtWidgets/CMakeLists.txt b/sources/pyside2/tests/QtWidgets/CMakeLists.txt index 695749a92..f6c3c01b8 100644 --- a/sources/pyside2/tests/QtWidgets/CMakeLists.txt +++ b/sources/pyside2/tests/QtWidgets/CMakeLists.txt @@ -27,7 +27,6 @@ PYSIDE_TEST(bug_575.py) PYSIDE_TEST(bug_576.py) PYSIDE_TEST(bug_585.py) PYSIDE_TEST(bug_589.py) -PYSIDE_TEST(bug_632.py) PYSIDE_TEST(bug_635.py) PYSIDE_TEST(bug_640.py) PYSIDE_TEST(bug_653.py) diff --git a/sources/pyside2/tests/QtWidgets/bug_632.py b/sources/pyside2/tests/QtWidgets/bug_632.py deleted file mode 100644 index d836b2ff6..000000000 --- a/sources/pyside2/tests/QtWidgets/bug_632.py +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################# -## -## 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$ -## -############################################################################# - -import os -import sys -import unittest - -sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from init_paths import init_test_paths -init_test_paths(False) - -from PySide2.QtWidgets import QLineEdit, QApplication - - -class Bug589(unittest.TestCase): - def testWrongSignature(self): - text = QLineEdit("PySide bug 632") - a = b = c = d = 0 - self.assertRaises(TypeError, text.getTextMargins, (a, b, c, d)) - - def testTupleReturn(self): - text = QLineEdit("PySide bug 632") - text.setTextMargins(10, 20, 30, 40) - (a, b, c, d) = text.getTextMargins() - self.assertTrue((a, b, c, d), (10, 20, 30, 40)) - -if __name__ == "__main__": - app = QApplication(sys.argv) - unittest.main() diff --git a/sources/pyside2/tests/QtWidgets/qshortcut_test.py b/sources/pyside2/tests/QtWidgets/qshortcut_test.py index 030021475..dbe99167c 100644 --- a/sources/pyside2/tests/QtWidgets/qshortcut_test.py +++ b/sources/pyside2/tests/QtWidgets/qshortcut_test.py @@ -59,7 +59,7 @@ class MyShortcut(QShortcut): QShortcut.__init__(self, keys, wdg, slot) def emit_signal(self): - self.emit(QtCore.SIGNAL("activated()")) + self.activated.emit() class QAppPresence(unittest.TestCase): diff --git a/sources/pyside2/tests/QtXml/qdomdocument_test.py b/sources/pyside2/tests/QtXml/qdomdocument_test.py index 67da9952c..07319092c 100644 --- a/sources/pyside2/tests/QtXml/qdomdocument_test.py +++ b/sources/pyside2/tests/QtXml/qdomdocument_test.py @@ -67,7 +67,7 @@ class QDomDocumentTest(unittest.TestCase): '''Sets invalid xml as the QDomDocument contents.''' ok, errorStr, errorLine, errorColumn = self.dom.setContent(self.badXmlData, True) self.assertFalse(ok) - self.assertEqual(errorStr, 'tag mismatch') + self.assertEqual(errorStr, 'Opening and ending tag mismatch.') self.assertEqual(errorLine, 4) self.assertEqual(errorColumn, 21) |