aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/tests
diff options
context:
space:
mode:
Diffstat (limited to 'sources/pyside2/tests')
-rw-r--r--sources/pyside2/tests/QtCore/CMakeLists.txt2
-rw-r--r--sources/pyside2/tests/QtCore/qobject_parent_test.py4
-rw-r--r--sources/pyside2/tests/QtCore/qregexp_test.py55
-rw-r--r--sources/pyside2/tests/QtCore/qtext_codec_test.py54
-rw-r--r--sources/pyside2/tests/QtCore/qtextstream_test.py11
-rw-r--r--sources/pyside2/tests/QtCore/qurlquery_test.py2
-rw-r--r--sources/pyside2/tests/QtGui/CMakeLists.txt3
-rw-r--r--sources/pyside2/tests/QtGui/deepcopy_test.py7
-rw-r--r--sources/pyside2/tests/QtGui/qmatrix_test.py106
-rw-r--r--sources/pyside2/tests/QtGui/qtextdocument_functions.py3
-rw-r--r--sources/pyside2/tests/QtGui/repr_test.py7
-rw-r--r--sources/pyside2/tests/QtNetwork/bug_446.py2
-rw-r--r--sources/pyside2/tests/QtOpenGL/CMakeLists.txt2
-rw-r--r--sources/pyside2/tests/QtOpenGL/qopenglbuffer_test.py (renamed from sources/pyside2/tests/QtGui/qopenglbuffer_test.py)0
-rw-r--r--sources/pyside2/tests/QtPrintSupport/returnquadruplesofnumbers_test.py6
-rw-r--r--sources/pyside2/tests/QtUiTools/bug_392.py2
-rw-r--r--sources/pyside2/tests/QtUiTools/bug_426.py2
-rw-r--r--sources/pyside2/tests/QtWebKit/CMakeLists.txt11
-rw-r--r--sources/pyside2/tests/QtWebKit/bug_448.py52
-rw-r--r--sources/pyside2/tests/QtWebKit/bug_694.py84
-rw-r--r--sources/pyside2/tests/QtWebKit/bug_803.py53
-rw-r--r--sources/pyside2/tests/QtWebKit/bug_899.py71
-rw-r--r--sources/pyside2/tests/QtWebKit/bug_959.py133
-rw-r--r--sources/pyside2/tests/QtWebKit/fox.html7
-rw-r--r--sources/pyside2/tests/QtWebKit/qml_plugin_test.py92
-rw-r--r--sources/pyside2/tests/QtWebKit/qmlplugin/dummy.pys1
-rw-r--r--sources/pyside2/tests/QtWebKit/qmlplugin/index.html5
-rw-r--r--sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py78
-rw-r--r--sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py63
-rw-r--r--sources/pyside2/tests/QtWebKit/webframe_test.py67
-rw-r--r--sources/pyside2/tests/QtWebKit/webpage_test.py95
-rw-r--r--sources/pyside2/tests/QtWebKit/webview_test.py101
-rw-r--r--sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt1
-rw-r--r--sources/pyside2/tests/QtWidgets/CMakeLists.txt2
-rw-r--r--sources/pyside2/tests/QtWidgets/add_action_test.py3
-rw-r--r--sources/pyside2/tests/QtWidgets/bug_363.py59
-rw-r--r--sources/pyside2/tests/QtWidgets/bug_632.py54
-rw-r--r--sources/pyside2/tests/QtWidgets/bug_711.py3
-rw-r--r--sources/pyside2/tests/QtWidgets/bug_860.py2
-rw-r--r--sources/pyside2/tests/QtWidgets/qaction_test.py3
-rw-r--r--sources/pyside2/tests/QtWidgets/qshortcut_test.py22
-rw-r--r--sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py4
-rw-r--r--sources/pyside2/tests/QtWidgets/qtoolbar_test.py3
-rw-r--r--sources/pyside2/tests/QtXml/qdomdocument_test.py2
-rw-r--r--sources/pyside2/tests/pysidetest/CMakeLists.txt12
-rw-r--r--sources/pyside2/tests/pysidetest/new_inherited_functions_test.py6
-rwxr-xr-xsources/pyside2/tests/tools/list-class-hierarchy.py1
-rw-r--r--sources/pyside2/tests/util/module_wrapper/PySide/QtWebKit.py2
48 files changed, 37 insertions, 1323 deletions
diff --git a/sources/pyside2/tests/QtCore/CMakeLists.txt b/sources/pyside2/tests/QtCore/CMakeLists.txt
index 771e1aeef..c0ec2ef79 100644
--- a/sources/pyside2/tests/QtCore/CMakeLists.txt
+++ b/sources/pyside2/tests/QtCore/CMakeLists.txt
@@ -99,7 +99,6 @@ PYSIDE_TEST(qpoint_test.py)
PYSIDE_TEST(qprocess_test.py)
PYSIDE_TEST(qproperty_decorator.py)
PYSIDE_TEST(qrect_test.py)
-PYSIDE_TEST(qregexp_test.py)
PYSIDE_TEST(qregularexpression_test.py)
PYSIDE_TEST(qresource_test.py)
PYSIDE_TEST(qsettings_test.py)
@@ -113,7 +112,6 @@ PYSIDE_TEST(qstate_test.py)
PYSIDE_TEST(qstorageinfo_test.py)
PYSIDE_TEST(qstring_test.py)
PYSIDE_TEST(qsysinfo_test.py)
-PYSIDE_TEST(qtext_codec_test.py)
PYSIDE_TEST(qtextstream_test.py)
PYSIDE_TEST(qthread_prod_cons_test.py)
PYSIDE_TEST(qthread_signal_test.py)
diff --git a/sources/pyside2/tests/QtCore/qobject_parent_test.py b/sources/pyside2/tests/QtCore/qobject_parent_test.py
index 0a02fbc26..386209e8a 100644
--- a/sources/pyside2/tests/QtCore/qobject_parent_test.py
+++ b/sources/pyside2/tests/QtCore/qobject_parent_test.py
@@ -148,10 +148,6 @@ class ParentCase(unittest.TestCase):
res = parent.findChildren(QObject, QRegularExpression("^fo+"))
self.assertEqual(res, test_children)
- # test findChildren with a QRegExp (deprecated)
- res = parent.findChildren(QObject, QRegExp("^fo+"))
- self.assertEqual(res, test_children)
-
def testParentEquality(self):
#QObject.parent() == parent
parent = QObject()
diff --git a/sources/pyside2/tests/QtCore/qregexp_test.py b/sources/pyside2/tests/QtCore/qregexp_test.py
deleted file mode 100644
index a031137fd..000000000
--- a/sources/pyside2/tests/QtCore/qregexp_test.py
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-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.QtCore import QRegExp
-
-class QRegExpTest(unittest.TestCase):
-
- def testReplace1(self):
- re = QRegExp('a[mn]')
- string = re.replace('Banana', 'ox')
- self.assertEqual(string, 'Boxoxa')
-
- def testReplace2(self):
- re = QRegExp('<i>([^<]*)</i>')
- string = re.replace('A <i>bon mot</i>.', '\\emph{\\1}')
- self.assertEqual(string, 'A \\emph{bon mot}.')
-
-if __name__ == '__main__':
- unittest.main()
-
diff --git a/sources/pyside2/tests/QtCore/qtext_codec_test.py b/sources/pyside2/tests/QtCore/qtext_codec_test.py
deleted file mode 100644
index 9e41c38c6..000000000
--- a/sources/pyside2/tests/QtCore/qtext_codec_test.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 gc
-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.QtCore import QTextCodec
-
-class TestCodecGetters(unittest.TestCase):
-
- def testCodecsNames(self):
- for codec_name in QTextCodec.availableCodecs():
- codec = QTextCodec.codecForName(codec_name)
- self.assertTrue(type(codec), QTextCodec)
-
- def testCodecsMibs(self):
- for codec_num in QTextCodec.availableMibs():
- codec = QTextCodec.codecForMib(codec_num)
- self.assertTrue(type(codec), QTextCodec)
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/sources/pyside2/tests/QtCore/qtextstream_test.py b/sources/pyside2/tests/QtCore/qtextstream_test.py
index bd25367c3..d4bbd8479 100644
--- a/sources/pyside2/tests/QtCore/qtextstream_test.py
+++ b/sources/pyside2/tests/QtCore/qtextstream_test.py
@@ -38,7 +38,7 @@ init_test_paths(False)
import py3kcompat as py3k
-from PySide2.QtCore import QByteArray, QTextStream, QIODevice, QTextCodec, QFile
+from PySide2.QtCore import QByteArray, QTextStream, QIODevice, QFile
class QTextStreamShiftTest(unittest.TestCase):
@@ -61,14 +61,6 @@ class QTextStreamGetSet(unittest.TestCase):
def setUp(self):
self.obj = QTextStream()
-
- def testCodec(self):
- '''QTextStream set/get Codec'''
-
- codec = QTextCodec.codecForName('ISO8859-1')
- self.obj.setCodec(codec)
- self.assertEqual(codec, self.obj.codec())
-
def testDevice(self):
'''QTextStream get/set Device'''
device = QFile()
@@ -83,7 +75,6 @@ class QTextStreamInitialization(unittest.TestCase):
'''QTextStream construction'''
obj = QTextStream()
- self.assertEqual(obj.codec(), QTextCodec.codecForLocale())
self.assertEqual(obj.device(), None)
self.assertEqual(obj.string(), None)
diff --git a/sources/pyside2/tests/QtCore/qurlquery_test.py b/sources/pyside2/tests/QtCore/qurlquery_test.py
index ac7ab69b0..6e538c919 100644
--- a/sources/pyside2/tests/QtCore/qurlquery_test.py
+++ b/sources/pyside2/tests/QtCore/qurlquery_test.py
@@ -45,8 +45,6 @@ class QUrlQueryTest(unittest.TestCase):
def testConstructing(self):
empty = QUrlQuery()
self.assertTrue(empty.isEmpty())
- self.assertEqual(empty.queryPairDelimiter(), QUrlQuery.defaultQueryPairDelimiter())
- self.assertEqual(empty.queryValueDelimiter(), QUrlQuery.defaultQueryValueDelimiter())
empty.clear();
self.assertTrue(empty.isEmpty())
diff --git a/sources/pyside2/tests/QtGui/CMakeLists.txt b/sources/pyside2/tests/QtGui/CMakeLists.txt
index 172703ab9..179e88fd6 100644
--- a/sources/pyside2/tests/QtGui/CMakeLists.txt
+++ b/sources/pyside2/tests/QtGui/CMakeLists.txt
@@ -26,8 +26,6 @@ PYSIDE_TEST(qfontmetrics_test.py)
PYSIDE_TEST(qguiapplication_test.py)
PYSIDE_TEST(qicon_test.py)
PYSIDE_TEST(qitemselection_test.py)
-PYSIDE_TEST(qmatrix_test.py)
-PYSIDE_TEST(qopenglbuffer_test.py)
PYSIDE_TEST(qpainter_test.py)
PYSIDE_TEST(qpdfwriter_test.py)
PYSIDE_TEST(qpixelformat_test.py)
@@ -37,7 +35,6 @@ PYSIDE_TEST(qpolygonf_test.py)
PYSIDE_TEST(qkeysequence_test.py)
PYSIDE_TEST(qradialgradient_test.py)
PYSIDE_TEST(qrasterwindow_test.py)
-PYSIDE_TEST(qopenglwindow_test.py)
PYSIDE_TEST(qregion_test.py)
PYSIDE_TEST(qstylehints_test.py)
PYSIDE_TEST(qtextdocument_functions.py)
diff --git a/sources/pyside2/tests/QtGui/deepcopy_test.py b/sources/pyside2/tests/QtGui/deepcopy_test.py
index d4dcdd64c..0fa82150f 100644
--- a/sources/pyside2/tests/QtGui/deepcopy_test.py
+++ b/sources/pyside2/tests/QtGui/deepcopy_test.py
@@ -36,7 +36,6 @@ from init_paths import init_test_paths
init_test_paths(False)
from PySide2.QtCore import QPoint
-from PySide2.QtGui import QMatrix
from PySide2.QtGui import QMatrix2x2, QMatrix2x3, QMatrix2x4
from PySide2.QtGui import QMatrix3x2, QMatrix3x3, QMatrix3x4
from PySide2.QtGui import QMatrix4x2, QMatrix4x3, QMatrix4x4
@@ -81,7 +80,7 @@ class QColorCMYKDeepCopy(DeepCopyColorHelperF, unittest.TestCase):
class QTransformDeepCopy(DeepCopyHelper, unittest.TestCase):
def setUp(self):
- self.original = QTransform(1, 2, 3, 4, 5, 6, 7, 8)
+ self.original = QTransform(1, 2, 3, 4, 5, 6, 7, 8, 9)
class QKeySequenceDeepCopy(DeepCopyHelper, unittest.TestCase):
def setUp(self):
@@ -107,10 +106,6 @@ class QPolygonDeepCopy(DeepCopyHelper, unittest.TestCase):
def setUp(self):
self.original = QPolygon([QPoint(1, 2), QPoint(3, 4), QPoint(5, 6)])
-class QMatrixDeepCopy(DeepCopyHelper, unittest.TestCase):
- def setUp(self):
- self.original = QMatrix(1, 2, 3, 4, 5, 6)
-
# Avoid these tests until get gcc fixed
# Related bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43247
diff --git a/sources/pyside2/tests/QtGui/qmatrix_test.py b/sources/pyside2/tests/QtGui/qmatrix_test.py
deleted file mode 100644
index 48380faf6..000000000
--- a/sources/pyside2/tests/QtGui/qmatrix_test.py
+++ /dev/null
@@ -1,106 +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.QtCore import QPoint
-from PySide2.QtGui import QMatrix, QMatrix2x2, QMatrix4x4
-
-
-def qpointTimesQMatrix(point, matrix):
- '''As seen in "QPoint QMatrix::map(const QPoint &p) const" C++ implementation.'''
- return QPoint(matrix.m11() * point.x() + matrix.m21() * point.y() + matrix.dx(),
- matrix.m12() * point.x() + matrix.m22() * point.y() + matrix.dy())
-
-class QMatrixTest(unittest.TestCase):
-
- def testMatrix(self):
- matrix = QMatrix(11, 12, 21, 22, 100, 200)
- point = QPoint(3, 3)
- self.assertEqual(matrix.map(point), qpointTimesQMatrix(point, matrix))
-
- def testMatrixWithWrongType(self):
- matrix = QMatrix(11, 12, 21, 22, 100, 200)
- point = QPoint(3, 3)
- # This exception may move from a TypeError to a ValueError.
- self.assertRaises((TypeError, ValueError), matrix.__mul__, point)
-
- def testMatrix2x2(self):
- matrix = QMatrix2x2([1.0, 2.0, 3.0, 4.0])
-
- expectedTransposed = QMatrix2x2([1.0, 3.0, 2.0, 4.0])
- self.assertEqual(matrix.transposed(), expectedTransposed)
-
- expectedMultiplied = QMatrix2x2([2.0, 4.0, 6.0, 8.0])
- matrix *= 2.0
- self.assertEqual(matrix, expectedMultiplied)
-
- matrix.setToIdentity()
- self.assertTrue(matrix.isIdentity())
-
- def testMatrix4x4(self):
- self.assertRaises(TypeError, QMatrix4x4, [0.0, 1.0, 2.0, 3.0])
- self.assertRaises(TypeError, QMatrix4x4, [0.0, 1.0, 2.0, 'I',
- 4.0, 5.0, 6.0, 7.0,
- 8.0, 9.0, 'N', 11.0,
- 12.0, 'd', 14.0, 'T'])
-
- my_data = [0.0, 1.0, 2.0, 3.0,
- 4.0, 5.0, 6.0, 7.0,
- 8.0, 9.0, 10.0, 11.0,
- 12.0, 13.0, 14.0, 15.0]
- my_datac = [0.0, 4.0, 8.0, 12.0,
- 1.0, 5.0, 9.0, 13.0,
- 2.0, 6.0, 10.0, 14.0,
- 3.0, 7.0, 11.0, 15.0]
-
- m = QMatrix4x4(my_data)
- d = m.data()
- self.assertTrue(my_datac, d)
-
- d = m.copyDataTo()
- self.assertTrue(my_data == list(d))
-
- def testMatrixMapping(self):
- m = QMatrix(1.0, 2.0, 1.0, 3.0, 100.0, 200.0)
- res = m.map(5, 5)
- self.assertAlmostEqual(res[0], 5 * 1.0 + 5 * 1.0 + 100.0)
- self.assertAlmostEqual(res[1], 5 * 2.0 + 5 * 3.0 + 200.0)
- res = m.map(5.0, 5.0)
- self.assertAlmostEqual(res[0], 5.0 * 1.0 + 5.0 * 1.0 + 100.0)
- self.assertAlmostEqual(res[1], 5.0 * 2.0 + 5.0 * 3.0 + 200.0)
-
-if __name__ == '__main__':
- unittest.main()
-
diff --git a/sources/pyside2/tests/QtGui/qtextdocument_functions.py b/sources/pyside2/tests/QtGui/qtextdocument_functions.py
index 765a6b5b7..bd1462049 100644
--- a/sources/pyside2/tests/QtGui/qtextdocument_functions.py
+++ b/sources/pyside2/tests/QtGui/qtextdocument_functions.py
@@ -35,7 +35,6 @@ from init_paths import init_test_paths
init_test_paths(False)
from PySide2.QtGui import Qt
-from PySide2.QtCore import QTextCodec
class QTextDocumentFunctions(unittest.TestCase):
@@ -45,8 +44,6 @@ class QTextDocumentFunctions(unittest.TestCase):
self.assertTrue(Qt.mightBeRichText('<html><head/><body><p>bla</p></body></html>'))
html = Qt.convertFromPlainText("A & B", Qt.WhiteSpaceNormal)
self.assertEqual(html, '<p>A &amp; B</p>')
- codec = Qt.codecForHtml(b'bla')
- self.assertTrue(codec)
if __name__ == '__main__':
diff --git a/sources/pyside2/tests/QtGui/repr_test.py b/sources/pyside2/tests/QtGui/repr_test.py
index e06f4d487..770c9d5bd 100644
--- a/sources/pyside2/tests/QtGui/repr_test.py
+++ b/sources/pyside2/tests/QtGui/repr_test.py
@@ -36,7 +36,6 @@ init_test_paths(False)
import PySide2
from PySide2.QtCore import QPoint
-from PySide2.QtGui import QMatrix
from PySide2.QtGui import QMatrix2x2, QMatrix2x3, QMatrix2x4
from PySide2.QtGui import QMatrix3x2, QMatrix3x3, QMatrix3x4
from PySide2.QtGui import QMatrix4x2, QMatrix4x3, QMatrix4x4
@@ -52,7 +51,7 @@ class ReprCopyHelper:
class QTransformReprCopy(ReprCopyHelper, unittest.TestCase):
def setUp(self):
- self.original = QTransform(1, 2, 3, 4, 5, 6, 7, 8)
+ self.original = QTransform(1, 2, 3, 4, 5, 6, 7, 8, 9)
class QKeySequenceReprCopy(ReprCopyHelper, unittest.TestCase):
def setUp(self):
@@ -74,10 +73,6 @@ class QVector4DReprCopy(ReprCopyHelper, unittest.TestCase):
def setUp(self):
self.original = QVector4D(1, 2, 3, 4)
-class QMatrixReprCopy(ReprCopyHelper, unittest.TestCase):
- def setUp(self):
- self.original = QMatrix(1, 2, 3, 4, 5, 6)
-
# Avoid these tests until get gcc fixed
# Related bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43247
diff --git a/sources/pyside2/tests/QtNetwork/bug_446.py b/sources/pyside2/tests/QtNetwork/bug_446.py
index f15ff01f9..e94bef510 100644
--- a/sources/pyside2/tests/QtNetwork/bug_446.py
+++ b/sources/pyside2/tests/QtNetwork/bug_446.py
@@ -49,7 +49,7 @@ class HttpSignalsCase(UsesQCoreApplication):
def onNewConnection(self):
self.serverConnection = self.server.nextPendingConnection()
- self.serverConnection.error.connect(self.onError)
+ self.serverConnection.errorOccurred.connect(self.onError)
self.serverConnection.write(HttpSignalsCase.DATA)
self.server.close()
diff --git a/sources/pyside2/tests/QtOpenGL/CMakeLists.txt b/sources/pyside2/tests/QtOpenGL/CMakeLists.txt
index b37a9ddce..a0e8d0053 100644
--- a/sources/pyside2/tests/QtOpenGL/CMakeLists.txt
+++ b/sources/pyside2/tests/QtOpenGL/CMakeLists.txt
@@ -1,2 +1,4 @@
PYSIDE_TEST(qglbuffer_test.py)
PYSIDE_TEST(qglwidget_test.py)
+PYSIDE_TEST(qopenglbuffer_test.py)
+PYSIDE_TEST(qopenglwindow_test.py)
diff --git a/sources/pyside2/tests/QtGui/qopenglbuffer_test.py b/sources/pyside2/tests/QtOpenGL/qopenglbuffer_test.py
index a5d8385c9..a5d8385c9 100644
--- a/sources/pyside2/tests/QtGui/qopenglbuffer_test.py
+++ b/sources/pyside2/tests/QtOpenGL/qopenglbuffer_test.py
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/QtUiTools/bug_392.py b/sources/pyside2/tests/QtUiTools/bug_392.py
index 2439e7203..07db9802e 100644
--- a/sources/pyside2/tests/QtUiTools/bug_392.py
+++ b/sources/pyside2/tests/QtUiTools/bug_392.py
@@ -53,7 +53,7 @@ class BugTest(UsesQApplication):
filePath = os.path.join(os.path.dirname(__file__), 'action.ui')
result = loader.load(filePath, w)
- self.assertTrue(isinstance(result.actionFoo, QtWidgets.QAction))
+ self.assertTrue(isinstance(result.actionFoo, QtGui.QAction))
def testPythonCustomWidgets(self):
w = QtWidgets.QWidget()
diff --git a/sources/pyside2/tests/QtUiTools/bug_426.py b/sources/pyside2/tests/QtUiTools/bug_426.py
index e84da0382..15cfeee2b 100644
--- a/sources/pyside2/tests/QtUiTools/bug_426.py
+++ b/sources/pyside2/tests/QtUiTools/bug_426.py
@@ -42,7 +42,7 @@ class Window(object):
loader = QUiLoader()
filePath = os.path.join(os.path.dirname(__file__), 'bug_426.ui')
self.widget = loader.load(filePath)
- self.group = QtWidgets.QActionGroup(self.widget)
+ self.group = QtGui.QActionGroup(self.widget)
self.widget.show()
QtCore.QTimer.singleShot(0, self.widget.close)
diff --git a/sources/pyside2/tests/QtWebKit/CMakeLists.txt b/sources/pyside2/tests/QtWebKit/CMakeLists.txt
deleted file mode 100644
index 7fab64773..000000000
--- a/sources/pyside2/tests/QtWebKit/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-PYSIDE_TEST(bug_448.py)
-PYSIDE_TEST(bug_694.py)
-PYSIDE_TEST(bug_803.py)
-PYSIDE_TEST(bug_899.py)
-PYSIDE_TEST(bug_959.py)
-PYSIDE_TEST(qvariantlist_property_test.py)
-PYSIDE_TEST(qml_plugin_test.py)
-PYSIDE_TEST(shouldInterruptjavascript_test.py)
-PYSIDE_TEST(webpage_test.py)
-PYSIDE_TEST(webview_test.py)
-PYSIDE_TEST(webframe_test.py)
diff --git a/sources/pyside2/tests/QtWebKit/bug_448.py b/sources/pyside2/tests/QtWebKit/bug_448.py
deleted file mode 100644
index 98ebb1958..000000000
--- a/sources/pyside2/tests/QtWebKit/bug_448.py
+++ /dev/null
@@ -1,52 +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$
-##
-#############################################################################
-
-'''Test cases for bug: http://bugs.openbossa.org/show_bug.cgi?id=448'''
-
-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 QApplication
-from PySide2.QtWebKit import QWebView
-
-class Bug448(unittest.TestCase):
- def onError(self, erros):
- pass
-
- def testReturnOwnership(self):
- app = QApplication(sys.argv)
- webview = QWebView()
- webview.page().networkAccessManager().sslErrors.connect(self.onError)
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/sources/pyside2/tests/QtWebKit/bug_694.py b/sources/pyside2/tests/QtWebKit/bug_694.py
deleted file mode 100644
index b18d658f6..000000000
--- a/sources/pyside2/tests/QtWebKit/bug_694.py
+++ /dev/null
@@ -1,84 +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.QtCore import *
-from PySide2.QtWidgets import *
-from PySide2.QtWebKit import *
-
-class ErrorPage (QWebPage):
-
- def __init__(self):
- QWebPage.__init__(self)
- self.rcv_extension = None
- self.rcv_url = None
- self.rcv_url_copy = None
- self.rcv_option_type = None
- self.rcv_output_type = None
-
-
- def supportsExtension(self, extension):
- return extension == QWebPage.ErrorPageExtension
-
- def extension(self, extension, option, output):
- self.rcv_extension = extension
- self.rcv_url = option.url
- self.rcv_url_copy = QUrl(option.url)
- self.rcv_option_type = type(option)
- self.rcv_output_type = type(output)
- return True
-
-class TestWebPageExtension(unittest.TestCase):
- def testIt(self):
- app = QApplication([])
- ep = ErrorPage()
- view = QWebView()
- view.setPage(ep)
- view.load("foo://bar") # Some malformmed url
- view.show()
-
- # If the timeout is 0 the webpage isn't even loaded on Qt4.6-i386, so we use 100 :-)
- QTimer.singleShot(100, app.quit)
- app.exec_()
-
- self.assertEqual(ep.rcv_extension, QWebPage.ErrorPageExtension)
- self.assertRaises(RuntimeError, ep.rcv_url.__str__)
-
- self.assertEqual(ep.rcv_url_copy, "foo://bar")
- self.assertEqual(ep.rcv_option_type, QWebPage.ErrorPageExtensionOption)
- self.assertEqual(ep.rcv_output_type, QWebPage.ErrorPageExtensionReturn)
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/sources/pyside2/tests/QtWebKit/bug_803.py b/sources/pyside2/tests/QtWebKit/bug_803.py
deleted file mode 100644
index ec6f93c33..000000000
--- a/sources/pyside2/tests/QtWebKit/bug_803.py
+++ /dev/null
@@ -1,53 +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 *
-from PySide2.QtWebKit import *
-
-class TestBug803 (unittest.TestCase):
-
- def testIt(self):
- app = QApplication([])
- page = QWebPage()
- frame = page.mainFrame()
- frame.setHtml("<html><head></head><body><p>1</p><p>2</p></body></html>")
- elems = frame.findAllElements("p")
- self.assertEqual(len(elems), 2)
- self.assertEqual(elems[0].toPlainText(), "1")
- self.assertEqual(elems[1].toPlainText(), "2")
-
-if __name__ == "__main__":
- unittest.main()
diff --git a/sources/pyside2/tests/QtWebKit/bug_899.py b/sources/pyside2/tests/QtWebKit/bug_899.py
deleted file mode 100644
index cb8e76784..000000000
--- a/sources/pyside2/tests/QtWebKit/bug_899.py
+++ /dev/null
@@ -1,71 +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.QtCore import Property, QObject
-from PySide2.QtWebKit import QWebView
-from helper.timedqapplication import TimedQApplication
-
-class TestLambdaPropery(TimedQApplication):
-
- def testBug899(self):
- html = '''
- <html><body>
- <script type="text/javascript">
- document.write("<p>"+py_obj.list1+"</p>")
- document.write("<p>"+py_obj.list2+"</p>")
- </script>
- </body></html>
- '''
-
- class Obj(object):
- list1 = ['foo', 'bar', 'baz']
- list2 = ['fi', 'fo', 'fum']
-
- obj = Obj()
-
- wrapper_dict = {}
- for name in ('list1', 'list2'):
- getter = lambda arg=None, name=name: getattr(obj, name)
- wrapper_dict[name] = Property('QVariantList', getter)
- wrapper = type('PyObj', (QObject,), wrapper_dict)
-
- view = QWebView()
- view.page().mainFrame().addToJavaScriptWindowObject('py_obj', wrapper())
- view.setHtml(html)
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/sources/pyside2/tests/QtWebKit/bug_959.py b/sources/pyside2/tests/QtWebKit/bug_959.py
deleted file mode 100644
index 5214ee1e1..000000000
--- a/sources/pyside2/tests/QtWebKit/bug_959.py
+++ /dev/null
@@ -1,133 +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$
-##
-#############################################################################
-
-from PySide2.QtCore import QObject, Slot, QTimer
-from PySide2.QtWebKit import QWebView
-from PySide2.QtWidgets import QApplication
-from PySide2 import QtCore
-
-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 helper.usesqapplication import UsesQApplication
-
-functionID = -1
-currentWebView = None
-
-class JSFuncs(QObject):
- @Slot(str,result=str)
- def slot_str_str(self, x):
- global functionID
- functionID = 0
- return x.upper()
-
- @Slot(str,result='QVariant')
- def slot_str_list(self, x):
- global functionID
- functionID = 1
- return [x, x]
-
- @Slot('QStringList',result=str)
- def slot_strlist_str(self, x):
- global functionID
- functionID = 2
- return x[-1]
-
- @Slot('QVariant',result=str)
- def slot_variant_str(self, x):
- global functionID
- functionID = 3
- return str(x)
-
- @Slot('QVariantList',result=str)
- def slot_variantlist_str(self, x):
- global functionID
- functionID = 4
- return str(x[-1])
-
- @Slot('QVariantMap',result=str)
- def slot_variantmap_str(self, x):
- global functionID
- functionID = 5
- return str(x["foo"])
-
-
-
-PAGE_DATA = "data:text/html,<!doctype html><html><body onload='%s'></body></html>"
-FUNCTIONS_LIST = ['jsfuncs.slot_str_str("hello")',
- 'jsfuncs.slot_str_list("hello")',
- 'jsfuncs.slot_strlist_str(["hello","world"])',
- 'jsfuncs.slot_variant_str("hello")',
- 'jsfuncs.slot_variantlist_str(["hello","world"])',
- 'jsfuncs.slot_variantmap_str({"foo": "bar"})']
-
-
-def onLoadFinished( result ):
- QTimer.singleShot( 100, createNextWebView )
-
-def createNextWebView():
- global functionID
-
- nListCount = len(FUNCTIONS_LIST) - 1
- functionID = functionID + 1
- print functionID
-
- if functionID < nListCount:
- createWebView( functionID )
- else:
- QTimer.singleShot(300, QApplication.instance().quit)
-
-
-def createWebView( nIndex ):
- global functionID
- global currentWebView
-
- functionID = nIndex
- currentWebView = QWebView()
- currentWebView._jsfuncs = JSFuncs()
- currentWebView.page().mainFrame().addToJavaScriptWindowObject("jsfuncs", currentWebView._jsfuncs)
- QObject.connect( currentWebView, QtCore.SIGNAL('loadFinished( bool )'), onLoadFinished )
- currentWebView.load(PAGE_DATA % FUNCTIONS_LIST[ nIndex ])
- currentWebView.show()
-
-class Bug959(UsesQApplication):
-
- def testJavaScriptInWebViewForCrash( self ):
- # wait for the webview load to be finished before creating the next webview
- # don't create the webview inside of onLoadFinished
- # also call onLoadFinished with the correct number of variables
- createNextWebView()
- self.app.exec_()
-
-if __name__ == "__main__":
- unittest.main()
diff --git a/sources/pyside2/tests/QtWebKit/fox.html b/sources/pyside2/tests/QtWebKit/fox.html
deleted file mode 100644
index da873b1cc..000000000
--- a/sources/pyside2/tests/QtWebKit/fox.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<title>Title</title>
-<meta name="description" content="PySide Test METADATA." />
-<body>
-<p>The quick <b>brown</b> fox <i>jumps</i> over the lazy dog.</p>
-</body>
-</html>
diff --git a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py b/sources/pyside2/tests/QtWebKit/qml_plugin_test.py
deleted file mode 100644
index 33497bdc1..000000000
--- a/sources/pyside2/tests/QtWebKit/qml_plugin_test.py
+++ /dev/null
@@ -1,92 +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.QtCore import QUrl, QTimer
-from PySide2.QtWidgets import QApplication, QLabel
-from PySide2.QtWebKit import QWebPluginFactory, QWebView, QWebSettings
-
-from helper.usesqapplication import UsesQApplication
-
-class PluginFactory(QWebPluginFactory):
-
- def plugins(self):
- plugins = []
-
- mime = self.MimeType()
- mime.name = 'DummyFile'
- mime.fileExtensions = ['.pys']
-
- plugin = self.Plugin()
- plugin.name = 'DummyPlugin'
- plugin.mimeTypes = [mime]
-
- plugins.append(plugin)
-
- return plugins
-
- def create(self, mimeType, url, argumentNames, argumentValues):
- if mimeType != 'application/x-dummy':
- return None
-
- for name, value in zip(argumentNames, argumentValues):
- if name == 'text':
- text = value
- else:
- text = "Webkit plugins!"
-
- widget = QLabel(text)
- return widget
-
-class TestPlugin(UsesQApplication):
-
- def testPlugin(self):
- view = QWebView()
- fac = PluginFactory()
- view.page().setPluginFactory(fac)
- QWebSettings.globalSettings().setAttribute(QWebSettings.PluginsEnabled, True)
-
- view.load(QUrl(os.path.join(os.path.abspath(os.path.dirname(__file__)), 'qmlplugin', 'index.html')))
-
- view.resize(840, 600)
- view.show()
-
- QTimer.singleShot(500, self.app.quit)
-
- self.app.exec_()
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/sources/pyside2/tests/QtWebKit/qmlplugin/dummy.pys b/sources/pyside2/tests/QtWebKit/qmlplugin/dummy.pys
deleted file mode 100644
index 0b7469da4..000000000
--- a/sources/pyside2/tests/QtWebKit/qmlplugin/dummy.pys
+++ /dev/null
@@ -1 +0,0 @@
-Foobar!
diff --git a/sources/pyside2/tests/QtWebKit/qmlplugin/index.html b/sources/pyside2/tests/QtWebKit/qmlplugin/index.html
deleted file mode 100644
index db0d6b5b2..000000000
--- a/sources/pyside2/tests/QtWebKit/qmlplugin/index.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>
- <h1>Custom Plugin</h1>
- <object type="application/x-dummy" data="./dummy.pys" text="My text">
- </object>
-</body></html>
diff --git a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py b/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py
deleted file mode 100644
index 6a51a6488..000000000
--- a/sources/pyside2/tests/QtWebKit/qvariantlist_property_test.py
+++ /dev/null
@@ -1,78 +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.QtCore import Property, QObject
-from PySide2.QtWebKit import QWebView
-from helper.timedqapplication import TimedQApplication
-
-class TestLoadFinished(TimedQApplication):
-
- def setUp(self):
- TimedQApplication.setUp(self, timeout=1000)
-
- def tearDown(self):
- TimedQApplication.tearDown(self)
-
- def testQVariantListProperty(self):
- class Obj(object):
- list = ['foo', 'bar', 'baz']
-
- obj = Obj()
-
- wrapper_dict = {}
- for name in ['list']:
- getter = lambda arg=None, name=name: getattr(obj, name)
- wrapper_dict[name] = Property('QVariantList', getter)
- wrapper = type('PyObj', (QObject,), wrapper_dict)
-
- view = QWebView()
- frame = view.page().mainFrame()
- frame.addToJavaScriptWindowObject('py_obj', wrapper())
-
- html = '''
- <html><body>
- <script type="text/javascript">
- document.write(py_obj.list)
- </script>
- </body></html>
- '''
- view.setHtml(html)
- view.show()
- self.app.exec_()
-
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py b/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py
deleted file mode 100644
index 4db5adbb5..000000000
--- a/sources/pyside2/tests/QtWebKit/shouldInterruptjavascript_test.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-#############################################################################
-##
-## 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 import QtCore, QtWebKit
-
-from helper.usesqapplication import UsesQApplication
-
-class QWebPageHeadless(QtWebKit.QWebPage):
- # FIXME: This is not working, the slot is not overriden!
- # http://doc.qt.nokia.com/4.7-snapshot/qwebpage.html#shouldInterruptJavaScript
- @QtCore.Slot()
- def shouldInterruptJavaScript(self):
- self._interrupted = True
- QtCore.QTimer.singleShot(300, self._app.quit)
- return True
-
-class TestSlotOverride(UsesQApplication):
- def testFunctionCall(self):
- page = QWebPageHeadless()
- page._interrupted = False
- page._app = self.app
- page.mainFrame().setHtml('<script>while(1);</script>')
- self.app.exec_()
- self.assertTrue(page._interrupted)
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/sources/pyside2/tests/QtWebKit/webframe_test.py b/sources/pyside2/tests/QtWebKit/webframe_test.py
deleted file mode 100644
index d46c1b229..000000000
--- a/sources/pyside2/tests/QtWebKit/webframe_test.py
+++ /dev/null
@@ -1,67 +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.QtCore import QObject, SIGNAL, QUrl
-from PySide2.QtWebKit import *
-from PySide2.QtNetwork import QNetworkRequest
-
-from helper.helper import adjust_filename
-from helper.usesqapplication import UsesQApplication
-
-
-class TestWebFrame(UsesQApplication):
- def load_finished(self, ok):
- self.assertTrue(ok)
- page = self.view.page()
- self.assertTrue(page)
- frame = page.mainFrame()
- self.assertTrue(frame)
- meta = frame.metaData()
- self.assertEqual(meta['description'], ['PySide Test METADATA.'])
- self.app.quit()
-
- def testMetaData(self):
- self.view = QWebView()
- QObject.connect(self.view, SIGNAL('loadFinished(bool)'),
- self.load_finished)
- url = QUrl.fromLocalFile(adjust_filename('fox.html', __file__))
- self.view.setUrl(url)
- self.app.exec_()
-
-
-if __name__ == '__main__':
- unittest.main()
-
diff --git a/sources/pyside2/tests/QtWebKit/webpage_test.py b/sources/pyside2/tests/QtWebKit/webpage_test.py
deleted file mode 100644
index 0c37befa2..000000000
--- a/sources/pyside2/tests/QtWebKit/webpage_test.py
+++ /dev/null
@@ -1,95 +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$
-##
-#############################################################################
-
-'''Test cases for QWebPage'''
-
-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.QtCore import QObject, SIGNAL, QUrl
-from PySide2.QtWebKit import QWebPage
-from PySide2.QtNetwork import QNetworkAccessManager
-
-from helper.helper import adjust_filename
-from helper.timedqapplication import TimedQApplication
-
-#Define a global timeout because TimedQApplication uses a singleton!
-#Use a value big enough to run all the tests.
-TIMEOUT = 1000
-
-class TestFindText(TimedQApplication):
- '''Test cases for finding text'''
-
- def setUp(self):
- TimedQApplication.setUp(self, timeout=TIMEOUT)
- self.page = QWebPage()
- QObject.connect(self.page, SIGNAL('loadFinished(bool)'),
- self.load_finished)
- self.called = False
-
- def tearDown(self):
- #Release resources
- del self.page
- self.called = False
- TimedQApplication.tearDown(self)
-
- def testFindSelectText(self):
- url = QUrl.fromLocalFile(adjust_filename('fox.html', __file__))
- self.page.mainFrame().load(url)
- self.app.exec_()
- self.assertTrue(self.called)
-
- def load_finished(self, ok):
- #Callback to check if load was successful
- if ok:
- self.called = True
- self.assertTrue(self.page.findText('fox'))
- self.assertEqual(self.page.selectedText(), 'fox')
- self.app.quit()
-
-class SetNetworkAccessManagerCase(TimedQApplication):
-
- def setUp(self):
- TimedQApplication.setUp(self, timeout=TIMEOUT)
-
- def testSetNetworkAccessManager(self):
- page = QWebPage()
- manager = QNetworkAccessManager()
- page.setNetworkAccessManager(manager)
-
- def testNetWorkAccessManager(self):
- page = QWebPage()
- a = page.networkAccessManager()
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/sources/pyside2/tests/QtWebKit/webview_test.py b/sources/pyside2/tests/QtWebKit/webview_test.py
deleted file mode 100644
index 5ecac5387..000000000
--- a/sources/pyside2/tests/QtWebKit/webview_test.py
+++ /dev/null
@@ -1,101 +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$
-##
-#############################################################################
-
-'''Test cases for QWebView'''
-
-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)
-
-import py3kcompat as py3k
-
-from PySide2.QtCore import QObject, SIGNAL, QUrl
-from PySide2.QtWebKit import QWebPage, QWebView
-from PySide2.QtNetwork import QNetworkRequest
-
-from helper.helper import adjust_filename
-from helper.timedqapplication import TimedQApplication
-
-
-class testWebPage(QWebPage):
- def sayMyName(self):
- return 'testWebPage'
-
-class TestLoadFinished(TimedQApplication):
- '''Test case for signal QWebView.loadFinished(bool)'''
-
- def setUp(self):
- #Acquire resources
- TimedQApplication.setUp(self, timeout=1000)
- self.view = QWebView()
- QObject.connect(self.view, SIGNAL('loadFinished(bool)'),
- self.load_finished)
- self.called = False
-
- def tearDown(self):
- #Release resources
- del self.view
- self.called = False
- TimedQApplication.tearDown(self)
-
- def testLoadFinishedFromFile(self):
- url = QUrl.fromLocalFile(adjust_filename('fox.html', __file__))
- self.view.setUrl(url)
- self.app.exec_()
-
- self.assertTrue(self.called)
-
- def testSetPageAndGetPage(self):
- twp = testWebPage()
- self.view.setPage(twp)
- del twp
- p = self.view.page()
- self.assertEqual(p.sayMyName(), 'testWebPage')
-
- # Setting the same webpage should not incref the python obj
- refCount = sys.getrefcount(p)
- self.view.setPage(p)
- self.assertEqual(sys.getrefcount(p), refCount)
-
- # Changing the webpage obj should decref the old one
- twp2 = testWebPage()
- self.view.setPage(twp2)
- self.assertEqual(sys.getrefcount(p), refCount - 1)
-
- def load_finished(self, ok):
- #Callback to check if load was successful
- self.app.quit()
- if ok:
- self.called = True
-
-if __name__ == '__main__':
- unittest.main()
diff --git a/sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt b/sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt
deleted file mode 100644
index 2f7cb08b9..000000000
--- a/sources/pyside2/tests/QtWebKitWidgets/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-# Please add some tests, here
diff --git a/sources/pyside2/tests/QtWidgets/CMakeLists.txt b/sources/pyside2/tests/QtWidgets/CMakeLists.txt
index 6682136ea..f6c3c01b8 100644
--- a/sources/pyside2/tests/QtWidgets/CMakeLists.txt
+++ b/sources/pyside2/tests/QtWidgets/CMakeLists.txt
@@ -9,7 +9,6 @@ PYSIDE_TEST(bug_243.py)
PYSIDE_TEST(bug_307.py)
PYSIDE_TEST(bug_324.py)
PYSIDE_TEST(bug_338.py)
-PYSIDE_TEST(bug_363.py)
PYSIDE_TEST(bug_389.py)
PYSIDE_TEST(bug_400.py)
PYSIDE_TEST(bug_416.py)
@@ -28,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/add_action_test.py b/sources/pyside2/tests/QtWidgets/add_action_test.py
index c8a7c2269..d4af8b5d1 100644
--- a/sources/pyside2/tests/QtWidgets/add_action_test.py
+++ b/sources/pyside2/tests/QtWidgets/add_action_test.py
@@ -37,7 +37,8 @@ from init_paths import init_test_paths
init_test_paths(False)
from PySide2.QtCore import SLOT
-from PySide2.QtWidgets import QMenuBar, QAction, QPushButton
+from PySide2.QtGui import QAction
+from PySide2.QtWidgets import QMenuBar, QPushButton
from helper.usesqapplication import UsesQApplication
diff --git a/sources/pyside2/tests/QtWidgets/bug_363.py b/sources/pyside2/tests/QtWidgets/bug_363.py
deleted file mode 100644
index 910525fed..000000000
--- a/sources/pyside2/tests/QtWidgets/bug_363.py
+++ /dev/null
@@ -1,59 +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$
-##
-#############################################################################
-
-''' Test bug 363: http://bugs.openbossa.org/show_bug.cgi?id=363'''
-
-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 helper.usesqapplication import UsesQApplication
-from PySide2 import QtCore, QtWidgets
-
-# Check for desktop object lifetime
-class BugTest(UsesQApplication):
- def mySlot(self):
- pass
-
- # test if it is possible to connect with a desktop object after storing that on an auxiliar variable
- def testCase1(self):
- desktop = QtWidgets.QApplication.desktop()
- desktop.resized[int].connect(self.mySlot)
- self.assertTrue(True)
-
- # test if it is possible to connect with a desktop object without storing that on an auxiliar variable
- def testCase2(self):
- QtWidgets.QApplication.desktop().resized[int].connect(self.mySlot)
- self.assertTrue(True)
-
-if __name__ == '__main__':
- unittest.main()
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/bug_711.py b/sources/pyside2/tests/QtWidgets/bug_711.py
index 43e4b7bb2..3898e23f5 100644
--- a/sources/pyside2/tests/QtWidgets/bug_711.py
+++ b/sources/pyside2/tests/QtWidgets/bug_711.py
@@ -34,7 +34,8 @@ 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 QToolBar, QApplication, QAction, QToolButton
+from PySide2.QtGui import QAction
+from PySide2.QtWidgets import QToolBar, QApplication, QToolButton
try:
xrange
diff --git a/sources/pyside2/tests/QtWidgets/bug_860.py b/sources/pyside2/tests/QtWidgets/bug_860.py
index 8cdab2e45..483973fdb 100644
--- a/sources/pyside2/tests/QtWidgets/bug_860.py
+++ b/sources/pyside2/tests/QtWidgets/bug_860.py
@@ -52,7 +52,7 @@ class MultipleSlotTest(UsesQApplication):
box.stateChanged.connect(checkboxMapper.map)
checkboxMapper.setMapping(box, box.text())
- checkboxMapper.mapped[str].connect(self.cb_changed)
+ checkboxMapper.mappedString[str].connect(self.cb_changed)
self._changed = False
box.setChecked(True)
self.assertTrue(self._changed)
diff --git a/sources/pyside2/tests/QtWidgets/qaction_test.py b/sources/pyside2/tests/QtWidgets/qaction_test.py
index 8fc8f6c05..d587a59b1 100644
--- a/sources/pyside2/tests/QtWidgets/qaction_test.py
+++ b/sources/pyside2/tests/QtWidgets/qaction_test.py
@@ -34,7 +34,8 @@ 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 QAction, QWidget
+from PySide2.QtGui import QAction
+from PySide2.QtWidgets import QWidget
from helper.usesqapplication import UsesQApplication
class QPainterDrawText(UsesQApplication):
diff --git a/sources/pyside2/tests/QtWidgets/qshortcut_test.py b/sources/pyside2/tests/QtWidgets/qshortcut_test.py
index 18aec285d..dbe99167c 100644
--- a/sources/pyside2/tests/QtWidgets/qshortcut_test.py
+++ b/sources/pyside2/tests/QtWidgets/qshortcut_test.py
@@ -38,11 +38,13 @@ 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 import QtCore, QtGui, QtWidgets
+from PySide2.QtCore import Qt, QTimer
+from PySide2.QtGui import QKeySequence, QShortcut
+from PySide2.QtWidgets import QApplication, QWidget
-class Foo(QtWidgets.QWidget):
+class Foo(QWidget):
def __init__(self):
- QtWidgets.QWidget.__init__(self)
+ QWidget.__init__(self)
self.ok = False
self.copy = False
@@ -52,22 +54,22 @@ class Foo(QtWidgets.QWidget):
def slot_of_copy(self):
self.copy = True
-class MyShortcut(QtWidgets.QShortcut):
+class MyShortcut(QShortcut):
def __init__(self, keys, wdg, slot):
- QtWidgets.QShortcut.__init__(self, keys, wdg, slot)
+ QShortcut.__init__(self, keys, wdg, slot)
def emit_signal(self):
- self.emit(QtCore.SIGNAL("activated()"))
+ self.activated.emit()
class QAppPresence(unittest.TestCase):
def testQShortcut(self):
- self.qapp = QtWidgets.QApplication([])
+ self.qapp = QApplication([])
f = Foo()
- self.sc = MyShortcut(QtGui.QKeySequence(QtCore.Qt.Key_Return), f, f.slot_of_foo)
- self.scstd = MyShortcut(QtGui.QKeySequence.Copy, f, f.slot_of_copy)
- QtCore.QTimer.singleShot(0, self.init);
+ self.sc = MyShortcut(QKeySequence(Qt.Key_Return), f, f.slot_of_foo)
+ self.scstd = MyShortcut(QKeySequence.Copy, f, f.slot_of_copy)
+ QTimer.singleShot(0, self.init);
self.qapp.exec_()
self.assertEqual(f.ok, True)
self.assertEqual(f.copy, True)
diff --git a/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py b/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py
index 0321b69a4..79842aac2 100644
--- a/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py
+++ b/sources/pyside2/tests/QtWidgets/qstring_qkeysequence_test.py
@@ -42,8 +42,8 @@ init_test_paths(False)
import py3kcompat as py3k
from helper.usesqapplication import UsesQApplication
-from PySide2.QtGui import QKeySequence
-from PySide2.QtWidgets import QAction
+from PySide2.QtGui import QAction, QKeySequence
+
class QStringQKeySequenceTest(UsesQApplication):
'''Tests conversions of QString to and from QKeySequence.'''
diff --git a/sources/pyside2/tests/QtWidgets/qtoolbar_test.py b/sources/pyside2/tests/QtWidgets/qtoolbar_test.py
index 856bf07f3..a70305c4a 100644
--- a/sources/pyside2/tests/QtWidgets/qtoolbar_test.py
+++ b/sources/pyside2/tests/QtWidgets/qtoolbar_test.py
@@ -36,7 +36,8 @@ 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 QToolBar, QMainWindow, QAction
+from PySide2.QtGui import QAction
+from PySide2.QtWidgets import QToolBar, QMainWindow
from helper.usesqapplication import UsesQApplication
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)
diff --git a/sources/pyside2/tests/pysidetest/CMakeLists.txt b/sources/pyside2/tests/pysidetest/CMakeLists.txt
index bdd88ea37..cdf653745 100644
--- a/sources/pyside2/tests/pysidetest/CMakeLists.txt
+++ b/sources/pyside2/tests/pysidetest/CMakeLists.txt
@@ -23,11 +23,7 @@ testview.h
hiddenobject.h
)
-if (${QT_MAJOR_VERSION} GREATER_EQUAL 6)
- qt6_wrap_cpp(pysidetest_MOC_SRC ${pysidetest_MOC_HEADERS})
-else()
- qt5_wrap_cpp(pysidetest_MOC_SRC ${pysidetest_MOC_HEADERS})
-endif()
+qt_wrap_cpp(pysidetest_MOC_SRC ${pysidetest_MOC_HEADERS})
set(testbinding_SRC
${CMAKE_CURRENT_BINARY_DIR}/testbinding/testobject_wrapper.cpp
@@ -48,9 +44,9 @@ ${CMAKE_CURRENT_BINARY_DIR}/testbinding/testbinding_module_wrapper.cpp
# Thus we use the second direct path, which contains the actual header files.
if(${QT_MAJOR_VERSION} GREATER_EQUAL 6)
- set(Qt6Core_DIRECT_INCLUDE_DIR Qt6Core_INCLUDE_DIRS)
- set(Qt6Gui_DIRECT_INCLUDE_DIR Qt6Gui_INCLUDE_DIRS)
- set(Qt6Widgets_DIRECT_INCLUDE_DIR Qt6Widgets_INCLUDE_DIRS)
+ set(Qt6Core_DIRECT_INCLUDE_DIR ${Qt6Core_INCLUDE_DIRS})
+ set(Qt6Gui_DIRECT_INCLUDE_DIR ${Qt6Gui_INCLUDE_DIRS})
+ set(Qt6Widgets_DIRECT_INCLUDE_DIR ${Qt6Widgets_INCLUDE_DIRS})
else()
list(GET Qt5Core_INCLUDE_DIRS 1 Qt5Core_DIRECT_INCLUDE_DIR)
list(GET Qt5Gui_INCLUDE_DIRS 1 Qt5Gui_DIRECT_INCLUDE_DIR)
diff --git a/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py b/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py
index 81a764986..55953ad69 100644
--- a/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py
+++ b/sources/pyside2/tests/pysidetest/new_inherited_functions_test.py
@@ -57,7 +57,6 @@ new_functions = """
"""
new_functions += """
- PySide2.QtGui.QBitmap().transformed(qMatrix,transformationMode)
PySide2.QtGui.QStandardItemModel().insertColumn(int,qModelIndex)
PySide2.QtGui.QStandardItemModel().parent()
# PySide2.QtGui.QTextList(qTextDocument).setFormat(qTextFormat) # Segmentation fault: 11
@@ -71,8 +70,6 @@ new_functions += """
PySide2.QtWidgets.QApplication.setPalette(qPalette)
PySide2.QtWidgets.QBoxLayout(direction).addWidget(qWidget)
PySide2.QtWidgets.QColorDialog().open()
- PySide2.QtWidgets.QDirModel().index(int,int,qModelIndex)
- PySide2.QtWidgets.QDirModel().parent()
PySide2.QtWidgets.QFileDialog().open()
PySide2.QtWidgets.QFileSystemModel().index(int,int,qModelIndex)
PySide2.QtWidgets.QFileSystemModel().parent()
@@ -145,7 +142,6 @@ class MainTest(unittest.TestCase):
try:
PySide2.QtGui
#qPaintDevice = PySide2.QtGui.QPaintDevice() # NotImplementedError
- qMatrix = PySide2.QtGui.QMatrix()
qTextDocument = PySide2.QtGui.QTextDocument()
qTextFormat = PySide2.QtGui.QTextFormat()
quintptr = long(42) if sys.version_info[0] < 3 else 42
@@ -158,7 +154,7 @@ class MainTest(unittest.TestCase):
direction = PySide2.QtWidgets.QBoxLayout.Direction()
qWidget = PySide2.QtWidgets.QWidget()
qStyleOptionFrame = PySide2.QtWidgets.QStyleOptionFrame()
- qAction = PySide2.QtWidgets.QAction(qObject)
+ qAction = PySide2.QtGui.QAction(qObject)
renderFlags = PySide2.QtWidgets.QWidget.RenderFlags
except AttributeError:
pass
diff --git a/sources/pyside2/tests/tools/list-class-hierarchy.py b/sources/pyside2/tests/tools/list-class-hierarchy.py
index b734ae69e..70075b27e 100755
--- a/sources/pyside2/tests/tools/list-class-hierarchy.py
+++ b/sources/pyside2/tests/tools/list-class-hierarchy.py
@@ -87,7 +87,6 @@ if __name__=='__main__':
'QtSvg',
'QtTest',
#'QtUiTools',
- 'QtWebKit',
'QtXml',
'QtXmlPatterns' ]
diff --git a/sources/pyside2/tests/util/module_wrapper/PySide/QtWebKit.py b/sources/pyside2/tests/util/module_wrapper/PySide/QtWebKit.py
deleted file mode 100644
index bffc79968..000000000
--- a/sources/pyside2/tests/util/module_wrapper/PySide/QtWebKit.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from PyQt4.QtWebKit import *