From d01b5005ba72a8e8953f4d8a9a07d26b034be3b3 2012-05-07 08:57:44
From: Jani Honkonen <jani.honkonen@digia.com>
Date: 2012-05-07 08:57:44
Subject: [PATCH] Another miserable attempt to fix pie hover auto tests in bamboo

---

diff --git a/test/auto/qpieseries/tst_qpieseries.cpp b/test/auto/qpieseries/tst_qpieseries.cpp
index 5c832aa..707ab8f 100644
--- a/test/auto/qpieseries/tst_qpieseries.cpp
+++ b/test/auto/qpieseries/tst_qpieseries.cpp
@@ -281,8 +281,7 @@ void tst_qpieseries::clickedSignal()
     // simulate clicks
     // pie rectangle: QRectF(60,60 121x121)
     QTest::mouseClick(view.viewport(), Qt::LeftButton, 0,  QPoint(139, 85)); // inside slice 1
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    QCOMPARE(clickSpy1.count(), 1);
+    TRY_COMPARE(clickSpy1.count(), 1);
     QCOMPARE(qvariant_cast<QPieSlice*>(clickSpy1.at(0).at(0)), s1);
 }
 
@@ -310,15 +309,13 @@ void tst_qpieseries::hoverSignal()
     // pie rectangle: QRectF(60,60 121x121)
     QSignalSpy hoverSpy(series, SIGNAL(hovered(QPieSlice*,bool)));
     QTest::mouseMove(view.viewport(), QPoint(139, 85));
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    QCOMPARE(hoverSpy.count(), 1);
+    TRY_COMPARE(hoverSpy.count(), 1);
     QCOMPARE(qvariant_cast<QPieSlice*>(hoverSpy.at(0).at(0)), s1);
     QCOMPARE(qvariant_cast<bool>(hoverSpy.at(0).at(1)), true);
 
     // move outside the slice
     QTest::mouseMove(view.viewport(), QPoint(200, 0));
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    QCOMPARE(hoverSpy.count(), 2);
+    TRY_COMPARE(hoverSpy.count(), 2);
     QCOMPARE(qvariant_cast<QPieSlice*>(hoverSpy.at(1).at(0)), s1);
     QCOMPARE(qvariant_cast<bool>(hoverSpy.at(1).at(1)), false);
 }
diff --git a/test/auto/qpieslice/tst_qpieslice.cpp b/test/auto/qpieslice/tst_qpieslice.cpp
index 8a1c420..5d5d566 100644
--- a/test/auto/qpieslice/tst_qpieslice.cpp
+++ b/test/auto/qpieslice/tst_qpieslice.cpp
@@ -249,19 +249,16 @@ void tst_qpieslice::mouseHover()
     // pie rectangle: QRectF(60,60 121x121)
     QSignalSpy hoverSpy(s1, SIGNAL(hovered(bool)));
     QTest::mouseMove(view.viewport(), QPoint(170, 70));
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    QCOMPARE(hoverSpy.count(), 0);
+    TRY_COMPARE(hoverSpy.count(), 0);
 
     // move inside the slice
     QTest::mouseMove(view.viewport(), QPoint(139, 85));
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    QCOMPARE(hoverSpy.count(), 1);
+    TRY_COMPARE(hoverSpy.count(), 1);
     QCOMPARE(qvariant_cast<bool>(hoverSpy.at(0).at(0)), true);
 
     // move outside the slice
     QTest::mouseMove(view.viewport(), QPoint(200, 0));
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 1000);
-    QCOMPARE(hoverSpy.count(), 2);
+    TRY_COMPARE(hoverSpy.count(), 2);
     QCOMPARE(qvariant_cast<bool>(hoverSpy.at(1).at(0)), false);
 }