Fix tests for Maps.

* Scarborough provided quite a messy map that resulted
in frequent needle failure. Changing the location
for something better to make it more reliable.
* The zoom test could have failed with a low resolution
image. Adding some timeout to the needle give more
time to load the proper image.

check-needles.py

@@ -124,7 +124,7 @@ for hashname in ("jlJmL", "7XGzO", "ps61y", "OvXj~", "GqYOp", "VEFrP"):
 for info in ("home", "personal", "work"):
     testliterals.append(f"contacts_label_{info}")
 # Needles for Maps
-for location in ("vilnius", "denali", "wellington", "scarborough", "pune"):
+for location in ("vilnius", "denali", "wellington", "poysdorf", "pune"):
     testliterals.append(f"maps_select_{location}")
     testliterals.append(f"maps_found_{location}")
     testliterals.append(f"maps_info_{location}")

needles/gnome/apps/maps/maps_found_poysdorf-20221207.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 453,
+      "ypos": 335,
+      "width": 150,
+      "height": 129,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_found_poysdorf"
+  ]
+}

needles/gnome/apps/maps/maps_found_scarborough-20220930.json

@@ -1,16 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 377,
-      "width": 160,
-      "ypos": 397,
-      "height": 77,
-      "type": "match",
-      "match": 90
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_found_scarborough"
-  ]
-}

needles/gnome/apps/maps/maps_found_scarborough-20221203.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "type": "match",
-      "xpos": 377,
-      "height": 77,
-      "width": 160,
-      "ypos": 335
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_found_scarborough"
-  ]
-}

needles/gnome/apps/maps/maps_found_scarborough.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 377,
-      "ypos": 397,
-      "width": 160,
-      "height": 77,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_found_scarborough"
-  ]
-}

needles/gnome/apps/maps/maps_info_scarborough.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 394,
-      "ypos": 283,
-      "width": 129,
-      "height": 56,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_info_scarborough"
-  ]
-}

needles/gnome/apps/maps/maps_select_poysdorf-20221207.json

@@ -0,0 +1,15 @@
+{
+  "area": [
+    {
+      "xpos": 291,
+      "ypos": 134,
+      "width": 80,
+      "height": 34,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "maps_select_poysdorf"
+  ]
+}

needles/gnome/apps/maps/maps_select_scarborough.json

@@ -1,15 +0,0 @@
-{
-  "area": [
-    {
-      "xpos": 263,
-      "ypos": 151,
-      "width": 119,
-      "height": 37,
-      "type": "match"
-    }
-  ],
-  "properties": [],
-  "tags": [
-    "maps_select_scarborough"
-  ]
-}

tests/applications/maps/search_location.pm

@@ -53,7 +53,7 @@ sub run {
     $softfailCounter = $softfailCounter + $result;
     $result = search("wellington");
     $softfailCounter = $softfailCounter + $result;
-    $result = search("scarborough");
+    $result = search("poysdorf");
     $softfailCounter = $softfailCounter + $result;
     $result = search("pune");
     $softfailCounter = $softfailCounter + $result;

tests/applications/maps/zoom.pm

@@ -14,7 +14,7 @@ sub run {
     foreach (my @counter = (1 .. 4)) {
         click_lastmatch();
     }
-    assert_screen("maps_map_zoomed");
+    assert_screen("maps_map_zoomed", timeout => 60);
 
 
     # Zoom out several times and check for zoomed out map.