From 1779c249c7afdf6ce9683a7578e4cbb5c5ab3458 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 20 Apr 2012 01:12:22 +1000 Subject: 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 --- tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp') 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 @@ -529,6 +529,9 @@ void tst_QMdiArea::subWindowActivated2() #endif #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()); @@ -1755,6 +1758,9 @@ void tst_QMdiArea::tileSubWindows() const QSize expectedViewportSize(3 * minSize.width() + spacing, 3 * minSize.height() + spacing); #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); @@ -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); -- cgit v1.2.3