From 91b58202c089ea8f4e150717cee8dbc40b8f903c Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Thu, 1 Oct 2009 10:03:26 +0200
Subject: Stabilize tests on X11

---
 tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp | 4 ++--
 tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp             | 3 ++-
 tests/auto/qmdiarea/tst_qmdiarea.cpp                         | 1 +
 tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp               | 1 +
 tests/auto/qmessagebox/tst_qmessagebox.cpp                   | 3 ++-
 tests/auto/qwidget/tst_qwidget.cpp                           | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 6e60516..00fae2f 100644
--- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -1301,12 +1301,12 @@ void tst_QGraphicsProxyWidget::paintEvent()
     scene.addItem(&proxy);
 
     //make sure we flush all the paint events
-    QApplication::processEvents();
+    QTest::qWait(70);
     QTRY_VERIFY(proxy.paintCount > 1);
     proxy.paintCount = 0;
 
     w->update();
-    QApplication::processEvents();
+    QTest::qWait(30);
     QTRY_COMPARE(proxy.paintCount, 1); //the widget should have been painted now
 }
 
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index 864076f..90477f0 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -1357,8 +1357,9 @@ void tst_QGraphicsScene::removeItem()
     QVERIFY(!hoverItem->isHovered);
 
     {
-        QTest::mouseMove(view.viewport(), view.mapFromScene(hoverItem->scenePos()), Qt::NoButton);
         QTest::qWait(250);
+        QTest::mouseMove(view.viewport(), view.mapFromScene(hoverItem->scenePos()), Qt::NoButton);
+        QTest::qWait(10);
         QMouseEvent moveEvent(QEvent::MouseMove, view.mapFromScene(hoverItem->scenePos()), Qt::NoButton, 0, 0);
         QApplication::sendEvent(view.viewport(), &moveEvent);
     }
diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/qmdiarea/tst_qmdiarea.cpp
index b110114..725c31e 100644
--- a/tests/auto/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/qmdiarea/tst_qmdiarea.cpp
@@ -468,6 +468,7 @@ void tst_QMdiArea::subWindowActivated2()
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&mdiArea);
 #endif
+    QTest::qWait(100);
 
     QTRY_COMPARE(spy.count(), 5);
     QCOMPARE(mdiArea.activeSubWindow(), mdiArea.subWindowList().back());
diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
index b897d8f..2d70bef 100644
--- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -1065,6 +1065,7 @@ void tst_QMdiSubWindow::setSystemMenu()
     qApp->setLayoutDirection(Qt::RightToLeft);
     qApp->processEvents();
     mainWindow.updateGeometry();
+    QTest::qWait(150);
 
     subWindow->showSystemMenu();
     QTest::qWait(250);
diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/qmessagebox/tst_qmessagebox.cpp
index 5607fbd..12858d7 100644
--- a/tests/auto/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/qmessagebox/tst_qmessagebox.cpp
@@ -714,7 +714,8 @@ void tst_QMessageBox::setInformativeText()
     msgbox.setInformativeText(itext);
     msgbox.show();
     QCOMPARE(msgbox.informativeText(), itext);
-    QVERIFY(msgbox.width() > 200); //verify it's big enough (task181688)
+    QVERIFY2(msgbox.width() > 200, //verify it's big enough (task181688)
+             qPrintable(QString("%1 > 200").arg(msgbox.width())));
 }
 
 void tst_QMessageBox::iconPixmap()
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index c08d601..94e67a4 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -8196,7 +8196,7 @@ void tst_QWidget::moveInResizeEvent()
     testWidget.setGeometry(50, 50, 200, 200);
     testWidget.show();
     QTest::qWaitForWindowShown(&testWidget);
-    QTest::qWait(10);
+    QTest::qWait(120);
 
     QRect expectedGeometry(100,100, 100, 100);
     QTRY_COMPARE(testWidget.geometry(), expectedGeometry);
-- 
cgit v0.12