Skip to content

Commit ab72f8c

Browse files
authored
Upgrade JSON Schema Test Suite to 06481b143722c8c06671bd40dcde99b422ffd531 (#655)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 6ea546a commit ab72f8c

File tree

73 files changed

+1666
-453
lines changed

Some content is hidden

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

73 files changed

+1666
-453
lines changed

DEPENDENCIES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
22
core https://github.com/sourcemeta/core ac96b5fba550a5097d174c1681ba3155cb3e3914
3-
jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite a247442bca7a4798ab6187e035200feacd5423ed
3+
jsonschema-test-suite https://github.com/json-schema-org/JSON-Schema-Test-Suite 06481b143722c8c06671bd40dcde99b422ffd531

test/evaluator/officialsuite.cc

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,7 @@ static auto test_resolver(std::string_view identifier)
3232
// We keep an explicit list instead of dynamically reading into the directory
3333
// to make sure we are only pulling in the right files
3434

35-
READ_SCHEMA_FILE("http://localhost:1234/different-id-ref-string.json",
36-
"different-id-ref-string.json")
3735
READ_SCHEMA_FILE("http://localhost:1234/integer.json", "integer.json")
38-
READ_SCHEMA_FILE("http://localhost:1234/nested-absolute-ref-to-string.json",
39-
"nested-absolute-ref-to-string.json")
40-
READ_SCHEMA_FILE("http://localhost:1234/urn-ref-string.json",
41-
"urn-ref-string.json")
4236

4337
READ_SCHEMA_FILE("http://localhost:1234/nested/foo-ref-string.json",
4438
std::filesystem::path{"nested"} / "foo-ref-string.json")
@@ -102,6 +96,16 @@ static auto test_resolver(std::string_view identifier)
10296
READ_SCHEMA_FILE("http://localhost:1234/draft2019-09/ignore-prefixItems.json",
10397
std::filesystem::path{"draft2019-09"} /
10498
"ignore-prefixItems.json")
99+
READ_SCHEMA_FILE(
100+
"http://localhost:1234/draft2019-09/different-id-ref-string.json",
101+
std::filesystem::path{"draft2019-09"} / "different-id-ref-string.json")
102+
READ_SCHEMA_FILE(
103+
"http://localhost:1234/draft2019-09/nested-absolute-ref-to-string.json",
104+
std::filesystem::path{"draft2019-09"} /
105+
"nested-absolute-ref-to-string.json")
106+
READ_SCHEMA_FILE("http://localhost:1234/draft2019-09/urn-ref-string.json",
107+
std::filesystem::path{"draft2019-09"} /
108+
"urn-ref-string.json")
105109

106110
READ_SCHEMA_FILE("http://localhost:1234/draft2020-12/prefixItems.json",
107111
std::filesystem::path{"draft2020-12"} / "prefixItems.json")
@@ -158,6 +162,16 @@ static auto test_resolver(std::string_view identifier)
158162
READ_SCHEMA_FILE("http://localhost:1234/draft2020-12/nested/string.json",
159163
std::filesystem::path{"draft2020-12"} / "nested" /
160164
"string.json")
165+
READ_SCHEMA_FILE(
166+
"http://localhost:1234/draft2020-12/different-id-ref-string.json",
167+
std::filesystem::path{"draft2020-12"} / "different-id-ref-string.json")
168+
READ_SCHEMA_FILE(
169+
"http://localhost:1234/draft2020-12/nested-absolute-ref-to-string.json",
170+
std::filesystem::path{"draft2020-12"} /
171+
"nested-absolute-ref-to-string.json")
172+
READ_SCHEMA_FILE("http://localhost:1234/draft2020-12/urn-ref-string.json",
173+
std::filesystem::path{"draft2020-12"} /
174+
"urn-ref-string.json")
161175

162176
READ_SCHEMA_FILE("http://localhost:1234/draft7/detached-ref.json",
163177
std::filesystem::path{"draft7"} / "detached-ref.json")

vendor/jsonschema-test-suite/remotes/draft2019-09/different-id-ref-string.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/jsonschema-test-suite/remotes/draft2019-09/nested-absolute-ref-to-string.json

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/jsonschema-test-suite/remotes/draft2019-09/tree.json

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

vendor/jsonschema-test-suite/remotes/urn-ref-string.json renamed to vendor/jsonschema-test-suite/remotes/draft2019-09/urn-ref-string.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/jsonschema-test-suite/remotes/draft2020-12/different-id-ref-string.json

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/jsonschema-test-suite/remotes/draft2020-12/nested-absolute-ref-to-string.json

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/jsonschema-test-suite/remotes/different-id-ref-string.json renamed to vendor/jsonschema-test-suite/remotes/draft2020-12/urn-ref-string.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/jsonschema-test-suite/remotes/nested-absolute-ref-to-string.json

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

0 commit comments

Comments
 (0)