AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove insignification of QMdiArea test on Mac OS X.

Browse Source 
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>
This commit is contained in:
Jason McDonald 2012-04-20 01:12:22 +10:00 committed by Qt by Nokia
parent fe7c600fab
commit 1779c249c7
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro
View File

@ -12,4 +12,4 @@ mac {
LIBS += -framework Security
}
CONFIG+=insignificant_test # QTBUG-25298
!mac:CONFIG+=insignificant_test # QTBUG-25298

15
tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
View File

@ -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);