From 5b0273fc7a27785b6079a3b39681c3db22926742 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 9 Jul 2012 09:55:10 +0200 Subject: [PATCH] remove QEXPECT_FAILS from tst_qwidget Task-number: QTBUG-26420 Change-Id: Ic4cb725cda418bfb427e7d834c0e07c2543d408d Reviewed-by: Friedemann Kleint --- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 4ea6d4970a..fb2b66fe62 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -1783,21 +1783,12 @@ void tst_QWidget::windowState() widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized); QTest::qWait(100); -#ifdef Q_OS_WIN - QEXPECT_FAIL("", "QTBUG-26420", Continue); -#endif VERIFY_STATE((Qt::WindowFullScreen|Qt::WindowMinimized)); QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowMinimized); widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized); QTest::qWait(100); -#ifdef Q_OS_WIN - QEXPECT_FAIL("", "QTBUG-26420", Continue); -#endif VERIFY_STATE(Qt::WindowFullScreen); -#ifdef Q_OS_WIN - QEXPECT_FAIL("", "QTBUG-26420", Continue); -#endif QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowFullScreen); widget1.setWindowState(Qt::WindowNoState); @@ -1816,10 +1807,6 @@ void tst_QWidget::windowState() VERIFY_STATE((Qt::WindowFullScreen|Qt::WindowMaximized)); QCOMPARE(widget1.windowHandle()->windowState(), Qt::WindowFullScreen); -#ifdef Q_OS_WIN - QSKIP("QTBUG-26420"); -#endif - widget1.setWindowState(widget1.windowState() ^ Qt::WindowMinimized); QTest::qWait(100); VERIFY_STATE((Qt::WindowFullScreen|Qt::WindowMaximized|Qt::WindowMinimized)); @@ -2409,7 +2396,6 @@ void tst_QWidget::normalGeometry() QTRY_COMPARE(parent.geometry(), geom); QTRY_COMPARE(parent.normalGeometry(), geom); - QSKIP("QTBUG-26420"); parent.showNormal(); parent.setWindowState(Qt:: WindowFullScreen | Qt::WindowMaximized); parent.setWindowState(Qt::WindowMinimized | Qt:: WindowFullScreen | Qt::WindowMaximized);