Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: I23c874c5dcd0452142c3cf8abff65415ad31a1e7

1 files changed, 59 insertions, 0 deletions

diff --git a/tests/auto/declarative_geoshape/tst_locationsingleton.qml b/tests/auto/declarative_geoshape/tst_locationsingleton.qml
index ce5b7c4b..4b0a55ae 100644
--- a/tests/auto/declarative_geoshape/tst_locationsingleton.qml
+++ b/tests/auto/declarative_geoshape/tst_locationsingleton.qml
@@ -29,6 +29,7 @@
 import QtQuick 2.0
 import QtTest 1.0
 import QtPositioning 5.2
+import QtLocation 5.5
 
 Item {
     id: testCase
@@ -186,4 +187,62 @@ Item {
             verify(rectangle.isValid)
         }
     }
+
+
+    MapPolyline {
+        id: mapPolyline
+        path: [
+                { latitude: -27, longitude: 153.0 },
+                { latitude: -27, longitude: 154.1 },
+                { latitude: -28, longitude: 153.5 },
+                { latitude: -29, longitude: 153.5 }
+            ]
+    }
+
+    TestCase {
+        name: "MapPolyline path"
+        function test_path_operations() {
+            compare(mapPolyline.path[1].latitude, -27)
+            compare(mapPolyline.path[1].longitude, 154.1)
+            compare(mapPolyline.coordinateAt(1), QtPositioning.coordinate(27, 154.1))
+            compare(mapPolyline.path.length, mapPolyline.pathLength())
+
+            mapPolyline.removeCoordinate(1);
+            compare(mapPolyline.path[1].latitude, -28)
+            compare(mapPolyline.path[1].longitude, 153.5)
+            compare(mapPolyline.coordinateAt(1), QtPositioning.coordinate(-28, 153.5))
+            compare(mapPolyline.path.length, mapPolyline.pathLength())
+
+            mapPolyline.addCoordinate(QtPositioning.coordinate(30, 153.1))
+            compare(mapPolyline.path[mapPolyline.path.length-1].latitude, 30)
+            compare(mapPolyline.path[mapPolyline.path.length-1].longitude, 153.1)
+            compare(mapPolyline.containsCoordinate(QtPositioning.coordinate(30, 153.1)), true)
+            compare(mapPolyline.path.length, mapPolyline.pathLength())
+
+            mapPolyline.removeCoordinate(QtPositioning.coordinate(30, 153.1))
+            compare(mapPolyline.path[mapPolyline.path.length-1].latitude, -29)
+            compare(mapPolyline.path[mapPolyline.path.length-1].longitude, 153.5)
+            compare(mapPolyline.containsCoordinate(QtPositioning.coordinate(30, 153.1)), false)
+            compare(mapPolyline.path.length, mapPolyline.pathLength())
+
+            mapPolyline.insertCoordinate(2, QtPositioning.coordinate(35, 153.1))
+            compare(mapPolyline.path[2].latitude, 35)
+            compare(mapPolyline.path[2].longitude, 153.1)
+            compare(mapPolyline.containsCoordinate(QtPositioning.coordinate(35, 153.1)), true)
+            compare(mapPolyline.path.length, mapPolyline.pathLength())
+
+            mapPolyline.replaceCoordinate(2, QtPositioning.coordinate(45, 150.1))
+            compare(mapPolyline.path[2].latitude, 45)
+            compare(mapPolyline.path[2].longitude, 150.1)
+            compare(mapPolyline.containsCoordinate(QtPositioning.coordinate(35, 153.1)), false)
+            compare(mapPolyline.containsCoordinate(QtPositioning.coordinate(45, 150.1)), true)
+            compare(mapPolyline.path.length, mapPolyline.pathLength())
+
+            mapPolyline.insertCoordinate(2, QtPositioning.coordinate(35, 153.1))
+            compare(mapPolyline.coordinateAt(2).latitude, 35)
+            compare(mapPolyline.coordinateAt(2).longitude, 153.1)
+            compare(mapPolyline.containsCoordinate(QtPositioning.coordinate(35, 153.1)), true)
+            compare(mapPolyline.path.length, mapPolyline.pathLength())
+        }
+    }
 }