Remove insignification of QMdiArea test on Mac OS X.

This test has only stable failures on Mac.  Mark those failures with
QEXPECT_FAIL and re-enable the test.

Task-number: QTBUG-25298
Change-Id: I1c768226dfeb9307386e8853091baa68936bed29
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>

diff --git a/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro
index 4113e45..e2a8d2f 100644 (file)
--- a/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro
+++ b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro
@@ -12,4 +12,4 @@ mac {
     LIBS += -framework Security
 }
 
-CONFIG+=insignificant_test # QTBUG-25298
+!mac:CONFIG+=insignificant_test # QTBUG-25298

diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index eeb2eea..c1cfe46 100644 (file)
--- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -530,6 +530,9 @@ void tst_QMdiArea::subWindowActivated2()
 #ifdef Q_OS_WINCE
     QSKIP("Not fixed yet. See Task 197453");
 #endif
+#ifdef Q_OS_MAC
+    QEXPECT_FAIL("", "QTBUG-25298", Abort);
+#endif
     QTRY_COMPARE(spy.count(), 1);
     QVERIFY(!mdiArea.activeSubWindow());
     QCOMPARE(mdiArea.currentSubWindow(), activeSubWindow);
@@ -1756,6 +1759,9 @@ void tst_QMdiArea::tileSubWindows()
 #ifdef Q_OS_WINCE
     QSKIP("Not fixed yet! See task 197453");
 #endif
+#ifdef Q_OS_MAC
+    QEXPECT_FAIL("", "QTBUG-25298", Abort);
+#endif
     QTRY_COMPARE(workspace.viewport()->rect().size(), expectedViewportSize);
 
     // Not enough space for all sub-windows to be visible -> provide scroll bars.
@@ -1825,6 +1831,9 @@ void tst_QMdiArea::cascadeAndTileSubWindows()
         titleBarHeight -= 4;
     const QFontMetrics fontMetrics = QFontMetrics(QApplication::font("QMdiSubWindowTitleBar"));
     const int dy = qMax(titleBarHeight - (titleBarHeight - fontMetrics.height()) / 2, 1);
+#ifdef Q_OS_MAC
+    QEXPECT_FAIL("", "QTBUG-25298", Abort);
+#endif
     QCOMPARE(windows.at(2)->geometry().top() - windows.at(1)->geometry().top(), dy);
 
     for (int i = 0; i < windows.count(); ++i) {
@@ -2286,6 +2295,9 @@ void tst_QMdiArea::setActivationOrder()
     QVERIFY(verifyArrangement(&mdiArea, Tiled, expectedTileIndices));
 
     mdiArea.cascadeSubWindows();
+#ifdef Q_OS_MAC
+    QEXPECT_FAIL("", "QTBUG-25298", Abort);
+#endif
     QVERIFY(verifyArrangement(&mdiArea, Cascaded, expectedCascadeIndices));
     QTest::qWait(100);
 
@@ -2333,6 +2345,9 @@ void tst_QMdiArea::tabBetweenSubWindows()
     QCOMPARE(spy.count(), 0);
 
     // Walk through the entire list of sub windows.
+#ifdef Q_OS_MAC
+    QEXPECT_FAIL("", "QTBUG-25298", Abort);
+#endif
     QVERIFY(tabBetweenSubWindowsIn(&mdiArea));
     QCOMPARE(mdiArea.activeSubWindow(), subWindows.back());
     QCOMPARE(spy.count(), 0);