diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-31 17:44:11 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-01 04:58:51 +0100 |
| commit | ceb4dd4b541cfec1ad4f213a4da27079619d8529 (patch) | |
| tree | efc73518beac4864057368ce51fcb39964b57e7c /tests | |
| parent | 3e05a987b1fc9d72aeb8447499d51a7b0174a8e7 (diff) | |
Improve QWidget autotest
There are two cases where a QCOMPARE may fail on some platforms. Rather
than disabling the QCOMPAREs with "#if 0", use QEXPECT_FAIL so that we
can look in the CI logs to see which platforms fail.
Change-Id: Ife93c8032e01a04e8068bf213e2040778c12f711
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index c508c15a88..3cd656dc44 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -1932,10 +1932,10 @@ void tst_QWidget::showMaximized() QVERIFY(!(layouted.windowState() & Qt::WindowMaximized)); // ### fixme: embedded may choose a different size to fit on the screen. - // Check platforms (QTBUG-22326) -#if 0 + if (layouted.size() != layouted.sizeHint()) + QEXPECT_FAIL("", "QTBUG-22326", Continue); QCOMPARE(layouted.size(), layouted.sizeHint()); -#endif + layouted.showMaximized(); QVERIFY(layouted.isMaximized()); QVERIFY(layouted.isVisible()); @@ -2009,10 +2009,10 @@ void tst_QWidget::showFullScreen() layouted.showNormal(); QVERIFY(!(layouted.windowState() & Qt::WindowFullScreen)); - // ### fixme: embedded may choose a different size to fit on the screen. (QTBUG-22326) -#if 0 + // ### fixme: embedded may choose a different size to fit on the screen. + if (layouted.size() != layouted.sizeHint()) + QEXPECT_FAIL("", "QTBUG-22326", Continue); QCOMPARE(layouted.size(), layouted.sizeHint()); -#endif layouted.showFullScreen(); QVERIFY(layouted.isFullScreen()); |