Skip to content

Commit 4f63fb3

Browse files
committed
Merge commit 'ef71f1be9b59cc7d6e799acdc0598d45c4f1c144' into additional-evaluated
2 parents fb57921 + ef71f1b commit 4f63fb3

File tree

155 files changed

+1663
-4135
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+1663
-4135
lines changed

json/.github/workflows/pr-dependencies.yml

Lines changed: 0 additions & 12 deletions
This file was deleted.

json/.github/workflows/show_specification_annotations.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

json/README.md

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ To test a specific version:
109109

110110
* For 2019-09 and later published drafts, implementations that are able to detect the draft of each schema via `$schema` SHOULD be configured to do so
111111
* For draft-07 and earlier, draft-next, and implementations unable to detect via `$schema`, implementations MUST be configured to expect the draft matching the test directory name
112-
* Load any remote references [described below](#additional-assumptions) and configure your implementation to retrieve them via their URIs
112+
* Load any remote references [described below](additional-assumptions) and configure your implementation to retrieve them via their URIs
113113
* Walk the filesystem tree for that version's subdirectory and for each `.json` file found:
114114

115115
* if the file is located in the root of the version directory:
@@ -159,7 +159,7 @@ If your implementation supports multiple versions, run the above procedure for e
159159
```
160160
161161
2. Test cases found within [special subdirectories](#subdirectories-within-each-draft) may require additional configuration to run.
162-
In particular, when running tests within the `optional/format` subdirectory, test runners should configure implementations to enable format validation, where the implementation supports it.
162+
In particular, tests within the `optional/format` subdirectory may require implementations to change the way they treat the `"format"`keyword (particularly on older drafts which did not have a notion of vocabularies).
163163
164164
### Invariants & Guarantees
165165
@@ -254,14 +254,12 @@ This suite is being used by:
254254

255255
### Java
256256

257-
* [json-schema-validation-comparison](https://www.creekservice.org/json-schema-validation-comparison/functional) (Comparison site for JVM-based validator implementations)
258257
* [json-schema-validator](https://github.com/daveclayton/json-schema-validator)
259258
* [everit-org/json-schema](https://github.com/everit-org/json-schema)
260259
* [networknt/json-schema-validator](https://github.com/networknt/json-schema-validator)
261260
* [Justify](https://github.com/leadpony/justify)
262261
* [Snow](https://github.com/ssilverman/snowy-json)
263262
* [jsonschemafriend](https://github.com/jimblackler/jsonschemafriend)
264-
* [OpenAPI JSON Schema Generator](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator)
265263

266264
### JavaScript
267265

@@ -281,10 +279,6 @@ This suite is being used by:
281279
* [ajv](https://github.com/epoberezkin/ajv)
282280
* [djv](https://github.com/korzio/djv)
283281

284-
### Kotlin
285-
286-
* [json-schema-validation-comparison](https://www.creekservice.org/json-schema-validation-comparison/functional) (Comparison site for JVM-based validator implementations)
287-
288282
### Node.js
289283

290284
For node.js developers, the suite is also available as an [npm](https://www.npmjs.com/package/@json-schema-org/tests) package.
@@ -293,7 +287,7 @@ Node-specific support is maintained in a [separate repository](https://github.co
293287

294288
### .NET
295289

296-
* [JsonSchema.Net](https://github.com/json-everything/json-everything)
290+
* [JsonSchema.Net](https://github.com/gregsdennis/json-everything)
297291
* [Newtonsoft.Json.Schema](https://github.com/JamesNK/Newtonsoft.Json.Schema)
298292

299293
### Perl
@@ -319,7 +313,7 @@ Node-specific support is maintained in a [separate repository](https://github.co
319313
* [fastjsonschema](https://github.com/seznam/python-fastjsonschema)
320314
* [hypothesis-jsonschema](https://github.com/Zac-HD/hypothesis-jsonschema)
321315
* [jschon](https://github.com/marksparkza/jschon)
322-
* [OpenAPI JSON Schema Generator](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator)
316+
* [python-experimental, OpenAPI Generator](https://github.com/OpenAPITools/openapi-generator/blob/master/docs/generators/python-experimental.md)
323317

324318
### Ruby
325319

@@ -333,13 +327,11 @@ Node-specific support is maintained in a [separate repository](https://github.co
333327

334328
### Scala
335329

336-
* [json-schema-validation-comparison](https://www.creekservice.org/json-schema-validation-comparison/functional) (Comparison site for JVM-based validator implementations)
337330
* [typed-json](https://github.com/frawa/typed-json)
338331

339332
### Swift
340333

341334
* [JSONSchema](https://github.com/kylef/JSONSchema.swift)
342-
* [swift-json-schema](https://github.com/ajevans99/swift-json-schema)
343335

344336
If you use it as well, please fork and send a pull request adding yourself to
345337
the list :).

json/bin/annotate-specification-links

Lines changed: 0 additions & 140 deletions
This file was deleted.

json/bin/specification_urls.json

Lines changed: 0 additions & 34 deletions
This file was deleted.

json/output-tests/draft2019-09/content/type.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,32 @@
3131
"required": ["errors"]
3232
}
3333
}
34+
},
35+
{
36+
"description": "correct type yields an output unit",
37+
"data": "a string",
38+
"output": {
39+
"basic": {
40+
"$id": "https://json-schema.org/tests/content/draft2019-09/type/0/tests/1/basic",
41+
"$ref": "/draft/2019-09/output/schema",
42+
"properties": {
43+
"annotations": {
44+
"contains": {
45+
"properties": {
46+
"valid": {"const": true},
47+
"keywordLocation": {"const": "/type"},
48+
"absoluteKeywordLocation": {"const": "https://json-schema.org/tests/content/draft2019-09/type/0#/type"},
49+
"instanceLocation": {"const": ""},
50+
"annotation": false,
51+
"error": false
52+
},
53+
"required": ["keywordLocation", "instanceLocation"]
54+
}
55+
}
56+
},
57+
"required": ["annotations"]
58+
}
59+
}
3460
}
3561
]
3662
}

json/output-tests/draft2020-12/content/type.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,32 @@
3131
"required": ["errors"]
3232
}
3333
}
34+
},
35+
{
36+
"description": "correct type yields an output unit",
37+
"data": "a string",
38+
"output": {
39+
"basic": {
40+
"$id": "https://json-schema.org/tests/content/draft2020-12/type/0/tests/1/basic",
41+
"$ref": "/draft/2020-12/output/schema",
42+
"properties": {
43+
"annotations": {
44+
"contains": {
45+
"properties": {
46+
"valid": {"const": true},
47+
"keywordLocation": {"const": "/type"},
48+
"absoluteKeywordLocation": {"const": "https://json-schema.org/tests/content/draft2020-12/type/0#/type"},
49+
"instanceLocation": {"const": ""},
50+
"annotation": false,
51+
"error": false
52+
},
53+
"required": ["keywordLocation", "instanceLocation"]
54+
}
55+
}
56+
},
57+
"required": ["annotations"]
58+
}
59+
}
3460
}
3561
]
3662
}

json/remotes/draft-next/format-assertion-false.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"https://json-schema.org/draft/next/vocab/core": true,
66
"https://json-schema.org/draft/next/vocab/format-assertion": false
77
},
8-
"$dynamicAnchor": "meta",
98
"allOf": [
109
{ "$ref": "https://json-schema.org/draft/next/meta/core" },
1110
{ "$ref": "https://json-schema.org/draft/next/meta/format-assertion" }

json/remotes/draft-next/format-assertion-true.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"https://json-schema.org/draft/next/vocab/core": true,
66
"https://json-schema.org/draft/next/vocab/format-assertion": true
77
},
8-
"$dynamicAnchor": "meta",
98
"allOf": [
109
{ "$ref": "https://json-schema.org/draft/next/meta/core" },
1110
{ "$ref": "https://json-schema.org/draft/next/meta/format-assertion" }

json/remotes/draft-next/metaschema-no-validation.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"https://json-schema.org/draft/next/vocab/applicator": true,
66
"https://json-schema.org/draft/next/vocab/core": true
77
},
8-
"$dynamicAnchor": "meta",
98
"allOf": [
109
{ "$ref": "https://json-schema.org/draft/next/meta/applicator" },
1110
{ "$ref": "https://json-schema.org/draft/next/meta/core" }

json/remotes/draft-next/metaschema-optional-vocabulary.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"https://json-schema.org/draft/next/vocab/core": true,
77
"http://localhost:1234/draft/next/vocab/custom": false
88
},
9-
"$dynamicAnchor": "meta",
109
"allOf": [
1110
{ "$ref": "https://json-schema.org/draft/next/meta/validation" },
1211
{ "$ref": "https://json-schema.org/draft/next/meta/core" }
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "https://json-schema.org/draft/next/schema",
3+
"$defs": {
4+
"integer": {
5+
"type": "integer"
6+
},
7+
"refToInteger": {
8+
"$ref": "#/$defs/integer"
9+
}
10+
}
11+
}

0 commit comments

Comments
 (0)