Minor schema refactors

Author: mradbourne

test/schema.json

@@ -16,8 +16,8 @@
       "type": "string",
       "description": "Information about the test scenario."
     },
-    "defaultTestParams": {
-      "$ref": "#/$defs/defaultTestParams"
+    "defaultTestProperties": {
+      "$ref": "#/$defs/defaultTestProperties"
     },
     "tests": {
       "type": "array",
@@ -27,13 +27,13 @@
       "minItems": 1
     }
   },
-  "$comment": "This allOf specifies required test properties that allow a default. A value will be required in 'defaultTestParams' if one is not provided for every individual test.",
+  "$comment": "This allOf specifies required test properties that allow a default. A value will be required in 'defaultTestProperties' if one is not provided for every individual test.",
   "allOf": [
     {
       "anyOf": [
         {
           "properties": {
-            "defaultTestParams": {
+            "defaultTestProperties": {
               "required": [
                 "testType"
               ]
@@ -58,7 +58,7 @@
       "anyOf": [
         {
           "properties": {
-            "defaultTestParams": {
+            "defaultTestProperties": {
               "required": [
                 "locale"
               ]
@@ -83,7 +83,7 @@
       "anyOf": [
         {
           "properties": {
-            "defaultTestParams": {
+            "defaultTestProperties": {
               "required": [
                 "src"
               ]
@@ -109,7 +109,7 @@
       "anyOf": [
         {
           "properties": {
-            "defaultTestParams": {
+            "defaultTestProperties": {
               "$ref": "#/$defs/anyExp"
             }
           }
@@ -128,7 +128,7 @@
     }
   ],
   "$defs": {
-    "defaultTestParams": {
+    "defaultTestProperties": {
       "type": "object",
       "additionalProperties": false,
       "properties": {
@@ -222,35 +222,18 @@
       "type": "object",
       "additionalProperties": false,
       "required": [
-        "type",
         "value"
       ],
       "properties": {
         "name": {
           "type": "string"
         },
         "type": {
-          "enum": [
-            "boolean",
-            "datetime",
-            "null",
-            "number",
-            "string"
-          ]
+          "const": "datetime"
         },
         "value": {}
       },
       "oneOf": [
-        {
-          "properties": {
-            "type": {
-              "const": "boolean"
-            },
-            "value": {
-              "type": "boolean"
-            }
-          }
-        },
         {
           "properties": {
             "type": {
@@ -260,36 +243,6 @@
               "type": "string"
             }
           }
-        },
-        {
-          "properties": {
-            "type": {
-              "const": "null"
-            },
-            "value": {
-              "type": "null"
-            }
-          }
-        },
-        {
-          "properties": {
-            "type": {
-              "const": "number"
-            },
-            "value": {
-              "type": "number"
-            }
-          }
-        },
-        {
-          "properties": {
-            "type": {
-              "const": "string"
-            },
-            "value": {
-              "type": "string"
-            }
-          }
         }
       ]
     },

test/tests/core.json

@@ -1,7 +1,7 @@
 {
   "scenario": "Core syntax",
   "description": "Test cases that do not depend on any registry definitions.",
-  "defaultTestParams": {
+  "defaultTestProperties": {
     "testType": "syntax",
     "locale": "en-US"
   },

test/tests/data-model-errors.json

@@ -1,7 +1,7 @@
 {
     "scenario": "Data model errors",
     "description": "Each `src` should produce an error when processed. each test description indicates the error reason, but this text should not be asserted against. Error names are defined in the spec.",
-    "defaultTestParams": {
+    "defaultTestProperties": {
         "testType": "syntax",
         "locale": "en-US",
         "expErrors": true

test/tests/functions/date.json

@@ -1,7 +1,7 @@
 {
   "scenario": "Date functions",
   "description": "The behaviour of built-in formatters is implementation-specific so the `exp` field is often omitted and assertions are made on error cases.",
-  "defaultTestParams": {
+  "defaultTestProperties": {
     "testType": "function",
     "locale": "en-US",
     "expErrors": false

test/tests/functions/datetime.json

@@ -1,7 +1,7 @@
 {
   "scenario": "Datetime functions",
   "description": "The behaviour of built-in formatters is implementation-specific so the `exp` field is often omitted and assertions are made on error cases.",
-  "defaultTestParams": {
+  "defaultTestProperties": {
     "testType": "function",
     "locale": "en-US",
     "expErrors": false

test/tests/functions/integer.json

@@ -1,6 +1,6 @@
 {
   "scenario": "Integer functions",
-  "defaultTestParams": {
+  "defaultTestProperties": {
     "testType": "function",
     "locale": "en-US"
   },

test/tests/functions/number.json

@@ -1,6 +1,6 @@
 {
   "scenario": "Number functions",
-  "defaultTestParams": {
+  "defaultTestProperties": {
     "testType": "function",
     "locale": "en-US"
   },

test/tests/functions/string.json

@@ -1,6 +1,6 @@
 {
   "scenario": "functions",
-  "defaultTestParams": {
+  "defaultTestProperties": {
     "testType": "function",
     "locale": "en-US"
   },

test/tests/functions/time.json

@@ -1,6 +1,6 @@
 {
   "scenario": "functions",
-  "defaultTestParams": {
+  "defaultTestProperties": {
     "testType": "function",
     "locale": "en-US",
     "expErrors": false

test/tests/syntax-errors.json

@@ -1,7 +1,7 @@
 {
   "scenario": "Syntax errors",
   "description": "Strings that produce syntax errors when parsed.",
-  "defaultTestParams": {
+  "defaultTestProperties": {
     "testType": "syntax",
     "locale": "en-US",
     "expErrors": true