Squashed 'json/' changes from 21555a85..96742ba3

Julian · Julian · commit 918803aa556f · 2020-10-04T11:58:30.000-04:00
96742ba3 Merge pull request #438 from Zac-HD/overflow-with-multipleOf c5ba4ba3 Check for multipleOf overflow c12b0db8 Merge pull request #437 from gregsdennis/if-then-else-sequencing bd148eb7 copy/paste error 3ca7c419 Added if/then/else sequencing tests; resolves #436 fa73bc8d Merge pull request #435 from jviotti/unevaluated-items-typo 2d6de7cb Fix "unevaluted" typos in "unevaluatedItems" suite 2a9be81d Merge pull request #1 from json-schema-org/master git-subtree-dir: json git-subtree-split: 96742ba3c4a1eff6de45f0c50a66a975796b7c37
diff --git a/tests/draft2019-09/if-then-else.json b/tests/draft2019-09/if-then-else.json
@@ -224,5 +224,35 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "if appears at the end when serialized (keyword processing sequence)",
+        "schema": {
+            "then": { "const": "yes" },
+            "else": { "const": "other" },
+            "if": { "maxLength": 4 }
+        },
+        "tests": [
+            {
+                "description": "yes redirects to then and passes",
+                "data": "yes",
+                "valid": true
+            },
+            {
+                "description": "other redirects to else and passes",
+                "data": "other",
+                "valid": true
+            },
+            {
+                "description": "no redirects to then and fails",
+                "data": "no",
+                "valid": false
+            },
+            {
+                "description": "invalid redirects to else and fails",
+                "data": "invalid",
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft2019-09/multipleOf.json b/tests/draft2019-09/multipleOf.json
@@ -56,5 +56,16 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "invalid instance should not raise error when float division = inf",
+        "schema": {"type": "integer", "multipleOf": 0.123456789},
+        "tests": [
+            {
+                "description": "always invalid, but naive implementations may raise an overflow error",
+                "data": 1e308,
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft2019-09/optional/float-overflow.json b/tests/draft2019-09/optional/float-overflow.json
@@ -0,0 +1,13 @@
+[
+    {
+        "description": "all integers are multiples of 0.5, if overflow is handled",
+        "schema": {"type": "integer", "multipleOf": 0.5},
+        "tests": [
+            {
+                "description": "valid if optional overflow handling is implemented",
+                "data": 1e308,
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft2019-09/unevaluatedItems.json b/tests/draft2019-09/unevaluatedItems.json
@@ -87,12 +87,12 @@
         },
         "tests": [
             {
-                "description": "with no unevaluted items",
+                "description": "with no unevaluated items",
                 "data": ["foo"],
                 "valid": true
             },
             {
-                "description": "with unevaluted items",
+                "description": "with unevaluated items",
                 "data": ["foo", "bar"],
                 "valid": false
             }
@@ -135,12 +135,12 @@
         },
         "tests": [
             {
-                "description": "with no unevaluted items",
+                "description": "with no unevaluated items",
                 "data": ["foo", 42],
                 "valid": true
             },
             {
-                "description": "with unevaluted items",
+                "description": "with unevaluated items",
                 "data": ["foo", 42, true],
                 "valid": false
             }
@@ -228,22 +228,22 @@
         },
         "tests": [
             {
-                "description": "when one schema matches and has no unevaluted items",
+                "description": "when one schema matches and has no unevaluated items",
                 "data": ["foo", "bar"],
                 "valid": true
             },
             {
-                "description": "when one schema matches and has unevaluted items",
+                "description": "when one schema matches and has unevaluated items",
                 "data": ["foo", "bar", 42],
                 "valid": false
             },
             {
-                "description": "when two schemas match and has no unevaluted items",
+                "description": "when two schemas match and has no unevaluated items",
                 "data": ["foo", "bar", "baz"],
                 "valid": true
             },
             {
-                "description": "when two schemas match and has unevaluted items",
+                "description": "when two schemas match and has unevaluated items",
                 "data": ["foo", "bar", "baz", 42],
                 "valid": false
             }
@@ -274,12 +274,12 @@
         },
         "tests": [
             {
-                "description": "with no unevaluted items",
+                "description": "with no unevaluated items",
                 "data": ["foo", "bar"],
                 "valid": true
             },
             {
-                "description": "with unevaluted items",
+                "description": "with unevaluated items",
                 "data": ["foo", "bar", 42],
                 "valid": false
             }
@@ -304,7 +304,7 @@
         },
         "tests": [
             {
-                "description": "with unevaluted items",
+                "description": "with unevaluated items",
                 "data": ["foo", "bar"],
                 "valid": false
             }
@@ -342,22 +342,22 @@
         },
         "tests": [
             {
-                "description": "when if matches and it has no unevaluted items",
+                "description": "when if matches and it has no unevaluated items",
                 "data": ["foo", "bar", "then"],
                 "valid": true
             },
             {
-                "description": "when if matches and it has unevaluted items",
+                "description": "when if matches and it has unevaluated items",
                 "data": ["foo", "bar", "then", "else"],
                 "valid": false
             },
             {
-                "description": "when if doesn't match and it has no unevaluted items",
+                "description": "when if doesn't match and it has no unevaluated items",
                 "data": ["foo", 42, 42, "else"],
                 "valid": true
             },
             {
-                "description": "when if doesn't match and it has unevaluted items",
+                "description": "when if doesn't match and it has unevaluated items",
                 "data": ["foo", 42, 42, "else", 42],
                 "valid": false
             }
diff --git a/tests/draft4/multipleOf.json b/tests/draft4/multipleOf.json
@@ -56,5 +56,16 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "invalid instance should not raise error when float division = inf",
+        "schema": {"type": "integer", "multipleOf": 0.123456789},
+        "tests": [
+            {
+                "description": "always invalid, but naive implementations may raise an overflow error",
+                "data": 1e308,
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft4/optional/float-overflow.json b/tests/draft4/optional/float-overflow.json
@@ -0,0 +1,13 @@
+[
+    {
+        "description": "all integers are multiples of 0.5, if overflow is handled",
+        "schema": {"type": "integer", "multipleOf": 0.5},
+        "tests": [
+            {
+                "description": "valid if optional overflow handling is implemented",
+                "data": 1e308,
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft6/multipleOf.json b/tests/draft6/multipleOf.json
@@ -56,5 +56,16 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "invalid instance should not raise error when float division = inf",
+        "schema": {"type": "integer", "multipleOf": 0.123456789},
+        "tests": [
+            {
+                "description": "always invalid, but naive implementations may raise an overflow error",
+                "data": 1e308,
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft6/optional/float-overflow.json b/tests/draft6/optional/float-overflow.json
@@ -0,0 +1,13 @@
+[
+    {
+        "description": "all integers are multiples of 0.5, if overflow is handled",
+        "schema": {"type": "integer", "multipleOf": 0.5},
+        "tests": [
+            {
+                "description": "valid if optional overflow handling is implemented",
+                "data": 1e308,
+                "valid": true
+            }
+        ]
+    }
+]
diff --git a/tests/draft7/if-then-else.json b/tests/draft7/if-then-else.json
@@ -224,5 +224,35 @@
                 "valid": true
             }
         ]
+    },
+    {
+        "description": "if appears at the end when serialized (keyword processing sequence)",
+        "schema": {
+            "then": { "const": "yes" },
+            "else": { "const": "other" },
+            "if": { "maxLength": 4 }
+        },
+        "tests": [
+            {
+                "description": "yes redirects to then and passes",
+                "data": "yes",
+                "valid": true
+            },
+            {
+                "description": "other redirects to else and passes",
+                "data": "other",
+                "valid": true
+            },
+            {
+                "description": "no redirects to then and fails",
+                "data": "no",
+                "valid": false
+            },
+            {
+                "description": "invalid redirects to else and fails",
+                "data": "invalid",
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft7/multipleOf.json b/tests/draft7/multipleOf.json
@@ -56,5 +56,16 @@
                 "valid": false
             }
         ]
+    },
+    {
+        "description": "invalid instance should not raise error when float division = inf",
+        "schema": {"type": "integer", "multipleOf": 0.123456789},
+        "tests": [
+            {
+                "description": "always invalid, but naive implementations may raise an overflow error",
+                "data": 1e308,
+                "valid": false
+            }
+        ]
     }
 ]
diff --git a/tests/draft7/optional/float-overflow.json b/tests/draft7/optional/float-overflow.json
@@ -0,0 +1,13 @@
+[
+    {
+        "description": "all integers are multiples of 0.5, if overflow is handled",
+        "schema": {"type": "integer", "multipleOf": 0.5},
+        "tests": [
+            {
+                "description": "valid if optional overflow handling is implemented",
+                "data": 1e308,
+                "valid": true
+            }
+        ]
+    }
+]

Original file line number	Diff line number	Diff line change
`@@ -56,5 +56,16 @@`
`56`	`56`	`"valid": false`
`57`	`57`	`}`
`58`	`58`	`]`
	`59`	`+ },`
	`60`	`+ {`
	`61`	`+ "description": "invalid instance should not raise error when float division = inf",`
	`62`	`+ "schema": {"type": "integer", "multipleOf": 0.123456789},`
	`63`	`+ "tests": [`
	`64`	`+ {`
	`65`	`+ "description": "always invalid, but naive implementations may raise an overflow error",`
	`66`	`+ "data": 1e308,`
	`67`	`+ "valid": false`
	`68`	`+ }`
	`69`	`+ ]`
`59`	`70`	`}`
`60`	`71`	`]`
Original file line number	Diff line number	Diff line change
`@@ -87,12 +87,12 @@`
`87`	`87`	`},`
`88`	`88`	`"tests": [`
`89`	`89`	`{`
`90`		`- "description": "with no unevaluted items",`
	`90`	`+ "description": "with no unevaluated items",`
`91`	`91`	`"data": ["foo"],`
`92`	`92`	`"valid": true`
`93`	`93`	`},`
`94`	`94`	`{`
`95`		`- "description": "with unevaluted items",`
	`95`	`+ "description": "with unevaluated items",`
`96`	`96`	`"data": ["foo", "bar"],`
`97`	`97`	`"valid": false`
`98`	`98`	`}`
`@@ -135,12 +135,12 @@`
`135`	`135`	`},`
`136`	`136`	`"tests": [`
`137`	`137`	`{`
`138`		`- "description": "with no unevaluted items",`
	`138`	`+ "description": "with no unevaluated items",`
`139`	`139`	`"data": ["foo", 42],`
`140`	`140`	`"valid": true`
`141`	`141`	`},`
`142`	`142`	`{`
`143`		`- "description": "with unevaluted items",`
	`143`	`+ "description": "with unevaluated items",`
`144`	`144`	`"data": ["foo", 42, true],`
`145`	`145`	`"valid": false`
`146`	`146`	`}`
`@@ -228,22 +228,22 @@`
`228`	`228`	`},`
`229`	`229`	`"tests": [`
`230`	`230`	`{`
`231`		`- "description": "when one schema matches and has no unevaluted items",`
	`231`	`+ "description": "when one schema matches and has no unevaluated items",`
`232`	`232`	`"data": ["foo", "bar"],`
`233`	`233`	`"valid": true`
`234`	`234`	`},`
`235`	`235`	`{`
`236`		`- "description": "when one schema matches and has unevaluted items",`
	`236`	`+ "description": "when one schema matches and has unevaluated items",`
`237`	`237`	`"data": ["foo", "bar", 42],`
`238`	`238`	`"valid": false`
`239`	`239`	`},`
`240`	`240`	`{`
`241`		`- "description": "when two schemas match and has no unevaluted items",`
	`241`	`+ "description": "when two schemas match and has no unevaluated items",`
`242`	`242`	`"data": ["foo", "bar", "baz"],`
`243`	`243`	`"valid": true`
`244`	`244`	`},`
`245`	`245`	`{`
`246`		`- "description": "when two schemas match and has unevaluted items",`
	`246`	`+ "description": "when two schemas match and has unevaluated items",`
`247`	`247`	`"data": ["foo", "bar", "baz", 42],`
`248`	`248`	`"valid": false`
`249`	`249`	`}`
`@@ -274,12 +274,12 @@`
`274`	`274`	`},`
`275`	`275`	`"tests": [`
`276`	`276`	`{`
`277`		`- "description": "with no unevaluted items",`
	`277`	`+ "description": "with no unevaluated items",`
`278`	`278`	`"data": ["foo", "bar"],`
`279`	`279`	`"valid": true`
`280`	`280`	`},`
`281`	`281`	`{`
`282`		`- "description": "with unevaluted items",`
	`282`	`+ "description": "with unevaluated items",`
`283`	`283`	`"data": ["foo", "bar", 42],`
`284`	`284`	`"valid": false`
`285`	`285`	`}`
`@@ -304,7 +304,7 @@`
`304`	`304`	`},`
`305`	`305`	`"tests": [`
`306`	`306`	`{`
`307`		`- "description": "with unevaluted items",`
	`307`	`+ "description": "with unevaluated items",`
`308`	`308`	`"data": ["foo", "bar"],`
`309`	`309`	`"valid": false`
`310`	`310`	`}`
`@@ -342,22 +342,22 @@`
`342`	`342`	`},`
`343`	`343`	`"tests": [`
`344`	`344`	`{`
`345`		`- "description": "when if matches and it has no unevaluted items",`
	`345`	`+ "description": "when if matches and it has no unevaluated items",`
`346`	`346`	`"data": ["foo", "bar", "then"],`
`347`	`347`	`"valid": true`
`348`	`348`	`},`
`349`	`349`	`{`
`350`		`- "description": "when if matches and it has unevaluted items",`
	`350`	`+ "description": "when if matches and it has unevaluated items",`
`351`	`351`	`"data": ["foo", "bar", "then", "else"],`
`352`	`352`	`"valid": false`
`353`	`353`	`},`
`354`	`354`	`{`
`355`		`- "description": "when if doesn't match and it has no unevaluted items",`
	`355`	`+ "description": "when if doesn't match and it has no unevaluated items",`
`356`	`356`	`"data": ["foo", 42, 42, "else"],`
`357`	`357`	`"valid": true`
`358`	`358`	`},`
`359`	`359`	`{`
`360`		`- "description": "when if doesn't match and it has unevaluted items",`
	`360`	`+ "description": "when if doesn't match and it has unevaluated items",`
`361`	`361`	`"data": ["foo", 42, 42, "else", 42],`
`362`	`362`	`"valid": false`
`363`	`363`	`}`