"default locale" tests -> "en" tests (depends on "en" being installed…

…, but doesn't depend on it being system default). "de" locale test now handles locales that would have been similar enough to "de" to cause a failure. Add a "default" locale test that just sanity checks A!=B.
mapbox · Mar 26, 2018 · 62865d3 · 62865d3
1 parent 40d7f9d
commit 62865d3
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 9 deletions.
diff --git a/...ccent-equals-resolved-locale-de/test.json → ...tests/collator/accent-equals-de/test.json b/...ccent-equals-resolved-locale-de/test.json → ...tests/collator/accent-equals-de/test.json
@@ -2,7 +2,7 @@
   "expression": ["case",
       ["==", ["resolved-locale", ["collator", true, false, "de"]], "de"],
       ["==", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", true, false, "de"]],
-      ["!=", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", true, false, "de"]]
+      ["case", ["==", ["get", "rhs"], "ue"], true, false]
   ],
   "inputs": [
       [{}, {"properties": {"lhs": "ü", "rhs": "ue"}}],

diff --git a/...llator/accent-lt-default-locale/test.json → ...ion-tests/collator/accent-lt-en/test.json b/...llator/accent-lt-default-locale/test.json → ...ion-tests/collator/accent-lt-en/test.json
@@ -1,5 +1,5 @@
 {
-  "expression": ["<", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", true, false]],
+  "expression": ["<", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", true, false, "en"]],
   "inputs": [
       [{}, {"properties": {"lhs": "a", "rhs": "ä"}}],
       [{}, {"properties": {"lhs": "a", "rhs": "A"}}],

diff --git a/...ccent-not-equals-default-locale/test.json → ...s/collator/accent-not-equals-en/test.json b/...ccent-not-equals-default-locale/test.json → ...s/collator/accent-not-equals-en/test.json
@@ -1,5 +1,5 @@
 {
-  "expression": ["!", ["!=", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", true, false]]],
+  "expression": ["!", ["!=", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", true, false, "en"]]],
   "inputs": [
       [{}, {"properties": {"lhs": "a", "rhs": "ä"}}],
       [{}, {"properties": {"lhs": "a", "rhs": "A"}}],

diff --git a/test/integration/expression-tests/collator/base-default-locale/test.json b/test/integration/expression-tests/collator/base-default-locale/test.json
@@ -0,0 +1,18 @@
+{
+  "expression": ["==", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", false, false]],
+  "inputs": [
+      [{}, {"properties": {"lhs": "a", "rhs": "a"}}],
+      [{}, {"properties": {"lhs": "A", "rhs": "A"}}],
+      [{}, {"properties": {"lhs": "b", "rhs": "a"}}]
+  ],
+  "expected": {
+    "compiled": {
+      "result": "success",
+      "isFeatureConstant": false,
+      "isZoomConstant": true,
+      "type": "boolean"
+    },
+    "outputs": [true, true, false],
+    "serialized": "string"
+  }
+}
diff --git a/...ator/base-equals-default-locale/test.json → ...n-tests/collator/base-equals-en/test.json b/...ator/base-equals-default-locale/test.json → ...n-tests/collator/base-equals-en/test.json
@@ -1,5 +1,5 @@
 {
-  "expression": ["==", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", false, false]],
+  "expression": ["==", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", false, false, "en"]],
   "inputs": [
       [{}, {"properties": {"lhs": "a", "rhs": "ä"}}],
       [{}, {"properties": {"lhs": "a", "rhs": "A"}}],

diff --git a/...collator/base-gt-default-locale/test.json → ...ssion-tests/collator/base-gt-en/test.json b/...collator/base-gt-default-locale/test.json → ...ssion-tests/collator/base-gt-en/test.json
@@ -1,5 +1,5 @@
 {
-  "expression": [">", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", false, false]],
+  "expression": [">", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", false, false, "en"]],
   "inputs": [
       [{}, {"properties": {"lhs": "a", "rhs": "ä"}}],
       [{}, {"properties": {"lhs": "a", "rhs": "A"}}],

diff --git a/...llator/case-lteq-default-locale/test.json → ...ion-tests/collator/case-lteq-en/test.json b/...llator/case-lteq-default-locale/test.json → ...ion-tests/collator/case-lteq-en/test.json
@@ -1,5 +1,5 @@
 {
-  "expression": ["<=", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", false, true]],
+  "expression": ["<=", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", false, true, "en"]],
   "inputs": [
       [{}, {"properties": {"lhs": "ä", "rhs": "a"}}],
       [{}, {"properties": {"lhs": "A", "rhs": "a"}}],

diff --git a/.../case-not-equals-default-locale/test.json → ...sts/collator/case-not-equals-en/test.json b/.../case-not-equals-default-locale/test.json → ...sts/collator/case-not-equals-en/test.json
@@ -1,5 +1,5 @@
 {
-  "expression": ["!", ["!=", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", false, true]]],
+  "expression": ["!", ["!=", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", false, true, "en"]]],
   "inputs": [
       [{}, {"properties": {"lhs": "a", "rhs": "ä"}}],
       [{}, {"properties": {"lhs": "a", "rhs": "A"}}],

diff --git a/...r/variant-equals-default-locale/test.json → ...ests/collator/variant-equals-en/test.json b/...r/variant-equals-default-locale/test.json → ...ests/collator/variant-equals-en/test.json
@@ -1,5 +1,5 @@
 {
-  "expression": ["==", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", true, true]],
+  "expression": ["==", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", true, true, "en"]],
   "inputs": [
       [{}, {"properties": {"lhs": "a", "rhs": "ä"}}],
       [{}, {"properties": {"lhs": "a", "rhs": "A"}}],

diff --git a/...tor/variant-gteq-default-locale/test.json → ...-tests/collator/variant-gteq-en/test.json b/...tor/variant-gteq-default-locale/test.json → ...-tests/collator/variant-gteq-en/test.json
@@ -1,5 +1,5 @@
 {
-  "expression": [">=", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", true, true]],
+  "expression": [">=", ["string",["get", "lhs"]], ["get", "rhs"], ["collator", true, true, "en"]],
   "inputs": [
       [{}, {"properties": {"lhs": "a", "rhs": "ä"}}],
       [{}, {"properties": {"lhs": "a", "rhs": "A"}}],