Fix #993, make expErrors array only (not boolean)

unicode-org · Jan 30, 2025 · 8bb0b00 · 8bb0b00
1 parent 04246c3
commit 8bb0b00
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 41 deletions.
diff --git a/test/schemas/v0/tests.schema.json b/test/schemas/v0/tests.schema.json
@@ -353,10 +353,7 @@
     },
     "expErrors": {
       "description": "The runtime errors expected to be emitted when formatting the message. If expErrors is either absent or empty, the message must be formatted without errors.",
-      "type": [
-        "array",
-        "boolean"
-      ],
+      "type": "array",
       "items": {
         "type": "object",
         "additionalProperties": false,
@@ -395,11 +392,6 @@
           "required": [
             "expParts"
           ]
-        },
-        {
-          "required": [
-            "expErrors"
-          ]
         }
       ]
     }

diff --git a/test/tests/fallback.json b/test/tests/fallback.json
@@ -4,49 +4,56 @@
   "description": "Test cases for fallback behaviour.",
   "defaultTestProperties": {
     "bidiIsolation": "none",
-    "locale": "en-US",
-    "expErrors": true
+    "locale": "en-US"
   },
   "tests": [
     {
       "description": "function with unquoted literal operand",
       "src": "{42 :test:function fails=format}",
-      "exp": "{|42|}"
+      "exp": "{|42|}",
+      "expErrors": [{ "type": "unknown-function" }]
     },
     {
       "description": "function with quoted literal operand",
       "src": "{|C:\\\\| :test:function fails=format}",
-      "exp": "{|C:\\\\|}"
+      "exp": "{|C:\\\\|}",
+      "expErrors": [{ "type": "unknown-function" }]
     },
     {
       "description": "unannotated implicit input variable",
       "src": "{$var}",
-      "exp": "{$var}"
+      "exp": "{$var}",
+      "expErrors": [{ "type": "tbd-why-is-this-a-fallback" }]
     },
     {
       "description": "annotated implicit input variable",
       "src": "{$var :number}",
-      "exp": "{$var}"
+      "exp": "{$var}",
+      "expErrors": [{ "type": "tbd-why-is-this-a-fallback" }]
     },
     {
       "description": "local variable with unknown function in declaration",
       "src": ".local $var = {|val| :test:undefined} {{{$var}}}",
-      "exp": "{$var}"
+      "exp": "{$var}",
+      "expErrors": [{ "type": "unknown-function" }]
     },
     {
       "description": "function with local variable operand with unknown function in declaration",
       "src": ".local $var = {|val| :test:undefined} {{{$var :test:function}}}",
-      "exp": "{$var}"
+      "exp": "{$var}",
+      "expErrors": [{ "type": "unknown-function" }]
     },
     {
       "description": "local variable with unknown function in placeholder",
       "src": ".local $var = {|val|} {{{$var :test:undefined}}}",
-      "exp": "{$var}"
+      "exp": "{$var}",
+      "expErrors": [{ "type": "unknown-function" }]
     },
     {
       "description": "function with no operand",
       "src": "{:test:undefined}",
-      "exp": "{:test:undefined}"
+      "exp": "{:test:undefined}",
+      "expErrors": [{ "type": "bad-operand" }]
     }
   ]
 }
diff --git a/test/tests/functions/currency.json b/test/tests/functions/currency.json
@@ -24,38 +24,30 @@
       "expErrors": [{ "type": "bad-operand" }]
     },
     {
-      "src": "{42 :currency currency=EUR}",
-      "expErrors": false
+      "src": "{42 :currency currency=EUR}"
     },
     {
-      "src": ".local $n = {42 :number} {{{$n :currency currency=EUR}}}",
-      "expErrors": false
+      "src": ".local $n = {42 :number} {{{$n :currency currency=EUR}}}"
     },
     {
-      "src": ".local $n = {42 :integer} {{{$n :currency currency=EUR}}}",
-      "expErrors": false
+      "src": ".local $n = {42 :integer} {{{$n :currency currency=EUR}}}"
     },
     {
-      "src": ".local $n = {42 :currency currency=EUR} {{{$n :currency}}}",
-      "expErrors": false
+      "src": ".local $n = {42 :currency currency=EUR} {{{$n :currency}}}"
     },
     {
-      "src": "{42 :currency currency=EUR fractionDigits=auto}",
-      "expErrors": false
+      "src": "{42 :currency currency=EUR fractionDigits=auto}"
     },
     {
-      "src": "{42 :currency currency=EUR fractionDigits=2}",
-      "expErrors": false
+      "src": "{42 :currency currency=EUR fractionDigits=2}"
     },
     {
       "src": "{$x :currency currency=EUR}",
-      "params": [{ "name": "x", "value": 41 }],
-      "expErrors": false
+      "params": [{ "name": "x", "value": 41 }]
     },
     {
       "src": ".local $n = {42 :currency currency=EUR} .match $n * {{other}}",
-      "exp": "other",
-      "expErrors": false
+      "exp": "other"
     }
   ]
 }
diff --git a/test/tests/functions/date.json b/test/tests/functions/date.json
@@ -4,8 +4,7 @@
   "description": "The built-in formatter for dates.",
   "defaultTestProperties": {
     "bidiIsolation": "none",
-    "locale": "en-US",
-    "expErrors": false
+    "locale": "en-US"
   },
   "tests": [
     {

diff --git a/test/tests/functions/datetime.json b/test/tests/functions/datetime.json
@@ -4,8 +4,7 @@
   "description": "The built-in formatter for datetimes.",
   "defaultTestProperties": {
     "bidiIsolation": "none",
-    "locale": "en-US",
-    "expErrors": false
+    "locale": "en-US"
   },
   "tests": [
     {

diff --git a/test/tests/functions/time.json b/test/tests/functions/time.json
@@ -4,8 +4,7 @@
   "description": "The built-in formatter for times.",
   "defaultTestProperties": {
     "bidiIsolation": "none",
-    "locale": "en-US",
-    "expErrors": false
+    "locale": "en-US"
   },
   "tests": [
     {