[294] Add tests for "additionalProperties" and "additionalItems"

ssilverman · ssilverman · commit 57001d26bf50 · 2020-06-11T13:40:26.000-07:00
Ensure they stay same-object only.
diff --git a/tests/draft2019-09/additionalItems.json b/tests/draft2019-09/additionalItems.json
@@ -93,5 +93,38 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalItems should not look in applicators, valid case",
+        "schema": {
+            "allOf": [
+                { "items": [ { "type": "integer" } ] }
+            ],
+            "additionalItems": { "type": "boolean" }
+        },
+        "tests": [
+            {
+                "description": "items defined in allOf are not examined",
+                "data": [ 1, null ],
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "additionalItems should not look in applicators, invalid case",
+        "schema": {
+            "allOf": [
+                { "items": [ { "type": "integer" }, { "type": "string" } ] }
+            ],
+            "items": [ {"type": "integer" } ],
+            "additionalItems": { "type": "boolean" }
+        },
+        "tests": [
+            {
+                "description": "items defined in allOf are not examined",
+                "data": [ 1, "hello" ],
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft2019-09/additionalProperties.json b/tests/draft2019-09/additionalProperties.json
@@ -124,7 +124,7 @@
         },
         "tests": [
             {
-                "description": "properties defined in allOf are not allowed",
+                "description": "properties defined in allOf are not examined",
                 "data": {"foo": 1, "bar": true},
                 "valid": false
             }
diff --git a/tests/draft3/additionalItems.json b/tests/draft3/additionalItems.json
@@ -93,5 +93,21 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalItems should not look in applicators",
+        "schema": {
+            "extends": [
+                { "items": [ { "type": "integer" } ] }
+            ],
+            "additionalItems": { "type": "boolean" }
+        },
+        "tests": [
+            {
+                "description": "items defined in extends are not examined",
+                "data": [ 1, null ],
+                "valid": true
+            }
+        ]
     }
 ]
diff --git a/tests/draft3/additionalProperties.json b/tests/draft3/additionalProperties.json
@@ -124,7 +124,7 @@
         },
         "tests": [
             {
-                "description": "properties defined in extends are not allowed",
+                "description": "properties defined in extends are not examined",
                 "data": {"foo": 1, "bar": true},
                 "valid": false
             }
diff --git a/tests/draft4/additionalItems.json b/tests/draft4/additionalItems.json
@@ -93,5 +93,38 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalItems should not look in applicators, valid case",
+        "schema": {
+            "allOf": [
+                { "items": [ { "type": "integer" } ] }
+            ],
+            "additionalItems": { "type": "boolean" }
+        },
+        "tests": [
+            {
+                "description": "items defined in allOf are not examined",
+                "data": [ 1, null ],
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "additionalItems should not look in applicators, invalid case",
+        "schema": {
+            "allOf": [
+                { "items": [ { "type": "integer" }, { "type": "string" } ] }
+            ],
+            "items": [ {"type": "integer" } ],
+            "additionalItems": { "type": "boolean" }
+        },
+        "tests": [
+            {
+                "description": "items defined in allOf are not examined",
+                "data": [ 1, "hello" ],
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft4/additionalProperties.json b/tests/draft4/additionalProperties.json
@@ -124,7 +124,7 @@
         },
         "tests": [
             {
-                "description": "properties defined in allOf are not allowed",
+                "description": "properties defined in allOf are not examined",
                 "data": {"foo": 1, "bar": true},
                 "valid": false
             }
diff --git a/tests/draft6/additionalItems.json b/tests/draft6/additionalItems.json
@@ -93,5 +93,38 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalItems should not look in applicators, valid case",
+        "schema": {
+            "allOf": [
+                { "items": [ { "type": "integer" } ] }
+            ],
+            "additionalItems": { "type": "boolean" }
+        },
+        "tests": [
+            {
+                "description": "items defined in allOf are not examined",
+                "data": [ 1, null ],
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "additionalItems should not look in applicators, invalid case",
+        "schema": {
+            "allOf": [
+                { "items": [ { "type": "integer" }, { "type": "string" } ] }
+            ],
+            "items": [ {"type": "integer" } ],
+            "additionalItems": { "type": "boolean" }
+        },
+        "tests": [
+            {
+                "description": "items defined in allOf are not examined",
+                "data": [ 1, "hello" ],
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft6/additionalProperties.json b/tests/draft6/additionalProperties.json
@@ -124,7 +124,7 @@
         },
         "tests": [
             {
-                "description": "properties defined in allOf are not allowed",
+                "description": "properties defined in allOf are not examined",
                 "data": {"foo": 1, "bar": true},
                 "valid": false
             }
diff --git a/tests/draft7/additionalItems.json b/tests/draft7/additionalItems.json
@@ -93,5 +93,38 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "additionalItems should not look in applicators, valid case",
+        "schema": {
+            "allOf": [
+                { "items": [ { "type": "integer" } ] }
+            ],
+            "additionalItems": { "type": "boolean" }
+        },
+        "tests": [
+            {
+                "description": "items defined in allOf are not examined",
+                "data": [ 1, null ],
+                "valid": true
+            }
+        ]
+    },
+    {
+        "description": "additionalItems should not look in applicators, invalid case",
+        "schema": {
+            "allOf": [
+                { "items": [ { "type": "integer" }, { "type": "string" } ] }
+            ],
+            "items": [ {"type": "integer" } ],
+            "additionalItems": { "type": "boolean" }
+        },
+        "tests": [
+            {
+                "description": "items defined in allOf are not examined",
+                "data": [ 1, "hello" ],
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft7/additionalProperties.json b/tests/draft7/additionalProperties.json
@@ -124,7 +124,7 @@
         },
         "tests": [
             {
-                "description": "properties defined in allOf are not allowed",
+                "description": "properties defined in allOf are not examined",
                 "data": {"foo": 1, "bar": true},
                 "valid": false
             }

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@`
`124`	`124`	`},`
`125`	`125`	`"tests": [`
`126`	`126`	`{`
`127`		`- "description": "properties defined in allOf are not allowed",`
	`127`	`+ "description": "properties defined in allOf are not examined",`
`128`	`128`	`"data": {"foo": 1, "bar": true},`
`129`	`129`	`"valid": false`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,5 +93,21 @@`
`93`	`93`	`"valid": true`
`94`	`94`	`}`
`95`	`95`	`]`
	`96`	`+ },`
	`97`	`+ {`
	`98`	`+ "description": "additionalItems should not look in applicators",`
	`99`	`+ "schema": {`
	`100`	`+ "extends": [`
	`101`	`+ { "items": [ { "type": "integer" } ] }`
	`102`	`+ ],`
	`103`	`+ "additionalItems": { "type": "boolean" }`
	`104`	`+ },`
	`105`	`+ "tests": [`
	`106`	`+ {`
	`107`	`+ "description": "items defined in extends are not examined",`
	`108`	`+ "data": [ 1, null ],`
	`109`	`+ "valid": true`
	`110`	`+ }`
	`111`	`+ ]`
`96`	`112`	`}`
`97`	`113`	`]`