Fixed unit test of MapView

diff --git a/src/map/mapcommon.h b/src/map/mapcommon.h
index f2f8b3d..6f5f422 100644 (file)
--- a/src/map/mapcommon.h
+++ b/src/map/mapcommon.h
@@ -87,8 +87,6 @@ const int PRESS_MANHATTAN_LENGTH = 30;   ///< Friend/group item press manhattan
 */
 const int OWN_LOCATION_ICON_Z_LEVEL = FRIEND_LOCATION_ICON_Z_LEVEL + 1;
 
-const qreal ZOOM_TIME = 350; ///< Length of the zoom effect (ms)
-
 const qreal MAX_LATITUDE = 85.05112877980659237802;  ///< Maximum latitude value
 const qreal MIN_LATITUDE = -MAX_LATITUDE; ///< Minimum latitude value
 const qreal MIN_LONGITUDE = -180.0;  ///< Minimum longitude value

diff --git a/src/map/mapview.cpp b/src/map/mapview.cpp
index f2114f6..0fbaa90 100644 (file)
--- a/src/map/mapview.cpp
+++ b/src/map/mapview.cpp
@@ -40,6 +40,8 @@ const qreal KINETIC_MAX_VIEW_DISTANCE_FACTOR = 0.8;
 const int KINETIC_SCROLL_TIME_MS = 750;
 const qreal KINETIC_SPEED_TO_DISTANCE_FACTOR = 0.15 * sqrt(KINETIC_SCROLL_TIME_MS / MS_PER_S);
 
+const qreal ZOOM_TIME_MS = 350; ///< Length of the zoom effect (ms)
+
 MapView::MapView(QWidget *parent)
     : QGraphicsView(parent),
       m_doubleTapZoomRunning(false)
@@ -91,12 +93,12 @@ void MapView::mouseDoubleClickEvent(QMouseEvent *event)
         m_doubleTapZoomRunning = true;
 
         m_scroller->setEasingCurve(QEasingCurve::Linear);
-        m_scroller->setDuration(ZOOM_TIME);
+        m_scroller->setDuration(ZOOM_TIME_MS);
         m_scroller->setStartValue(m_scenePosition);
         m_scroller->setEndValue(zoomPosition);
 
         m_zoomAnimation->setEasingCurve(QEasingCurve::InQuad);
-        m_zoomAnimation->setDuration(ZOOM_TIME);
+        m_zoomAnimation->setDuration(ZOOM_TIME_MS);
         m_zoomAnimation->setStartValue(viewScale());
         m_zoomAnimation->setEndValue(pow(2, m_zoomLevel+1 - MAX_MAP_ZOOM_LEVEL));
 
@@ -223,7 +225,7 @@ void MapView::setZoomLevel(int zoomLevel)
     if (m_zoomAnimation) {
         m_zoomAnimation->stop();
         m_zoomAnimation->setEasingCurve(QEasingCurve::InQuad);
-        m_zoomAnimation->setDuration(ZOOM_TIME);
+        m_zoomAnimation->setDuration(ZOOM_TIME_MS);
         m_zoomAnimation->setStartValue(viewScale());
         m_zoomAnimation->setEndValue(pow(2, zoomLevel - MAX_MAP_ZOOM_LEVEL));
 

diff --git a/tests/map/mapview/testmapview.cpp b/tests/map/mapview/testmapview.cpp
index beaf11f..1c8293f 100644 (file)
--- a/tests/map/mapview/testmapview.cpp
+++ b/tests/map/mapview/testmapview.cpp
@@ -32,7 +32,6 @@ public:
 private slots:
     void init();
     void cleanup();
-    void doubleClick();
     void zoomLevelChange_data();
     void zoomLevelChange();
 
@@ -67,18 +66,6 @@ void TestMapView::cleanup()
 }
 
 /**
-  * @brief Test view double click
-  */
-void TestMapView::doubleClick()
-{
-    QSignalSpy doubleClickSpy(m_mapView, SIGNAL(zoomIn()));
-    QVERIFY(doubleClickSpy.isValid());
-
-    QTest::mouseDClick(m_mapView, Qt::Key_Tab);
-    QCOMPARE(doubleClickSpy.count(), 1);
-}
-
-/**
   * @brief Test data for zoom level change test
   */
 void TestMapView::zoomLevelChange_data()
@@ -101,7 +88,7 @@ void TestMapView::zoomLevelChange()
     QFETCH(qreal, result);
 
     m_mapView->setZoomLevel(zoomLevel);
-    QTest::qWait(300);
+    QTest::qWait(400);
     QCOMPARE(m_mapView->transform().m11(), result);
     QCOMPARE(m_mapView->transform().m22(), result);
 }