fix qml test import error

Author: ozguronsoy

include/SimpleMapView.h

@@ -70,6 +70,10 @@ class SimpleMapView : public SimpleMapViewBase
 		Resource
 	};
 
+#ifdef SIMPLE_MAP_VIEW_USE_QML
+	Q_ENUM(TileServerSource);
+#endif
+
 	explicit SimpleMapView(SimpleMapViewBase* parent = nullptr);
 	~SimpleMapView() = default;
 

tests/CMakeLists.txt

@@ -9,8 +9,16 @@ if(SIMPLE_MAP_VIEW_BUILD_QML)
         ../Resources.qrc
         SimpleMapViewQmlTest.cpp
     )
-    target_compile_definitions(SimpleMapViewTests PRIVATE QUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
-    target_link_libraries(SimpleMapViewTests PRIVATE Qt::QuickTest)
+    target_compile_definitions(
+        SimpleMapViewTests PRIVATE 
+        QUICK_TEST_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}" 
+        QML2_IMPORT_PATH="${CMAKE_BINARY_DIR}"
+    )
+    target_link_libraries(
+        SimpleMapViewTests PRIVATE 
+        SimpleMapViewplugin 
+        Qt::QuickTest
+    )
 
 else()
 
@@ -20,11 +28,13 @@ else()
         ../Resources.qrc
         SimpleMapViewWidgetTest.cpp
     )
-    target_link_libraries(SimpleMapViewTests PRIVATE Qt::Test)
+    target_link_libraries(
+        SimpleMapViewTests PRIVATE 
+        SimpleMapView
+        Qt::Test
+    )
 
 endif()
 
-target_link_libraries(SimpleMapViewTests PRIVATE SimpleMapView)
-
 include(CTest)
 add_test(NAME SimpleMapViewTests COMMAND SimpleMapViewTests)

tests/tst_SimpleMapView.qml

@@ -22,16 +22,13 @@ TestCase {
     function test_instantiation() {
         verify(map !== null, "SimpleMapView widget failed to instantiate.")
 
-        compare(map.tileServer, SimpleMapView.OSM, "Default `tileServer` should be OSM.")
-        compare(map.tileServerSource, SimpleMapView.Remote, "Default source should be Remote.")
+        compare(map.tileServer, TileServers.OSM, "Default `tileServer` should be OSM.")
+        compare(map.tileServerSource(), SimpleMapView.Remote, "Default source should be Remote.")
 
-        verify(!map.isZoomLocked, "Default `isZoomLocked` should be false")
-        verify(!map.isGeolocationLocked, "Default `isGeolocationLocked` should be false")
-        verify(!map.isMouseWheelZoomDisabled, "Default `isMouseWheelZoomDisabled` should be false")
-        verify(!map.isMouseMoveMapDisabled, "Default `isMouseMoveMapDisabled` should be false")
-
-        verify(map.markerIcon !== "", "Default marker icon should not be empty")
-        verify(map.markerIcon.toString().indexOf("marker.svg") >= 0, "Default marker icon path mismatch.")
+        verify(!map.isZoomLocked(), "Default `isZoomLocked` should be false")
+        verify(!map.isGeolocationLocked(), "Default `isGeolocationLocked` should be false")
+        verify(!map.isMouseWheelZoomDisabled(), "Default `isMouseWheelZoomDisabled` should be false")
+        verify(!map.isMouseMoveMapDisabled(), "Default `isMouseMoveMapDisabled` should be false")
     }
 
     function test_zoomLevel() {
@@ -66,25 +63,25 @@ TestCase {
         map.zoomLevel = 5
         zoomSpy.clear()
 
-        map.lockZoom()
+        map.lockZoom = true
         map.zoomLevel = 12
         compare(map.zoomLevel, 5, "Failed to lock zoom.")
         compare(zoomSpy.count, 0)
 
-        map.unlockZoom()
+        map.lockZoom = false
         map.zoomLevel = 12
         compare(map.zoomLevel, 12, "Failed to unlock zoom.")
         compare(zoomSpy.count, 1)
 
-        map.disableMouseWheelZoom()
-        verify(map.isMouseWheelZoomDisabled, "Failed to disable mouse wheel zoom.")
+        map.disableMouseWheelZoom = true
+        verify(map.isMouseWheelZoomDisabled(), "Failed to disable mouse wheel zoom.")
 
         preZoom = map.zoomLevel
         mouseWheel(map, map.width/2, map.height/2, 120, 120)
         compare(map.zoomLevel, preZoom, "Mouse wheel should be ignored when disabled.")
 
-        map.enableMouseWheelZoom()
-        verify(!map.isMouseWheelZoomDisabled, "Failed to enable mouse wheel zoom.")
+        map.disableMouseWheelZoom = false
+        verify(!map.isMouseWheelZoomDisabled(), "Failed to enable mouse wheel zoom.")
     }
 
     function test_positioning() {
@@ -107,35 +104,49 @@ TestCase {
 
         var startX = map.width / 2
         var startY = map.height / 2
-        
         var initialLon = map.longitude
         var initialLat = map.latitude
 
-        mouseDrag(map, startX, startY, startX - 100, startY) 
+        mousePress(map, startX, startY, Qt.LeftButton)
+        mouseMove(map, startX - 100, startY, 0, Qt.LeftButton)
+        mouseRelease(map, startX - 100, startY, Qt.LeftButton)
+
         verify(map.longitude > initialLon, "Failed to move map (Longitude) via mouse.")
-        verify(Math.abs(map.latitude - initialLat) < 0.0001, "Latitude should remain constant on horizontal drag.")
+        verify(map.latitude === initialLat, "Latitude should remain constant on horizontal drag.")
+
+        map.longitude = initialLon
+        map.latitude = initialLat
+
+        mousePress(map, startX, startY, Qt.LeftButton)
+        mouseMove(map, startX, startY + 100, 0, Qt.LeftButton)
+        mouseRelease(map, startX, startY + 100, Qt.LeftButton)
+
+        verify(map.longitude === initialLon, "Failed to move map (Longitude) via mouse.")
+        verify(map.latitude > initialLat, "Latitude should remain constant on horizontal drag.")
 
         map.latitude = 10.0
         centerSpy.clear()
 
-        map.lockGeolocation()
+        map.lockGeolocation = true
         map.latitude = 20.0
         compare(map.latitude, 10.0, "Failed to lock geolocation.")
         compare(centerSpy.count, 0)
 
-        map.unlockGeolocation()
+        map.lockGeolocation = false
         map.latitude = 20.0
         compare(map.latitude, 20.0, "Failed to unlock geolocation.")
 
-        map.disableMouseMoveMap()
-        verify(map.isMouseMoveMapDisabled, "Failed to flag mouse move disabled.")
+        map.disableMouseMoveMap = true
+        verify(map.isMouseMoveMapDisabled(), "Failed to flag mouse move disabled.")
 
         var frozenCenter = map.center
-        mouseDrag(map, startX, startY, startX - 100, startY)
+        mousePress(map, startX, startY, Qt.LeftButton)
+        mouseMove(map, startX - 100, startY + 100, 0, Qt.LeftButton)
+        mouseRelease(map, startX - 100, startY + 100, Qt.LeftButton)
         compare(map.center, frozenCenter, "Map should not move when mouse move is disabled.")
 
-        map.enableMouseMoveMap()
-        verify(!map.isMouseMoveMapDisabled, "Failed to flag mouse move enabled.")
+        map.disableMouseMoveMap = false
+        verify(!map.isMouseMoveMapDisabled(), "Failed to flag mouse move enabled.")
     }
 
     function test_tileServers() {
@@ -146,20 +157,14 @@ TestCase {
         map.setTileServer(invalidUrl)
         wait(5000)
 
-        compare(map.tileServer, SimpleMapView.OSM, "Should default to OSM on invalid server.")
+        compare(map.tileServer, TileServers.OSM, "Should default to OSM on invalid server.")
 
-        map.setTileServer(SimpleMapView.GOOGLE_MAP)
-        compare(map.tileServer, SimpleMapView.GOOGLE_MAP, "Failed to change tile server.")
+        map.setTileServer(TileServers.GOOGLE_MAP)
+        compare(map.tileServer, TileServers.GOOGLE_MAP, "Failed to change tile server.")
     }
 
     function test_markers() {
         var marker = map.addMarker(map.latitude, map.longitude)
         verify(marker !== null, "Failed to add marker.")
-        
-        map.setMarkerIcon("qrc:/SimpleMapView/marker_alt.svg")
-        var marker2 = map.addMarker(map.center)
-        verify(marker2 !== null, "Failed to add second marker.")
-        
-        verify(map.markerIcon.toString().indexOf("marker_alt.svg") >= 0, "Global marker icon failed to update.")
     }
 }