diff options
Diffstat (limited to 'tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index 360e0c93c4..8b2f032172 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -30,6 +30,7 @@ #include <QtTest/QtTest> #include "qmdisubwindow.h" +#include "private/qmdisubwindow_p.h" #include "qmdiarea.h" #include <QLayout> @@ -517,6 +518,9 @@ void tst_QMdiSubWindow::emittingOfSignals() } } } +#ifdef Q_OS_WINRT + QEXPECT_FAIL("windowMaximized", "Broken on WinRT - QTBUG-68297", Abort); +#endif QCOMPARE(count, 1); window->setParent(0); @@ -542,6 +546,9 @@ void tst_QMdiSubWindow::showShaded() QVERIFY(QTest::qWaitForWindowExposed(&workspace)); QVERIFY(!window->isShaded()); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Windows are maximized per default on WinRt ", Abort); +#endif QVERIFY(!window->isMaximized()); QCOMPARE(window->size(), QSize(300, 300)); @@ -634,6 +641,10 @@ void tst_QMdiSubWindow::showNormal() qApp->processEvents(); window->showNormal(); qApp->processEvents(); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("showMinimized", "Windows are maximized per default on WinRt ", Abort); + QEXPECT_FAIL("showMaximized", "Windows are maximized per default on WinRt ", Abort); +#endif QCOMPARE(window->geometry(), originalGeometry); } @@ -713,7 +724,9 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove() resizeSpy.clear(); QCOMPARE(resizeSpy.count(), 0); - QTest::qWait(250); // delayed update of dirty regions + // we need to wait for the resizeTimer to make sure updateDirtyRegions is called + auto priv = static_cast<QMdiSubWindowPrivate*>(qt_widget_private(window)); + QTRY_COMPARE(priv->resizeTimerId, -1); // Enter resize mode. int offset = window->style()->pixelMetric(QStyle::PM_MDIFrameWidth) / 2; @@ -740,6 +753,9 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove() // Leave resize mode sendMouseRelease(mouseReceiver, mousePosition); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Fails on WinRT - QTBUG-68297", Abort); +#endif QCOMPARE(resizeSpy.count(), expectedGeometryCount); QCOMPARE(window->size(), windowSize + QSize(geometryCount, geometryCount)); } @@ -903,6 +919,9 @@ void tst_QMdiSubWindow::mouseDoubleClick() workspace.show(); window->show(); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Windows are maximized per default on WinRt ", Abort); +#endif QVERIFY(!window->isMaximized()); QVERIFY(!window->isShaded()); @@ -971,6 +990,9 @@ void tst_QMdiSubWindow::setSystemMenu() QVERIFY(!qApp->activePopupWidget()); subWindow->showSystemMenu(); QTRY_COMPARE(qApp->activePopupWidget(), qobject_cast<QWidget *>(systemMenu)); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Broken on WinRT - QTBUG-68297", Abort); +#endif QTRY_COMPARE(systemMenu->mapToGlobal(QPoint(0, 0)), (globalPopupPos = subWindow->mapToGlobal(subWindow->contentsRect().topLeft())) ); @@ -1196,6 +1218,9 @@ void tst_QMdiSubWindow::restoreFocusOverCreation() QTRY_COMPARE(QApplication::focusWidget(), subWidget2->m_lineEdit1); mdiArea.setActiveSubWindow(subWindow1); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Broken on WinRt - QTBUG-68297", Abort); +#endif QTRY_COMPARE(QApplication::focusWidget(), subWidget1->m_lineEdit2); } @@ -1404,6 +1429,9 @@ void tst_QMdiSubWindow::resizeEvents() QCOMPARE(window->widget()->windowState(), windowState); // Make sure we got as many resize events as expected. +#ifdef Q_OS_WINRT + QEXPECT_FAIL("maximized", "Broken on WinRT - QTBUG-68297", Abort); +#endif QCOMPARE(windowResizeEventSpy.count(), expectedWindowResizeEvents); QCOMPARE(widgetResizeEventSpy.count(), expectedWidgetResizeEvents); windowResizeEventSpy.clear(); @@ -1413,6 +1441,10 @@ void tst_QMdiSubWindow::resizeEvents() window->showNormal(); // Check that the window state is correct. +#ifdef Q_OS_WINRT + QEXPECT_FAIL("minimized", "Broken on WinRT - QTBUG-68297", Abort); + QEXPECT_FAIL("shaded", "Broken on WinRT - QTBUG-68297", Abort); +#endif QCOMPARE(window->windowState(), Qt::WindowNoState | Qt::WindowActive); QCOMPARE(window->widget()->windowState(), Qt::WindowNoState); @@ -1673,6 +1705,9 @@ void tst_QMdiSubWindow::fixedMinMaxSize() QCOMPARE(subWindow->maximumSize(), maximumSize); mdiArea.addSubWindow(subWindow); subWindow->show(); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Windows are maximized per default on WinRt ", Abort); +#endif QCOMPARE(subWindow->size(), minimumSize); // Calculate the size of a minimized sub window. @@ -2057,6 +2092,9 @@ void tst_QMdiSubWindow::testFullScreenState() subWindow->showFullScreen(); // QMdiSubWindow does not support the fullscreen state. This call // should be equivalent to setVisible(true) (and not showNormal()) QVERIFY(QTest::qWaitForWindowExposed(&mdiArea)); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Windows are maximized per default on WinRt ", Abort); +#endif QCOMPARE(subWindow->size(), QSize(300, 300)); } |