Test suite: Add $schema to scenarios, drop expCleanSrc (#827)

eemeli · web-flow · commit e7fb5f085c94 · 2024-07-27T08:44:56.000-07:00
* Add $schema property

* Drop expCleanSrc

* Drop test/.vscode/settings.json
diff --git a/test/.vscode/settings.json b/test/.vscode/settings.json
diff --git a/test/schemas/v0/tests.schema.json b/test/schemas/v0/tests.schema.json
@@ -9,6 +9,10 @@
     "tests"
   ],
   "properties": {
+    "$schema": {
+      "type": "string",
+      "description": "Identifier for the test file JSON schema."
+    },
     "scenario": {
       "type": "string",
       "description": "Identifier for the tests in the file."
@@ -120,9 +124,6 @@
         "exp": {
           "$ref": "#/$defs/exp"
         },
-        "expCleanSrc": {
-          "$ref": "#/$defs/expCleanSrc"
-        },
         "expParts": {
           "$ref": "#/$defs/expParts"
         },
@@ -151,9 +152,6 @@
         "exp": {
           "$ref": "#/$defs/exp"
         },
-        "expCleanSrc": {
-          "$ref": "#/$defs/expCleanSrc"
-        },
         "expParts": {
           "$ref": "#/$defs/expParts"
         },
@@ -223,10 +221,6 @@
       "description": "The expected result of formatting the message to a string.",
       "type": "string"
     },
-    "expCleanSrc": {
-      "description": "The expected normalized form of `src`, for testing stringifiers.",
-      "type": "string"
-    },
     "expParts": {
       "description": "The expected result of formatting the message to parts.",
       "type": "array",
@@ -368,11 +362,6 @@
             "exp"
           ]
         },
-        {
-          "required": [
-            "expCleanSrc"
-          ]
-        },
         {
           "required": [
             "expParts"
diff --git a/test/tests/data-model-errors.json b/test/tests/data-model-errors.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "scenario": "Data model errors",
   "defaultTestProperties": {
     "locale": "en-US"
diff --git a/test/tests/functions/date.json b/test/tests/functions/date.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "scenario": "Date function",
   "description": "The built-in formatter for dates.",
   "defaultTestProperties": {
diff --git a/test/tests/functions/datetime.json b/test/tests/functions/datetime.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "scenario": "Datetime function",
   "description": "The built-in formatter for datetimes.",
   "defaultTestProperties": {
diff --git a/test/tests/functions/integer.json b/test/tests/functions/integer.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "scenario": "Integer function",
   "description": "The built-in formatter for integers.",
   "defaultTestProperties": {
diff --git a/test/tests/functions/number.json b/test/tests/functions/number.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "scenario": "Number function",
   "description": "The built-in formatter for numbers.",
   "defaultTestProperties": {
diff --git a/test/tests/functions/string.json b/test/tests/functions/string.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "scenario": "String function",
   "description": "The built-in formatter for strings.",
   "defaultTestProperties": {
diff --git a/test/tests/functions/time.json b/test/tests/functions/time.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "scenario": "Time function",
   "description": "The built-in formatter for times.",
   "defaultTestProperties": {
diff --git a/test/tests/syntax-errors.json b/test/tests/syntax-errors.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "scenario": "Syntax errors",
   "description": "Strings that produce syntax errors when parsed.",
   "defaultTestProperties": {
diff --git a/test/tests/syntax.json b/test/tests/syntax.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "scenario": "Syntax",
   "description": "Test cases that do not depend on any registry definitions.",
   "defaultTestProperties": {
@@ -15,13 +16,11 @@
     },
     {
       "src": "hello { world\t\n}",
-      "exp": "hello world",
-      "expCleanSrc": "hello {world}"
+      "exp": "hello world"
     },
     {
       "src": "hello {\u3000world\r}",
-      "exp": "hello world",
-      "expCleanSrc": "hello {world}"
+      "exp": "hello world"
     },
     {
       "src": "hello {|world|}",
@@ -238,7 +237,6 @@
     },
     {
       "src": "{#tag foo=bar/}",
-      "expCleanSrc": "{#tag foo=bar /}",
       "exp": "",
       "expParts": [
         {
@@ -382,7 +380,6 @@
     },
     {
       "src": ".foo{42}{{bar}}",
-      "expCleanSrc": ".foo {42} {{bar}}",
       "exp": "bar",
       "expParts": [
         {
@@ -398,7 +395,6 @@
     },
     {
       "src": ".foo |}lit{| {42}{{bar}}",
-      "expCleanSrc": ".foo |}lit{| {42} {{bar}}",
       "exp": "bar",
       "expParts": [
         {
@@ -414,7 +410,6 @@
     },
     {
       "src": "{{trailing whitespace}} \n",
-      "expCleanSrc": "trailing whitespace",
       "exp": "trailing whitespace"
     }
   ]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",`
`2`	`3`	`"scenario": "Data model errors",`
`3`	`4`	`"defaultTestProperties": {`
`4`	`5`	`"locale": "en-US"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",`
`2`	`3`	`"scenario": "Date function",`
`3`	`4`	`"description": "The built-in formatter for dates.",`
`4`	`5`	`"defaultTestProperties": {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",`
`2`	`3`	`"scenario": "Datetime function",`
`3`	`4`	`"description": "The built-in formatter for datetimes.",`
`4`	`5`	`"defaultTestProperties": {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",`
`2`	`3`	`"scenario": "Integer function",`
`3`	`4`	`"description": "The built-in formatter for integers.",`
`4`	`5`	`"defaultTestProperties": {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",`
`2`	`3`	`"scenario": "Number function",`
`3`	`4`	`"description": "The built-in formatter for numbers.",`
`4`	`5`	`"defaultTestProperties": {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",`
`2`	`3`	`"scenario": "String function",`
`3`	`4`	`"description": "The built-in formatter for strings.",`
`4`	`5`	`"defaultTestProperties": {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",`
`2`	`3`	`"scenario": "Time function",`
`3`	`4`	`"description": "The built-in formatter for times.",`
`4`	`5`	`"defaultTestProperties": {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`{`
	`2`	`+ "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",`
`2`	`3`	`"scenario": "Syntax errors",`
`3`	`4`	`"description": "Strings that produce syntax errors when parsed.",`
`4`	`5`	`"defaultTestProperties": {`