Align test schema with error spec (#803)

mradbourne · web-flow · commit b4fd5a666a02 · 2024-05-31T16:30:57.000+01:00
diff --git a/test/schemas/v0/tests.schema.json b/test/schemas/v0/tests.schema.json
@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "title": "MessageFormat 2 data-driven tests",
-  "description": "This is the main schema for MessageFormat 2 test source data.",
+  "description": "The main schema for MessageFormat 2 test data.",
   "type": "object",
   "additionalProperties": false,
   "required": [
@@ -11,7 +11,7 @@
   "properties": {
     "scenario": {
       "type": "string",
-      "description": "Identifier for the tests in the file"
+      "description": "Identifier for the tests in the file."
     },
     "description": {
       "type": "string",
@@ -351,12 +351,11 @@
               "unresolved-variable",
               "unknown-function",
               "unsupported-expression",
-              "invalid-expression",
-              "operand-mismatch",
               "unsupported-statement",
-              "selection-error",
-              "formatting-error",
-              "bad-input"
+              "bad-selector",
+              "bad-operand",
+              "bad-option",
+              "bad-variant-key"
             ]
           }
         }
diff --git a/test/tests/functions/date.json b/test/tests/functions/date.json
@@ -11,7 +11,7 @@
       "exp": "{:date}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -20,7 +20,7 @@
       "exp": "{|horse|}",
       "expErrors": [
         {
-          "type": "operand-mismatch"
+          "type": "bad-operand"
         }
       ]
     },
diff --git a/test/tests/functions/datetime.json b/test/tests/functions/datetime.json
@@ -11,7 +11,7 @@
       "exp": "{:datetime}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -26,7 +26,7 @@
       ],
       "expErrors": [
         {
-          "type": "bad-input"
+          "type": "bad-operand"
         }
       ]
     },
@@ -35,7 +35,7 @@
       "exp": "{|horse|}",
       "expErrors": [
         {
-          "type": "operand-mismatch"
+          "type": "bad-operand"
         }
       ]
     },
diff --git a/test/tests/functions/number.json b/test/tests/functions/number.json
@@ -22,7 +22,7 @@
       "exp": "hello {|foo|}",
       "expErrors": [
         {
-          "type": "operand-mismatch"
+          "type": "bad-operand"
         }
       ]
     },
@@ -31,7 +31,7 @@
       "exp": "invalid number literal {|.1|}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -40,7 +40,7 @@
       "exp": "invalid number literal {|1.|}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -49,7 +49,7 @@
       "exp": "invalid number literal {|01|}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -58,7 +58,7 @@
       "exp": "invalid number literal {|+1|}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -67,7 +67,7 @@
       "exp": "invalid number literal {|0x1|}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -76,7 +76,7 @@
       "exp": "hello {:number}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -139,7 +139,7 @@
       "exp": "bar {$bar}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-option"
         }
       ]
     },
@@ -154,7 +154,7 @@
       "exp": "bar {$bar}",
       "expErrors": [
         {
-          "type": "bad-input"
+          "type": "bad-operand"
         }
       ]
     },
@@ -189,7 +189,7 @@
       "exp": "bar {$foo}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-option"
         }
       ]
     },
@@ -204,7 +204,7 @@
       "exp": "bar {$foo}",
       "expErrors": [
         {
-          "type": "bad-input"
+          "type": "bad-operand"
         }
       ]
     },
diff --git a/test/tests/functions/time.json b/test/tests/functions/time.json
@@ -11,7 +11,7 @@
       "exp": "{:time}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -20,7 +20,7 @@
       "exp": "{|horse|}",
       "expErrors": [
         {
-          "type": "operand-mismatch"
+          "type": "bad-operand"
         }
       ]
     },

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`"exp": "{:date}",`
`12`	`12`	`"expErrors": [`
`13`	`13`	`{`
`14`		`- "type": "invalid-expression"`
	`14`	`+ "type": "bad-operand"`
`15`	`15`	`}`
`16`	`16`	`]`
`17`	`17`	`},`
`@@ -20,7 +20,7 @@`
`20`	`20`	`"exp": "{\|horse\|}",`
`21`	`21`	`"expErrors": [`
`22`	`22`	`{`
`23`		`- "type": "operand-mismatch"`
	`23`	`+ "type": "bad-operand"`
`24`	`24`	`}`
`25`	`25`	`]`
`26`	`26`	`},`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"exp": "hello {\|foo\|}",`
`23`	`23`	`"expErrors": [`
`24`	`24`	`{`
`25`		`- "type": "operand-mismatch"`
	`25`	`+ "type": "bad-operand"`
`26`	`26`	`}`
`27`	`27`	`]`
`28`	`28`	`},`
`@@ -31,7 +31,7 @@`
`31`	`31`	`"exp": "invalid number literal {\|.1\|}",`
`32`	`32`	`"expErrors": [`
`33`	`33`	`{`
`34`		`- "type": "invalid-expression"`
	`34`	`+ "type": "bad-operand"`
`35`	`35`	`}`
`36`	`36`	`]`
`37`	`37`	`},`
`@@ -40,7 +40,7 @@`
`40`	`40`	`"exp": "invalid number literal {\|1.\|}",`
`41`	`41`	`"expErrors": [`
`42`	`42`	`{`
`43`		`- "type": "invalid-expression"`
	`43`	`+ "type": "bad-operand"`
`44`	`44`	`}`
`45`	`45`	`]`
`46`	`46`	`},`
`@@ -49,7 +49,7 @@`
`49`	`49`	`"exp": "invalid number literal {\|01\|}",`
`50`	`50`	`"expErrors": [`
`51`	`51`	`{`
`52`		`- "type": "invalid-expression"`
	`52`	`+ "type": "bad-operand"`
`53`	`53`	`}`
`54`	`54`	`]`
`55`	`55`	`},`
`@@ -58,7 +58,7 @@`
`58`	`58`	`"exp": "invalid number literal {\|+1\|}",`
`59`	`59`	`"expErrors": [`
`60`	`60`	`{`
`61`		`- "type": "invalid-expression"`
	`61`	`+ "type": "bad-operand"`
`62`	`62`	`}`
`63`	`63`	`]`
`64`	`64`	`},`
`@@ -67,7 +67,7 @@`
`67`	`67`	`"exp": "invalid number literal {\|0x1\|}",`
`68`	`68`	`"expErrors": [`
`69`	`69`	`{`
`70`		`- "type": "invalid-expression"`
	`70`	`+ "type": "bad-operand"`
`71`	`71`	`}`
`72`	`72`	`]`
`73`	`73`	`},`
`@@ -76,7 +76,7 @@`
`76`	`76`	`"exp": "hello {:number}",`
`77`	`77`	`"expErrors": [`
`78`	`78`	`{`
`79`		`- "type": "invalid-expression"`
	`79`	`+ "type": "bad-operand"`
`80`	`80`	`}`
`81`	`81`	`]`
`82`	`82`	`},`
`@@ -139,7 +139,7 @@`
`139`	`139`	`"exp": "bar {$bar}",`
`140`	`140`	`"expErrors": [`
`141`	`141`	`{`
`142`		`- "type": "invalid-expression"`
	`142`	`+ "type": "bad-option"`
`143`	`143`	`}`
`144`	`144`	`]`
`145`	`145`	`},`
`@@ -154,7 +154,7 @@`
`154`	`154`	`"exp": "bar {$bar}",`
`155`	`155`	`"expErrors": [`
`156`	`156`	`{`
`157`		`- "type": "bad-input"`
	`157`	`+ "type": "bad-operand"`
`158`	`158`	`}`
`159`	`159`	`]`
`160`	`160`	`},`
`@@ -189,7 +189,7 @@`
`189`	`189`	`"exp": "bar {$foo}",`
`190`	`190`	`"expErrors": [`
`191`	`191`	`{`
`192`		`- "type": "invalid-expression"`
	`192`	`+ "type": "bad-option"`
`193`	`193`	`}`
`194`	`194`	`]`
`195`	`195`	`},`
`@@ -204,7 +204,7 @@`
`204`	`204`	`"exp": "bar {$foo}",`
`205`	`205`	`"expErrors": [`
`206`	`206`	`{`
`207`		`- "type": "bad-input"`
	`207`	`+ "type": "bad-operand"`
`208`	`208`	`}`
`209`	`209`	`]`
`210`	`210`	`},`