Merge commit 'b5e545b0e0a3a614562293fd7755cd8d2283e8d2'

Julian · Julian · commit d0b71d19bfd4 · 2021-08-24T15:36:42.000+01:00
* commit 'b5e545b0e0a3a614562293fd7755cd8d2283e8d2':
  Squashed 'json/' changes from ab0b1ae71..20c1bb1d9
diff --git a/json/tests/draft-future/optional/format/date-time.json b/json/tests/draft-future/optional/format/date-time.json
@@ -57,6 +57,16 @@
                 "description": "invalid non-padded day dates",
                 "data": "1963-06-1T08:30:06.283185Z",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the date portion",
+                "data": "1963-06-1৪T00:00:00Z",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the time portion",
+                "data": "1963-06-11T0৪:00:00Z",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft-future/optional/format/date.json b/json/tests/draft-future/optional/format/date.json
@@ -182,6 +182,11 @@
                 "description": "2020 is a leap year",
                 "data": "2020-02-29",
                 "valid": true
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1963-06-1৪",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft-future/optional/format/duration.json b/json/tests/draft-future/optional/format/duration.json
@@ -87,6 +87,11 @@
                 "description": "weeks cannot be combined with other units",
                 "data": "P1Y2W",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "P২Y",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft-future/optional/format/ipv4.json b/json/tests/draft-future/optional/format/ipv4.json
@@ -43,6 +43,11 @@
                 "description": "value without leading zero is valid",
                 "data": "87.10.0.1",
                 "valid": true
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1২7.0.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft-future/optional/format/ipv6.json b/json/tests/draft-future/optional/format/ipv6.json
@@ -147,6 +147,16 @@
                 "description": "a long invalid ipv6, below length limit, second",
                 "data": "100:100:100:100:100:100:100:255.255.255.255",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1:2:3:4:5:6:7:৪",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the ipv4 portion also",
+                "data": "1:2::192.16৪.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft-future/optional/format/time.json b/json/tests/draft-future/optional/format/time.json
@@ -152,6 +152,16 @@
                 "description": "only RFC3339 not all of ISO 8601 are valid",
                 "data": "01:01:01,1111",
                 "valid": false
+            },
+            {
+                "description": "no time offset",
+                "data": "12:00:00",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1২:00:00Z",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2019-09/optional/format/date-time.json b/json/tests/draft2019-09/optional/format/date-time.json
@@ -57,6 +57,16 @@
                 "description": "invalid non-padded day dates",
                 "data": "1963-06-1T08:30:06.283185Z",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the date portion",
+                "data": "1963-06-1৪T00:00:00Z",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the time portion",
+                "data": "1963-06-11T0৪:00:00Z",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2019-09/optional/format/date.json b/json/tests/draft2019-09/optional/format/date.json
@@ -182,6 +182,11 @@
                 "description": "2020 is a leap year",
                 "data": "2020-02-29",
                 "valid": true
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1963-06-1৪",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2019-09/optional/format/duration.json b/json/tests/draft2019-09/optional/format/duration.json
@@ -87,6 +87,11 @@
                 "description": "weeks cannot be combined with other units",
                 "data": "P1Y2W",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "P২Y",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2019-09/optional/format/ipv4.json b/json/tests/draft2019-09/optional/format/ipv4.json
@@ -43,6 +43,11 @@
                 "description": "value without leading zero is valid",
                 "data": "87.10.0.1",
                 "valid": true
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1২7.0.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2019-09/optional/format/ipv6.json b/json/tests/draft2019-09/optional/format/ipv6.json
@@ -147,6 +147,16 @@
                 "description": "a long invalid ipv6, below length limit, second",
                 "data": "100:100:100:100:100:100:100:255.255.255.255",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1:2:3:4:5:6:7:৪",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the ipv4 portion also",
+                "data": "1:2::192.16৪.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2019-09/optional/format/time.json b/json/tests/draft2019-09/optional/format/time.json
@@ -152,6 +152,16 @@
                 "description": "only RFC3339 not all of ISO 8601 are valid",
                 "data": "01:01:01,1111",
                 "valid": false
+            },
+            {
+                "description": "no time offset",
+                "data": "12:00:00",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1২:00:00Z",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2020-12/optional/format/date-time.json b/json/tests/draft2020-12/optional/format/date-time.json
@@ -57,6 +57,16 @@
                 "description": "invalid non-padded day dates",
                 "data": "1963-06-1T08:30:06.283185Z",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the date portion",
+                "data": "1963-06-1৪T00:00:00Z",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the time portion",
+                "data": "1963-06-11T0৪:00:00Z",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2020-12/optional/format/date.json b/json/tests/draft2020-12/optional/format/date.json
@@ -182,6 +182,11 @@
                 "description": "2020 is a leap year",
                 "data": "2020-02-29",
                 "valid": true
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1963-06-1৪",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2020-12/optional/format/duration.json b/json/tests/draft2020-12/optional/format/duration.json
@@ -87,6 +87,11 @@
                 "description": "weeks cannot be combined with other units",
                 "data": "P1Y2W",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "P২Y",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2020-12/optional/format/ipv4.json b/json/tests/draft2020-12/optional/format/ipv4.json
@@ -43,6 +43,11 @@
                 "description": "value without leading zero is valid",
                 "data": "87.10.0.1",
                 "valid": true
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1২7.0.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2020-12/optional/format/ipv6.json b/json/tests/draft2020-12/optional/format/ipv6.json
@@ -147,6 +147,16 @@
                 "description": "a long invalid ipv6, below length limit, second",
                 "data": "100:100:100:100:100:100:100:255.255.255.255",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1:2:3:4:5:6:7:৪",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the ipv4 portion also",
+                "data": "1:2::192.16৪.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft2020-12/optional/format/time.json b/json/tests/draft2020-12/optional/format/time.json
@@ -152,6 +152,16 @@
                 "description": "only RFC3339 not all of ISO 8601 are valid",
                 "data": "01:01:01,1111",
                 "valid": false
+            },
+            {
+                "description": "no time offset",
+                "data": "12:00:00",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1২:00:00Z",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft4/optional/format/date-time.json b/json/tests/draft4/optional/format/date-time.json
@@ -57,6 +57,16 @@
                 "description": "invalid non-padded day dates",
                 "data": "1963-06-1T08:30:06.283185Z",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the date portion",
+                "data": "1963-06-1৪T00:00:00Z",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the time portion",
+                "data": "1963-06-11T0৪:00:00Z",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft4/optional/format/ipv4.json b/json/tests/draft4/optional/format/ipv4.json
@@ -43,6 +43,11 @@
                 "description": "value without leading zero is valid",
                 "data": "87.10.0.1",
                 "valid": true
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1২7.0.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft4/optional/format/ipv6.json b/json/tests/draft4/optional/format/ipv6.json
@@ -147,6 +147,16 @@
                 "description": "a long invalid ipv6, below length limit, second",
                 "data": "100:100:100:100:100:100:100:255.255.255.255",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1:2:3:4:5:6:7:৪",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the ipv4 portion also",
+                "data": "1:2::192.16৪.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft6/optional/format/date-time.json b/json/tests/draft6/optional/format/date-time.json
@@ -62,6 +62,16 @@
                 "description": "invalid non-padded day dates",
                 "data": "1963-06-1T08:30:06.283185Z",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the date portion",
+                "data": "1963-06-1৪T00:00:00Z",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the time portion",
+                "data": "1963-06-11T0৪:00:00Z",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft6/optional/format/ipv4.json b/json/tests/draft6/optional/format/ipv4.json
@@ -43,6 +43,11 @@
                 "description": "value without leading zero is valid",
                 "data": "87.10.0.1",
                 "valid": true
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1২7.0.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft6/optional/format/ipv6.json b/json/tests/draft6/optional/format/ipv6.json
@@ -147,6 +147,16 @@
                 "description": "a long invalid ipv6, below length limit, second",
                 "data": "100:100:100:100:100:100:100:255.255.255.255",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1:2:3:4:5:6:7:৪",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the ipv4 portion also",
+                "data": "1:2::192.16৪.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft7/optional/format/date-time.json b/json/tests/draft7/optional/format/date-time.json
@@ -57,6 +57,16 @@
                 "description": "invalid non-padded day dates",
                 "data": "1963-06-1T08:30:06.283185Z",
                 "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the date portion",
+                "data": "1963-06-1৪T00:00:00Z",
+                "valid": false
+            },
+            {
+                "description": "non-ascii digits should be rejected in the time portion",
+                "data": "1963-06-11T0৪:00:00Z",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft7/optional/format/date.json b/json/tests/draft7/optional/format/date.json
@@ -182,6 +182,11 @@
                 "description": "2020 is a leap year",
                 "data": "2020-02-29",
                 "valid": true
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1963-06-1৪",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft7/optional/format/ipv4.json b/json/tests/draft7/optional/format/ipv4.json
@@ -43,6 +43,11 @@
                 "description": "value without leading zero is valid",
                 "data": "87.10.0.1",
                 "valid": true
+            },
+            {
+                "description": "non-ascii digits should be rejected",
+                "data": "1২7.0.0.1",
+                "valid": false
             }
         ]
     }
diff --git a/json/tests/draft7/optional/format/ipv6.json b/json/tests/draft7/optional/format/ipv6.json
diff --git a/json/tests/draft7/optional/format/time.json b/json/tests/draft7/optional/format/time.json

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,16 @@`
`57`	`57`	`"description": "invalid non-padded day dates",`
`58`	`58`	`"data": "1963-06-1T08:30:06.283185Z",`
`59`	`59`	`"valid": false`
	`60`	`+ },`
	`61`	`+ {`
	`62`	`+ "description": "non-ascii digits should be rejected in the date portion",`
	`63`	`+ "data": "1963-06-1৪T00:00:00Z",`
	`64`	`+ "valid": false`
	`65`	`+ },`
	`66`	`+ {`
	`67`	`+ "description": "non-ascii digits should be rejected in the time portion",`
	`68`	`+ "data": "1963-06-11T0৪:00:00Z",`
	`69`	`+ "valid": false`
`60`	`70`	`}`
`61`	`71`	`]`
`62`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,11 @@`
`182`	`182`	`"description": "2020 is a leap year",`
`183`	`183`	`"data": "2020-02-29",`
`184`	`184`	`"valid": true`
	`185`	`+ },`
	`186`	`+ {`
	`187`	`+ "description": "non-ascii digits should be rejected",`
	`188`	`+ "data": "1963-06-1৪",`
	`189`	`+ "valid": false`
`185`	`190`	`}`
`186`	`191`	`]`
`187`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,11 @@`
`87`	`87`	`"description": "weeks cannot be combined with other units",`
`88`	`88`	`"data": "P1Y2W",`
`89`	`89`	`"valid": false`
	`90`	`+ },`
	`91`	`+ {`
	`92`	`+ "description": "non-ascii digits should be rejected",`
	`93`	`+ "data": "P২Y",`
	`94`	`+ "valid": false`
`90`	`95`	`}`
`91`	`96`	`]`
`92`	`97`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,11 @@`
`43`	`43`	`"description": "value without leading zero is valid",`
`44`	`44`	`"data": "87.10.0.1",`
`45`	`45`	`"valid": true`
	`46`	`+ },`
	`47`	`+ {`
	`48`	`+ "description": "non-ascii digits should be rejected",`
	`49`	`+ "data": "1২7.0.0.1",`
	`50`	`+ "valid": false`
`46`	`51`	`}`
`47`	`52`	`]`
`48`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,16 @@`
`147`	`147`	`"description": "a long invalid ipv6, below length limit, second",`
`148`	`148`	`"data": "100:100:100:100:100:100:100:255.255.255.255",`
`149`	`149`	`"valid": false`
	`150`	`+ },`
	`151`	`+ {`
	`152`	`+ "description": "non-ascii digits should be rejected",`
	`153`	`+ "data": "1:2:3:4:5:6:7:৪",`
	`154`	`+ "valid": false`
	`155`	`+ },`
	`156`	`+ {`
	`157`	`+ "description": "non-ascii digits should be rejected in the ipv4 portion also",`
	`158`	`+ "data": "1:2::192.16৪.0.1",`
	`159`	`+ "valid": false`
`150`	`160`	`}`
`151`	`161`	`]`
`152`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,16 @@`
`152`	`152`	`"description": "only RFC3339 not all of ISO 8601 are valid",`
`153`	`153`	`"data": "01:01:01,1111",`
`154`	`154`	`"valid": false`
	`155`	`+ },`
	`156`	`+ {`
	`157`	`+ "description": "no time offset",`
	`158`	`+ "data": "12:00:00",`
	`159`	`+ "valid": false`
	`160`	`+ },`
	`161`	`+ {`
	`162`	`+ "description": "non-ascii digits should be rejected",`
	`163`	`+ "data": "1২:00:00Z",`
	`164`	`+ "valid": false`
`155`	`165`	`}`
`156`	`166`	`]`
`157`	`167`	`}`