Update spec tests to revision 944804044f47de11ee6db496330aaa9c203aae61 of message-format-wg repo

Author: catamorphism

icu4c/source/test/intltest/messageformat2test_read_json.cpp

@@ -313,6 +313,8 @@ void TestMessageFormat2::jsonTestsFromFiles(IcuTestErrorCode& errorCode) {
     runTestsFromJsonFile(*this, "spec/syntax.json", errorCode);
     runTestsFromJsonFile(*this, "spec/fallback.json", errorCode);
     runTestsFromJsonFile(*this, "spec/pattern-selection.json", errorCode);
+    runTestsFromJsonFile(*this, "spec/bidi.json", errorCode);
+    runTestsFromJsonFile(*this, "spec/u-options.json", errorCode);
 
     // Do valid function tests
     runTestsFromJsonFile(*this, "spec/functions/date.json", errorCode);
@@ -323,12 +325,6 @@ void TestMessageFormat2::jsonTestsFromFiles(IcuTestErrorCode& errorCode) {
     runTestsFromJsonFile(*this, "spec/functions/time.json", errorCode);
 
     // Other tests (non-spec)
-    // TODO: https://github.com/unicode-org/message-format-wg/pull/902 will
-    // move the bidi tests into the spec
-    runTestsFromJsonFile(*this, "bidi.json", errorCode);
-    // TODO: move this into the spec tests when
-    // https://github.com/unicode-org/message-format-wg/pull/846 lands
-    runTestsFromJsonFile(*this, "u-options.json", errorCode);
     runTestsFromJsonFile(*this, "more-functions.json", errorCode);
     runTestsFromJsonFile(*this, "valid-tests.json", errorCode);
     runTestsFromJsonFile(*this, "resolution-errors.json", errorCode);
@@ -367,6 +363,8 @@ void TestMessageFormat2::jsonTestsFromFiles(IcuTestErrorCode& errorCode) {
     runTestsFromJsonFile(*this, "icu-parser-tests.json", errorCode);
     runTestsFromJsonFile(*this, "icu-test-selectors.json", errorCode);
     runTestsFromJsonFile(*this, "icu-test-previous-release.json", errorCode);
+
+    // TODO (not yet implemented): currency, math (but math might be removed?)
 }
 
 #endif /* #if !UCONFIG_NO_MF2 */

testdata/message2/bidi.json

@@ -1,4 +1,5 @@
 {
+  "$schema": "../schemas/v0/tests.schema.json",
   "scenario": "Bidi support",
   "description": "Tests for correct parsing of messages with bidirectional marks and isolates",
   "defaultTestProperties": {
@@ -113,12 +114,12 @@
         "exp": "1"
     },
     {
-        "description":  " name... excludes U+FFFD and U+061C -- this pases as name -> [bidi] name-start *name-char",
+        "description":  "name... excludes bidi formatting character U+061C -- this parses as name -> [bidi] name-start *name-char",
         "src": ".local $\u061Cfoo = {1} {{ {$\u061Cfoo} }}",
         "exp": " \u20681\u2069 "
     },
     {
-        "description":  " name matches https://www.w3.org/TR/REC-xml-names/#NT-NCName but excludes U+FFFD and U+061C",
+        "description":  "name excludes bidi formatting character U+061C",
         "src": ".local $foo\u061Cbar = {2} {{ }}",
         "expErrors": [{"type": "syntax-error"}]
     },

testdata/message2/spec/bidi.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
+  "$schema": "../schemas/v0/tests.schema.json",
   "scenario": "Data model errors",
   "defaultTestProperties": {
     "locale": "en-US"

testdata/message2/spec/data-model-errors.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
+  "$schema": "../schemas/v0/tests.schema.json",
   "scenario": "Fallback",
   "description": "Test cases for fallback behaviour.",
   "defaultTestProperties": {
@@ -11,7 +11,8 @@
     {
       "description": "function with unquoted literal operand",
       "src": "{42 :test:function fails=format}",
-      "exp": "{|42|}"
+      "exp": "{|42|}",
+      "expParts": [{ "type": "fallback", "source": "|42|" }]
     },
     {
       "description": "function with quoted literal operand",
@@ -26,7 +27,8 @@
     {
       "description": "annotated implicit input variable",
       "src": "{$var :number}",
-      "exp": "{$var}"
+      "exp": "{$var}",
+      "expParts": [{ "type": "fallback", "source": "$var" }]
     },
     {
       "description": "local variable with unknown function in declaration",
@@ -46,7 +48,8 @@
     {
       "description": "function with no operand",
       "src": "{:test:undefined}",
-      "exp": "{:test:undefined}"
+      "exp": "{:test:undefined}",
+      "expParts": [{ "type": "fallback", "source": ":test:undefined" }]
     }
   ]
 }

testdata/message2/spec/fallback.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
+  "$schema": "../../schemas/v0/tests.schema.json",
   "scenario": "Date function",
   "description": "The built-in formatter for dates.",
   "defaultTestProperties": {

testdata/message2/spec/functions/date.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
+  "$schema": "../../schemas/v0/tests.schema.json",
   "scenario": "Datetime function",
   "description": "The built-in formatter for datetimes.",
   "defaultTestProperties": {

testdata/message2/spec/functions/datetime.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
+  "$schema": "../../schemas/v0/tests.schema.json",
   "scenario": "Integer function",
   "description": "The built-in formatter for integers.",
   "defaultTestProperties": {

testdata/message2/spec/functions/integer.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
+  "$schema": "../../schemas/v0/tests.schema.json",
   "scenario": "Number function",
   "description": "The built-in formatter for numbers.",
   "defaultTestProperties": {
@@ -326,13 +326,7 @@
       "expParts": [
         {
           "type": "number",
-          "source": "|42|",
-          "parts": [
-            {
-              "type": "integer",
-              "value": "42"
-            }
-          ]
+          "parts": [{ "type": "integer", "value": "42" }]
         }
       ]
     }

testdata/message2/spec/functions/number.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
+  "$schema": "../../schemas/v0/tests.schema.json",
   "scenario": "String function",
   "description": "The built-in formatter for strings.",
   "defaultTestProperties": {