diff options
Diffstat (limited to 'sources/pyside2/tests')
| -rw-r--r-- | sources/pyside2/tests/QtCore/feature_with_uic_test.py | 2 | ||||
| -rw-r--r-- | sources/pyside2/tests/QtGui/qrasterwindow_test.py | 28 | ||||
| -rw-r--r-- | sources/pyside2/tests/pysidetest/enum_test.py | 24 |
3 files changed, 27 insertions, 27 deletions
diff --git a/sources/pyside2/tests/QtCore/feature_with_uic_test.py b/sources/pyside2/tests/QtCore/feature_with_uic_test.py index 5b61a4afb..64a620be8 100644 --- a/sources/pyside2/tests/QtCore/feature_with_uic_test.py +++ b/sources/pyside2/tests/QtCore/feature_with_uic_test.py @@ -46,7 +46,7 @@ init_test_paths(False) from helper.usesqapplication import UsesQApplication -from PySide2.QtCore import QLibraryInfo, qVersion +from PySide2.QtCore import QCoreApplication, QLibraryInfo, qVersion from PySide2.QtWidgets import QApplication, QMainWindow if sys.version_info[0] >= 3: diff --git a/sources/pyside2/tests/QtGui/qrasterwindow_test.py b/sources/pyside2/tests/QtGui/qrasterwindow_test.py index f18ceaaf4..1776e5efb 100644 --- a/sources/pyside2/tests/QtGui/qrasterwindow_test.py +++ b/sources/pyside2/tests/QtGui/qrasterwindow_test.py @@ -40,27 +40,6 @@ from helper.usesqapplication import UsesQApplication from PySide2.QtCore import QEvent, QPoint, QRect, QSize, QTimer, Qt from PySide2.QtGui import QColor, QBackingStore, QPaintDevice, QPainter, QWindow, QPaintDeviceWindow, QRasterWindow, QRegion, QStaticText -# QWindow rendering via QBackingStore -class TestBackingStoreWindow(QWindow): - def __init__(self): - super(TestBackingStoreWindow, self).__init__() - self.backingStore = QBackingStore(self) - self.text = QStaticText("BackingStoreWindow") - - def event(self, event): - if event.type() == QEvent.Resize: - self.backingStore.resize(self.size()) - self.render() - elif event.type() == QEvent.UpdateRequest or event.type() == QEvent.Expose: - self.backingStore.flush(QRegion(QRect(QPoint(0, 0), self.size()))) - - return QWindow.event(self, event) - - def render(self): - clientRect = QRect(QPoint(0, 0), self.size()) - painter = QPainter(self.backingStore.paintDevice()) - painter.fillRect(clientRect, QColor(Qt.green)) - painter.drawStaticText(QPoint(10, 10), self.text) # Window using convenience class QRasterWindow class TestRasterWindow(QRasterWindow): @@ -74,19 +53,16 @@ class TestRasterWindow(QRasterWindow): painter.fillRect(clientRect, QColor(Qt.red)) painter.drawStaticText(QPoint(10, 10), self.text) + class QRasterWindowTest(UsesQApplication): def test(self): rasterWindow = TestRasterWindow() rasterWindow.setFramePosition(QPoint(100, 100)) rasterWindow.resize(QSize(400, 400)) rasterWindow.show() - backingStoreWindow = TestBackingStoreWindow() - backingStoreWindow.setFramePosition(QPoint(600, 100)) - backingStoreWindow.resize(QSize(400, 400)) - backingStoreWindow.show() - QTimer.singleShot(100, self.app.quit) self.app.exec_() + if __name__ == '__main__': unittest.main() diff --git a/sources/pyside2/tests/pysidetest/enum_test.py b/sources/pyside2/tests/pysidetest/enum_test.py index d179d6248..a9396383e 100644 --- a/sources/pyside2/tests/pysidetest/enum_test.py +++ b/sources/pyside2/tests/pysidetest/enum_test.py @@ -36,6 +36,7 @@ sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) from init_paths import init_test_paths init_test_paths(True) +from PySide2.QtCore import Qt from testbinding import Enum1, TestObjectWithoutNamespace class ListConnectionTest(unittest.TestCase): @@ -46,6 +47,29 @@ class ListConnectionTest(unittest.TestCase): self.assertEqual(TestObjectWithoutNamespace.Enum2.Option3, 3) self.assertEqual(TestObjectWithoutNamespace.Enum2.Option4, 4) + def testFlagComparisonOperators(self): # PYSIDE-1696, compare to self + f1 = Qt.AlignHCenter | Qt.AlignBottom + f2 = Qt.AlignHCenter | Qt.AlignBottom + self.assertTrue(f1 == f1) + self.assertTrue(f1 <= f1) + self.assertTrue(f1 >= f1) + self.assertFalse(f1 != f1) + self.assertFalse(f1 < f1) + self.assertFalse(f1 > f1) + + self.assertTrue(f1 == f2) + self.assertTrue(f1 <= f2) + self.assertTrue(f1 >= f2) + self.assertFalse(f1 != f2) + self.assertFalse(f1 < f2) + self.assertFalse(f1 > f2) + + self.assertTrue(Qt.AlignHCenter < Qt.AlignBottom) + self.assertFalse(Qt.AlignHCenter > Qt.AlignBottom) + self.assertFalse(Qt.AlignBottom < Qt.AlignHCenter) + self.assertTrue(Qt.AlignBottom > Qt.AlignHCenter) + + if __name__ == '__main__': unittest.main() |