summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-04-19 23:59:08 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-19 19:46:07 +0200
commit5fc7490f9577798a96d2ce3c21b35f7386796fc9 (patch)
treed1cf74cca48fd9eaab305df6d126bce2813f866d /tests/auto/widgets
parent7d422688c27bfcaa1e65892ecd92f4b1f4fe566a (diff)
Remove insignification from QMdiSubWindow test on Mac OS X.
This test has four stable failures. Mark those with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-25297 Change-Id: Ic5304443c4467c46f70ef033c8f17d7f3732294c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r--tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro3
-rw-r--r--tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp12
2 files changed, 12 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro
index 74246c5586..4299f7711e 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro
+++ b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro
@@ -4,6 +4,3 @@ QT += widgets testlib
INCLUDEPATH += .
SOURCES += tst_qmdisubwindow.cpp
DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
-
-
-mac*:CONFIG+=insignificant_test # QTBUG-25297
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index bc5100f118..79afd14481 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -610,6 +610,9 @@ void tst_QMdiSubWindow::showShaded()
else
#endif
mouseReceiver = window;
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "QTBUG-25297", Abort);
+#endif
QVERIFY(mouseReceiver);
sendMouseMove(mouseReceiver, mousePosition, Qt::NoButton);
sendMousePress(mouseReceiver, mousePosition);
@@ -724,6 +727,9 @@ void tst_QMdiSubWindow::setOpaqueResizeAndMove()
mouseReceiver = qFindChild<QSizeGrip *>(window);
else
mouseReceiver = window;
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "QTBUG-25297", Abort);
+#endif
QVERIFY(mouseReceiver);
// ----------------------------- resize -----------------------------
@@ -1432,6 +1438,9 @@ void tst_QMdiSubWindow::defaultSizeGrip()
// QSizeGrip on windows with decoration.
QMdiSubWindow *windowWithDecoration = mdiArea.addSubWindow(new QWidget);
windowWithDecoration->show();
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "QTBUG-25297", Abort);
+#endif
QVERIFY(qFindChild<QSizeGrip *>(windowWithDecoration));
// ...but not on windows without decoration (Qt::FramelessWindowHint).
@@ -1699,6 +1708,9 @@ void tst_QMdiSubWindow::fixedMinMaxSize()
// to minimize the window.
subWindow->showMinimized();
QVERIFY(subWindow->isMinimized());
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "QTBUG-25297", Abort);
+#endif
QCOMPARE(subWindow->size(), minimizedSize);
QCOMPARE(subWindow->minimumSize(), minimizedSize);