Merge pull request #468 from json-schema-org/ether/combine-test-cases

karenetheridge · web-flow · commit 72a32fe7c9a2 · 2021-03-26T08:57:22.000-07:00
these test cases can be combined since the schemas are the same
diff --git a/tests/draft2019-09/defs.json b/tests/draft2019-09/defs.json
@@ -1,19 +1,13 @@
 [
     {
-        "description": "valid definition",
+        "description": "validate definition against metaschema",
         "schema": {"$ref": "https://json-schema.org/draft/2019-09/schema"},
         "tests": [
             {
                 "description": "valid definition schema",
                 "data": {"$defs": {"foo": {"type": "integer"}}},
                 "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid definition",
-        "schema": {"$ref": "https://json-schema.org/draft/2019-09/schema"},
-        "tests": [
+            },
             {
                 "description": "invalid definition schema",
                 "data": {"$defs": {"foo": {"type": 1}}},
diff --git a/tests/draft2020-12/defs.json b/tests/draft2020-12/defs.json
@@ -1,6 +1,6 @@
 [
     {
-        "description": "valid definition",
+        "description": "validate definition against metaschema",
         "schema": {
             "$ref": "https://json-schema.org/draft/2020-12/schema"
         },
@@ -9,15 +9,7 @@
                 "description": "valid definition schema",
                 "data": {"$defs": {"foo": {"type": "integer"}}},
                 "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid definition",
-        "schema": {
-            "$ref": "https://json-schema.org/draft/2020-12/schema"
-        },
-        "tests": [
+            },
             {
                 "description": "invalid definition schema",
                 "data": {"$defs": {"foo": {"type": 1}}},
diff --git a/tests/draft4/definitions.json b/tests/draft4/definitions.json
@@ -1,6 +1,6 @@
 [
     {
-        "description": "valid definition",
+        "description": "validate definition against metaschema",
         "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
         "tests": [
             {
@@ -11,13 +11,7 @@
                     }
                 },
                 "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid definition",
-        "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},
-        "tests": [
+            },
             {
                 "description": "invalid definition schema",
                 "data": {
diff --git a/tests/draft6/definitions.json b/tests/draft6/definitions.json
@@ -1,6 +1,6 @@
 [
     {
-        "description": "valid definition",
+        "description": "validate definition against metaschema",
         "schema": {"$ref": "http://json-schema.org/draft-06/schema#"},
         "tests": [
             {
@@ -11,13 +11,7 @@
                     }
                 },
                 "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid definition",
-        "schema": {"$ref": "http://json-schema.org/draft-06/schema#"},
-        "tests": [
+            },
             {
                 "description": "invalid definition schema",
                 "data": {
diff --git a/tests/draft7/definitions.json b/tests/draft7/definitions.json
@@ -1,6 +1,6 @@
 [
     {
-        "description": "valid definition",
+        "description": "validate definition against metaschema",
         "schema": {"$ref": "http://json-schema.org/draft-07/schema#"},
         "tests": [
             {
@@ -11,13 +11,7 @@
                     }
                 },
                 "valid": true
-            }
-        ]
-    },
-    {
-        "description": "invalid definition",
-        "schema": {"$ref": "http://json-schema.org/draft-07/schema#"},
-        "tests": [
+            },
             {
                 "description": "invalid definition schema",
                 "data": {

Original file line number	Diff line number	Diff line change
`@@ -1,19 +1,13 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "description": "valid definition",`
	`3`	`+ "description": "validate definition against metaschema",`
`4`	`4`	`"schema": {"$ref": "https://json-schema.org/draft/2019-09/schema"},`
`5`	`5`	`"tests": [`
`6`	`6`	`{`
`7`	`7`	`"description": "valid definition schema",`
`8`	`8`	`"data": {"$defs": {"foo": {"type": "integer"}}},`
`9`	`9`	`"valid": true`
`10`		`- }`
`11`		`- ]`
`12`		`- },`
`13`		`- {`
`14`		`- "description": "invalid definition",`
`15`		`- "schema": {"$ref": "https://json-schema.org/draft/2019-09/schema"},`
`16`		`- "tests": [`
	`10`	`+ },`
`17`	`11`	`{`
`18`	`12`	`"description": "invalid definition schema",`
`19`	`13`	`"data": {"$defs": {"foo": {"type": 1}}},`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`		`- "description": "valid definition",`
	`3`	`+ "description": "validate definition against metaschema",`
`4`	`4`	`"schema": {"$ref": "http://json-schema.org/draft-04/schema#"},`
`5`	`5`	`"tests": [`
`6`	`6`	`{`
`@@ -11,13 +11,7 @@`
`11`	`11`	`}`
`12`	`12`	`},`
`13`	`13`	`"valid": true`
`14`		`- }`
`15`		`- ]`
`16`		`- },`
`17`		`- {`
`18`		`- "description": "invalid definition",`
`19`		`- "schema": {"$ref": "http://json-schema.org/draft-04/schema#"},`
`20`		`- "tests": [`
	`14`	`+ },`
`21`	`15`	`{`
`22`	`16`	`"description": "invalid definition schema",`
`23`	`17`	`"data": {`