From 17fb919aec3a12007c527ff1fccd489ed6325662 2012-09-18 10:52:43
From: Jani Honkonen <jani.honkonen@digia.com>
Date: 2012-09-18 10:52:43
Subject: [PATCH] yet another feeble attempt to make bamboo tests pass

---

diff --git a/tests/auto/qchartview/tst_qchartview.cpp b/tests/auto/qchartview/tst_qchartview.cpp
index 7a2541e..828c9f7 100644
--- a/tests/auto/qchartview/tst_qchartview.cpp
+++ b/tests/auto/qchartview/tst_qchartview.cpp
@@ -143,6 +143,7 @@ void tst_QChartView::rubberBand()
     m_view->chart()->addSeries(line);
     m_view->chart()->createDefaultAxes();
     m_view->show();
+    QTest::qWaitForWindowShown(m_view);
 
     QRectF plotArea = m_view->chart()->plotArea();
     //this is hack since view does not get events otherwise
@@ -152,24 +153,25 @@ void tst_QChartView::rubberBand()
     QSignalSpy spy0(axisY, SIGNAL(rangeChanged(qreal,qreal)));
     QAbstractAxis* axisX = m_view->chart()->axisX();
     QSignalSpy spy1(axisX, SIGNAL(rangeChanged(qreal,qreal)));
-
-
     QValueAxis* vaxisX = qobject_cast<QValueAxis*>(axisX);
     QValueAxis* vaxisY = qobject_cast<QValueAxis*>(axisY);
-
     int minX = vaxisX->min();
     int minY = vaxisY->min();
     int maxX = vaxisX->max();
     int maxY = vaxisY->max();
 
-    QTest::qWaitForWindowShown(m_view);
-    QTest::mouseMove(m_view->viewport(),  min + plotArea.topLeft().toPoint());
-    QTest::qWait(2000);
-    QTest::mousePress(m_view->viewport(), Qt::LeftButton, 0,  min + plotArea.topLeft().toPoint());
-    QTest::qWait(2000);
-    QTest::mouseMove(m_view->viewport(),  plotArea.bottomRight().toPoint() - max);
-    QTest::qWait(2000);
-    QTest::mouseRelease(m_view->viewport(), Qt::LeftButton, 0, plotArea.bottomRight().toPoint() - max);
+    // try to ensure focus
+    QApplication::setActiveWindow(m_view);
+    m_view->setFocus();
+    QApplication::processEvents();
+    QVERIFY(m_view->isActiveWindow());
+    QVERIFY(m_view->hasFocus());
+
+    QTest::mouseMove(m_view->viewport(),  min + plotArea.topLeft().toPoint(), 100);
+    QTest::mousePress(m_view->viewport(), Qt::LeftButton, 0,  min + plotArea.topLeft().toPoint(), 100);
+    QTest::mouseMove(m_view->viewport(),  plotArea.bottomRight().toPoint() - max, 100);
+    QTest::mouseRelease(m_view->viewport(), Qt::LeftButton, 0, plotArea.bottomRight().toPoint() - max, 100);
+    QApplication::processEvents();
 
     TRY_COMPARE(spy0.count(), Xcount);
     TRY_COMPARE(spy1.count(), Ycount);
diff --git a/tests/auto/qpieseries/tst_qpieseries.cpp b/tests/auto/qpieseries/tst_qpieseries.cpp
index 6fda521..9245019 100644
--- a/tests/auto/qpieseries/tst_qpieseries.cpp
+++ b/tests/auto/qpieseries/tst_qpieseries.cpp
@@ -563,6 +563,13 @@ void tst_qpieseries::hoverSignal()
     m_view->show();
     QTest::qWaitForWindowShown(m_view);
 
+    // try to ensure focus
+    QApplication::setActiveWindow(m_view);
+    m_view->setFocus();
+    QApplication::processEvents();
+    QVERIFY(m_view->isActiveWindow());
+    QVERIFY(m_view->hasFocus());
+
     // move inside the slices
     m_series->setPieSize(1.0);
     QRectF pieRect = m_view->chart()->plotArea();
diff --git a/tests/auto/qpieslice/tst_qpieslice.cpp b/tests/auto/qpieslice/tst_qpieslice.cpp
index b473678..20dc40d 100644
--- a/tests/auto/qpieslice/tst_qpieslice.cpp
+++ b/tests/auto/qpieslice/tst_qpieslice.cpp
@@ -281,6 +281,13 @@ void tst_qpieslice::hoverSignal()
     view.show();
     QTest::qWaitForWindowShown(&view);
 
+    // try to ensure focus
+    QApplication::setActiveWindow(&view);
+    view.setFocus();
+    QApplication::processEvents();
+    QVERIFY(view.isActiveWindow());
+    QVERIFY(view.hasFocus());
+
     // move inside the slices
     series->setPieSize(1.0);
     QRectF pieRect = view.chart()->plotArea();