remove QEXPECT_FAILS from tst_qwidget
authorJoerg Bornemann <joerg.bornemann@nokia.com>
Mon, 9 Jul 2012 07:55:10 +0000 (09:55 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 9 Jul 2012 08:50:34 +0000 (10:50 +0200)
Task-number: QTBUG-26420

Change-Id: Ic4cb725cda418bfb427e7d834c0e07c2543d408d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

index 4ea6d49..fb2b66f 100644 (file)
@@ -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);