QML Map pinch and flick part 1/3

Autotest fw changes. First autotests and related fixes.
Map initialization order changed to avoid blinking in hardcoded
geocoordinate during app startup.

Change-Id: Iaad879c135b6283957e0705b991474517f933485
Reviewed-by: David Laing <david.laing@nokia.com>

2 files changed, 100 insertions, 10 deletions

diff --git a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp
index c32c77ef..05c24287 100644
--- a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp
+++ b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator.cpp
@@ -120,8 +120,13 @@ void QDeclarativePinchGenerator::setEnabled(bool enabled)
 
 QTouchEvent::TouchPoint QDeclarativePinchGenerator::mouseEventToTouchPoint(QMouseEvent *event)
 {
+    return createTouchPoint(event->type(), event->pos());
+}
+
+QTouchEvent::TouchPoint QDeclarativePinchGenerator::createTouchPoint(QEvent::Type type, QPoint pos)
+{
     QTouchEvent::TouchPoint touchPoint;
-    switch (event->type()) {
+    switch (type) {
     //case QEvent::GraphicsSceneMousePress:
     case QEvent::MouseButtonPress:
         touchPoint.setState(Qt::TouchPointPressed);
@@ -140,10 +145,10 @@ QTouchEvent::TouchPoint QDeclarativePinchGenerator::mouseEventToTouchPoint(QMous
     //touchPoint.setId(touchPointId_++); // running number
     touchPoint.setId(0);
     touchPoint.setPressure(0.75);
-    touchPoint.setPos(event->pos());
-    touchPoint.setLastPos(event->pos());
-    touchPoint.setScenePos(target_->mapToScene(event->pos()));
-    touchPoint.setLastScenePos(target_->mapToScene(event->pos()));
+    touchPoint.setPos(pos);
+    touchPoint.setLastPos(pos);
+    touchPoint.setScenePos(target_->mapToScene(pos));
+    touchPoint.setLastScenePos(target_->mapToScene(pos));
     return touchPoint;
 }
 
@@ -434,6 +439,79 @@ Q_INVOKABLE void QDeclarativePinchGenerator::replay()
     setState(Replaying);
 }
 
+void QDeclarativePinchGenerator::pinch(QPoint point1From,
+                                       QPoint point1To,
+                                       QPoint point2From,
+                                       QPoint point2To,
+                                       int interval1,
+                                       int interval2,
+                                       int samples1,
+                                       int samples2)
+{
+    //qDebug() << __FUNCTION__ << point1From << point1To << point2From << point2To << interval1 << interval2 << samples1 << samples2 << state_;
+    Q_ASSERT(state_ == Idle);
+    //Q_ASSERT(!point1From.isNull());
+    //Q_ASSERT(!point1To.isNull());
+    //Q_ASSERT(!point2From.isNull());
+    //Q_ASSERT(!point2To.isNull());
+    Q_ASSERT(interval1 > 10);
+    Q_ASSERT(interval2 > 10);
+    Q_ASSERT(samples1 >= 2); // we need press and release events at minimum
+    Q_ASSERT(samples2 >= 2);
+
+    // generate swipes based on the parameters
+    if (!swipes_.isEmpty()) {
+        qDeleteAll(swipes_);
+        swipes_.clear();
+    }
+    generateSwipe(point1From, point1To, interval1, samples1);
+    generateSwipe(point2From, point2To, interval2, samples2);
+    Q_ASSERT(swipes_.at(0));
+    Q_ASSERT(swipes_.at(1));
+
+    if (swipes_.at(0)->touchPoints.count() >= swipes_.at(1)->touchPoints.count())
+        masterSwipe_ = 0;
+    else
+        masterSwipe_ = 1;
+    replayTimer_ = startTimer(swipes_.at(masterSwipe_)->touchPointDurations.at(0) / replaySpeedFactor_);
+    replayBookmark_ = 0;
+    setState(Replaying);
+}
+
+void QDeclarativePinchGenerator::generateSwipe(QPoint from, QPoint to, int interval, int samples)
+{
+    //qDebug() << __FUNCTION__ << "generate swipe from, to, interval, samplecount: " << from << to << interval << samples;
+    int deltaX = (to.x() - from.x()) / samples;
+    int deltaY = (to.y() - from.y()) / samples;
+    //qDebug() << __FUNCTION__ << "deltaX, deltaY: " << deltaX << deltaY;
+    Q_ASSERT(qAbs(deltaX) > 0 || qAbs(deltaY) > 0);
+
+    activeSwipe_ = new Swipe;
+    // create press event
+    activeSwipe_->touchPointDurations.append(interval);
+    activeSwipe_->totalDuration += interval;
+    activeSwipe_->touchPoints.append(createTouchPoint(QEvent::MouseButtonPress, from));
+    //qDebug() << __FUNCTION__ << "press X, Y: " << from.x() << from.y();
+
+    // create move events
+    for (int i = 1; i < samples - 1; ++i) {
+        activeSwipe_->touchPointDurations.append(interval);
+        activeSwipe_->totalDuration  += interval;
+        int nextX = from.x() + (i * deltaX);
+        int nextY = from.y() + (i * deltaY);
+        //qDebug() << __FUNCTION__ << "move X, Y: " << nextX << nextY;
+        activeSwipe_->touchPoints.append(createTouchPoint(QEvent::MouseMove, QPoint(nextX, nextY)));
+    }
+    // create release event
+    activeSwipe_->touchPointDurations.append(interval);
+    activeSwipe_->totalDuration += interval;
+    activeSwipe_->touchPoints.append(createTouchPoint(QEvent::MouseButtonRelease, to));
+    //qDebug() << __FUNCTION__ << "release X, Y: " << to.x() << to.y();
+
+    // append the swipe
+    swipes_.append(activeSwipe_);
+}
+
 Q_INVOKABLE void QDeclarativePinchGenerator::clear()
 {
     stop();
diff --git a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h
index 536d09f9..f3017903 100644
--- a/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h
+++ b/tests/plugins/declarativetestplugin/qdeclarativepinchgenerator_p.h
@@ -43,12 +43,13 @@
 #define QDECLARATIVEPINCHGENERATOR_H
 
 #include <QtDeclarative/QSGItem>
-#include <QMouseEvent>
-#include <QElapsedTimer>
-#include <QTouchEvent>
 #include <QSGCanvas>
-#include <QKeyEvent>
-#include <QList>
+#include <QtGui/QMouseEvent>
+#include <QtGui/QTouchEvent>
+#include <QtGui/QKeyEvent>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QList>
+#include <QtCore/QPoint>
 #include <QDebug>
 
 // how many concurrent "swipes" should we have
@@ -112,6 +113,15 @@ public:
     Q_INVOKABLE void clear();
     Q_INVOKABLE void stop();
 
+    // programmatic interface, useful for autotests
+    Q_INVOKABLE void pinch(QPoint point1From,
+                           QPoint point1To,
+                           QPoint point2From,
+                           QPoint point2To,
+                           int interval1 = 20,
+                           int interval2 = 20,
+                           int samples1 = 10,
+                           int samples2 = 10);
 signals:
     void stateChanged();
     void countChanged();
@@ -144,7 +154,9 @@ protected:
 private:
     void setState(GeneratorState state);
     QTouchEvent::TouchPoint mouseEventToTouchPoint(QMouseEvent* event);
+    QTouchEvent::TouchPoint createTouchPoint(QEvent::Type type, QPoint pos);
     QTouchEvent::TouchPoint convertToPrimary(QTouchEvent::TouchPoint original);
+    void generateSwipe(QPoint from, QPoint to, int duration, int samples);
 
 private:
     QSGItem* target_;