summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-04-20 01:12:22 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-23 19:20:19 +0200
commit1779c249c7afdf6ce9683a7578e4cbb5c5ab3458 (patch)
treec4a7bf651d862fca9f9f432f226f87672a4b325f /tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
parentfe7c600fabdfb1b4cbad624ce7cb736e5edce86d (diff)
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>
Diffstat (limited to 'tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp')
-rw-r--r--tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index eeb2eea9a1..c1cfe461c1 100644
--- 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);