Adjust tests for mostly Placeholder changes

test_cases/admin_lookup.json

@@ -14,7 +14,7 @@
       "expected": {
         "properties": [
           {
-            "county": "Voelkermarkt"
+            "county": "Völkermarkt"
           }
         ]
       },

test_cases/autocomplete_admin_areas.json

@@ -294,7 +294,8 @@
         "priorityThresh": 1,
         "properties": [
           {
-            "label": "Malmö, Sweden"
+            "name": "Malmo",
+            "country": "Sweden"
           }
         ]
       }

test_cases/encoding.json

@@ -28,16 +28,16 @@
       "description": "make sure that results return the appropriate accents on results",
       "notes": "https://github.com/pelias/api/issues/731",
       "in": {
+        "lang": "et",
         "text": "pärnu, estonia"
       },
       "expected": {
+        "priorityThresh": 2,
         "properties": [
           {
-            "name": "Parnu",
-            "region": "Pärnumaa",
-            "locality": "Parnu",
-            "label": "Parnu, Estonia",
-            "country": "Estonia"
+            "name": "Pärnu maakond",
+            "region": "Pärnu maakond",
+            "country": "Eesti"
           }
         ]
       }
@@ -61,7 +61,7 @@
         "properties": [
           {
             "name": "Chambéry",
-            "macroregion": "Rhône-Alpes",
+            "macroregion": "Auvergne-Rhone-Alpes",
             "locality": "Chambéry",
             "label": "Chambéry, France",
             "country": "France"

test_cases/international.json

@@ -282,7 +282,7 @@
     },
     {
       "id": 14,
-      "status": "fail",
+      "status": "pass",
       "user": "lily",
       "description": [
         "Street exists in OSM data but returns various addresses instead of street centroid"
@@ -295,6 +295,7 @@
         "properties": [
           {
             "name": "Paseo de la Reforma",
+            "layer": "street",
             "locality": "Mexico City",
             "country_a": "MEX"
           }

test_cases/labels.json

@@ -247,7 +247,7 @@
       "expected": {
         "properties": [
           {
-            "label": "Bayamón, PRI"
+            "label": "Bayamón, Puerto Rico"
           }
         ]
       }
@@ -266,16 +266,19 @@
       "expected": {
         "properties": [
           {
-            "label": "Aasu, ASM"
+            "label": "Aasu, American Samoa"
           }
         ]
       }
     },
     {
       "id": 19,
-      "status": "pass",
+      "status": "fail",
       "description": "locality in non-US dependency should still include country",
-      "issue": "https://github.com/pelias/labels/issues/5",
+      "issue": [
+        "https://github.com/pelias/labels/issues/5",
+        "https://github.com/pelias/placeholder/issues/54"
+      ],
       "user": "trescube",
       "in": {
         "text": "George Hill, Anguilla",
@@ -293,9 +296,12 @@
     },
     {
       "id": 20,
-      "status": "pass",
+      "status": "fail",
       "description": "locality in non-US dependency should still include country",
-      "issue": "https://github.com/pelias/labels/issues/5",
+      "issue": [
+        "https://github.com/pelias/labels/issues/5",
+        "https://github.com/pelias/placeholder/issues/54"
+      ],
       "user": "trescube",
       "in": {
         "text": "Tórshavn faroe islands",

test_cases/placeholder_altnames.json

@@ -69,7 +69,7 @@
     },
     {
       "id": 3,
-      "status": "fail",
+      "status": "pass",
       "user": "lily",
       "description": [
         "address in French with admin info in Japanese",
@@ -132,7 +132,7 @@
     },
     {
       "id": 6,
-      "status": "fail",
+      "status": "pass",
       "user": "lily",
       "endpoint": "autocomplete",
       "description": [
@@ -252,7 +252,7 @@
     },
     {
       "id": 11,
-      "status": "fail",
+      "status": "pass",
       "user": "lily",
       "description": [
         "address in Estonian, locality (Tallinn) in Finnish, region in English"
@@ -313,7 +313,7 @@
         "properties": [
           {
             "name": "Беверли Хилс",
-            "region": "Texas",
+            "region": "Тексас",
             "country": "Сједињене Америчке Државе"
           }
         ]
@@ -325,7 +325,6 @@
       "user": "lily",
       "description": [
         "search with focus point parameter",
-        "no RU translation for region",
         "lang: russian"
       ],
       "in": {
@@ -338,7 +337,7 @@
         "properties": [
           {
             "name": "Спрингфилд",
-            "region": "Ohio",
+            "region": "Огайо",
             "country": "Соединённые Штаты Америки"
           }
         ]
@@ -430,7 +429,7 @@
         "properties": [
           {
             "name": "Дамаскъс",
-            "region": "Oregon",
+            "region": "Орегон",
             "country": "Съединени американски щати"
           }
         ]
@@ -594,7 +593,25 @@
           }
         ]
       }
+    },
+    {
+      "id": 26,
+      "status": "pass",
+      "user": "julian",
+      "description": "from mapillary home page",
+      "in": {
+        "text": "malmo",
+        "lang": "sv"
+      },
+      "expected": {
+        "priorityThresh": 1,
+        "properties": [
+          {
+            "name": "Malmö",
+            "country": "Sverige"
+          }
+        ]
+      }
     }
-
   ]
 }

test_cases/placeholder_general.json

@@ -566,7 +566,7 @@
     },
     {
       "id": 28,
-      "status": "fail",
+      "status": "pass",
       "endpoint": "search",
       "description": "Dundee has 0 population: https://github.com/pelias/pelias/issues/526",
       "priorityThresh": 10,

test_cases/placeholder_sorting.json

@@ -305,7 +305,7 @@
         "properties": [
           {
             "gid": "whosonfirst:macroregion:404227535",
-            "name": "Sardegna"
+            "name": "Sardinia"
           }
         ]
       }
@@ -322,7 +322,7 @@
         "properties": [
           {
             "gid": "whosonfirst:macroregion:404227361",
-            "name": "Andalucía"
+            "name": "Andalusia"
           }
         ]
       }
@@ -431,9 +431,10 @@
     },
     {
       "id": 701,
-      "status": "pass",
+      "status": "fail",
       "endpoint": "search",
       "description": "borough should rank higher than county",
+      "issue": "https://github.com/pelias/placeholder/issues/55",
       "in": {
         "text": "Queens"
       },
@@ -552,9 +553,9 @@
     },
     {
       "id": 1101,
-      "status": "pass",
+      "status": "fail",
       "endpoint": "search",
-      "description": "county",
+      "description": "county. failed because of space temporarily at the end of the name",
       "in": {
         "text": "Nordsachsen"
       },
@@ -743,6 +744,26 @@
           }
         ]
       }
+    },
+    {
+      "id": 1600,
+      "status": "fail",
+      "endpoint": "search",
+      "description": "county should be after locality generally",
+      "issue": [
+        "https://github.com/pelias/placeholder/issues/55"
+      ],
+      "in": {
+        "text": "pärnu, estonia"
+      },
+      "expected": {
+        "properties": [
+          {
+            "name": "Parnu",
+            "layer": "locality"
+          }
+        ]
+      }
     }
   ]
 }

test_cases/search_city_country.json

@@ -179,10 +179,10 @@
     },
     {
       "id": 10,
-      "status": "fail",
+      "status": "pass",
       "user": "trescube",
       "type": "dev",
-      "notes": "WOF currently lacks 'Cairo' as an altname for the city: https://whosonfirst.mapzen.com/spelunker/id/421174399",
+      "notes": "WOF previously lacked 'Cairo' as an altname for the city: https://whosonfirst.mapzen.com/spelunker/id/421174399",
       "in": {
         "text": "Cairo, EGY"
       },
@@ -250,7 +250,7 @@
           {
             "layer": "locality",
             "locality": "Prague",
-            "country": "Czech Republic",
+            "country": "Czechia",
             "country_a": "CZE"
           }
         ]
@@ -494,10 +494,11 @@
     },
     {
       "id": 26,
-      "status": "pass",
+      "status": "fail",
       "user": "trescube",
       "type": "dev",
       "notes": "New Caledonia is a dependency",
+      "issue": "https://github.com/pelias/wof-admin-lookup/issues/156",
       "in": {
         "text": "Bourail, new caledonia"
       },