From e2685dde3eede109e160390d2d733a311ccc31a8 Mon Sep 17 00:00:00 2001 From: Roger Peppe Date: Mon, 2 Sep 2024 15:21:03 +0100 Subject: [PATCH] encoding/jsonschema: run external tests in matrix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change now runs the external tests in both the v2 and v3 evaluators and updates the respective test skip fields accordingly. There is a lot of duplication, naturally, but it seems better to keep the testing code simpler by having independently updated fields than to try to combine them when they're the same. It'll be straightforward to change the `teststats` helper program to summarise differences between v2 and v3 in a human-readable fashion as required. Signed-off-by: Roger Peppe Change-Id: Id21625d2b3d3e442a64f91b1fac39b1fe418b2fd Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1200520 Unity-Result: CUE porcuepine TryBot-Result: CUEcueckoo Reviewed-by: Daniel Martí --- encoding/jsonschema/external_test.go | 44 +- .../tests/draft2019-09/additionalItems.json | 15 +- .../draft2019-09/additionalProperties.json | 27 +- .../external/tests/draft2019-09/allOf.json | 24 +- .../external/tests/draft2019-09/anchor.json | 36 +- .../external/tests/draft2019-09/anyOf.json | 6 +- .../tests/draft2019-09/boolean_schema.json | 30 +- .../external/tests/draft2019-09/const.json | 15 +- .../external/tests/draft2019-09/contains.json | 9 +- .../external/tests/draft2019-09/content.json | 27 +- .../external/tests/draft2019-09/default.json | 3 +- .../external/tests/draft2019-09/defs.json | 9 +- .../tests/draft2019-09/dependentRequired.json | 72 ++- .../tests/draft2019-09/dependentSchemas.json | 72 ++- .../external/tests/draft2019-09/enum.json | 21 +- .../external/tests/draft2019-09/format.json | 399 +++++++++----- .../tests/draft2019-09/if-then-else.json | 108 ++-- .../external/tests/draft2019-09/items.json | 39 +- .../tests/draft2019-09/maxContains.json | 9 +- .../external/tests/draft2019-09/maxItems.json | 9 +- .../tests/draft2019-09/maxLength.json | 3 +- .../tests/draft2019-09/maxProperties.json | 9 +- .../tests/draft2019-09/minContains.json | 9 +- .../external/tests/draft2019-09/minItems.json | 9 +- .../tests/draft2019-09/minLength.json | 3 +- .../tests/draft2019-09/minProperties.json | 30 +- .../external/tests/draft2019-09/not.json | 147 ++++-- .../external/tests/draft2019-09/oneOf.json | 33 +- .../tests/draft2019-09/optional/anchor.json | 15 +- .../draft2019-09/optional/cross-draft.json | 15 +- .../optional/dependencies-compatibility.json | 42 +- .../optional/ecmascript-regex.json | 112 ++-- .../draft2019-09/optional/float-overflow.json | 3 +- .../optional/format/date-time.json | 78 ++- .../draft2019-09/optional/format/date.json | 144 ++++-- .../optional/format/duration.json | 78 ++- .../draft2019-09/optional/format/email.json | 48 +- .../optional/format/hostname.json | 72 ++- .../optional/format/idn-email.json | 33 +- .../optional/format/idn-hostname.json | 171 ++++-- .../draft2019-09/optional/format/ipv4.json | 51 +- .../draft2019-09/optional/format/ipv6.json | 123 +++-- .../optional/format/iri-reference.json | 42 +- .../draft2019-09/optional/format/iri.json | 48 +- .../optional/format/json-pointer.json | 117 +++-- .../draft2019-09/optional/format/regex.json | 27 +- .../format/relative-json-pointer.json | 57 +- .../draft2019-09/optional/format/time.json | 138 +++-- .../draft2019-09/optional/format/unknown.json | 24 +- .../optional/format/uri-reference.json | 42 +- .../optional/format/uri-template.json | 33 +- .../draft2019-09/optional/format/uri.json | 81 ++- .../draft2019-09/optional/format/uuid.json | 66 ++- .../tests/draft2019-09/optional/id.json | 12 +- .../optional/refOfUnknownKeyword.json | 27 +- .../draft2019-09/optional/unknownKeyword.json | 12 +- .../tests/draft2019-09/properties.json | 3 +- .../tests/draft2019-09/propertyNames.json | 34 +- .../tests/draft2019-09/recursiveRef.json | 129 +++-- .../external/tests/draft2019-09/ref.json | 196 ++++--- .../tests/draft2019-09/refRemote.json | 138 +++-- .../external/tests/draft2019-09/required.json | 18 +- .../external/tests/draft2019-09/type.json | 3 +- .../tests/draft2019-09/unevaluatedItems.json | 240 ++++++--- .../draft2019-09/unevaluatedProperties.json | 486 ++++++++++++------ .../tests/draft2019-09/uniqueItems.json | 27 +- .../tests/draft2019-09/vocabulary.json | 21 +- .../draft2020-12/additionalProperties.json | 27 +- .../external/tests/draft2020-12/allOf.json | 24 +- .../external/tests/draft2020-12/anchor.json | 36 +- .../external/tests/draft2020-12/anyOf.json | 6 +- .../tests/draft2020-12/boolean_schema.json | 30 +- .../external/tests/draft2020-12/const.json | 15 +- .../external/tests/draft2020-12/contains.json | 9 +- .../external/tests/draft2020-12/content.json | 27 +- .../external/tests/draft2020-12/default.json | 3 +- .../external/tests/draft2020-12/defs.json | 9 +- .../tests/draft2020-12/dependentRequired.json | 72 ++- .../tests/draft2020-12/dependentSchemas.json | 72 ++- .../tests/draft2020-12/dynamicRef.json | 186 ++++--- .../external/tests/draft2020-12/enum.json | 21 +- .../external/tests/draft2020-12/format.json | 456 ++++++++++------ .../tests/draft2020-12/if-then-else.json | 108 ++-- .../external/tests/draft2020-12/items.json | 84 ++- .../tests/draft2020-12/maxContains.json | 9 +- .../external/tests/draft2020-12/maxItems.json | 9 +- .../tests/draft2020-12/maxLength.json | 3 +- .../tests/draft2020-12/maxProperties.json | 9 +- .../tests/draft2020-12/minContains.json | 9 +- .../external/tests/draft2020-12/minItems.json | 9 +- .../tests/draft2020-12/minLength.json | 3 +- .../tests/draft2020-12/minProperties.json | 30 +- .../external/tests/draft2020-12/not.json | 147 ++++-- .../external/tests/draft2020-12/oneOf.json | 33 +- .../tests/draft2020-12/optional/anchor.json | 15 +- .../draft2020-12/optional/cross-draft.json | 6 +- .../optional/dependencies-compatibility.json | 42 +- .../draft2020-12/optional/dynamicRef.json | 9 +- .../optional/ecmascript-regex.json | 118 +++-- .../draft2020-12/optional/float-overflow.json | 3 +- .../optional/format-assertion.json | 18 +- .../optional/format/date-time.json | 78 ++- .../draft2020-12/optional/format/date.json | 144 ++++-- .../optional/format/duration.json | 78 ++- .../draft2020-12/optional/format/email.json | 69 ++- .../optional/format/hostname.json | 72 ++- .../optional/format/idn-email.json | 33 +- .../optional/format/idn-hostname.json | 171 ++++-- .../draft2020-12/optional/format/ipv4.json | 51 +- .../draft2020-12/optional/format/ipv6.json | 123 +++-- .../optional/format/iri-reference.json | 42 +- .../draft2020-12/optional/format/iri.json | 48 +- .../optional/format/json-pointer.json | 117 +++-- .../draft2020-12/optional/format/regex.json | 27 +- .../format/relative-json-pointer.json | 57 +- .../draft2020-12/optional/format/time.json | 138 +++-- .../draft2020-12/optional/format/unknown.json | 24 +- .../optional/format/uri-reference.json | 42 +- .../optional/format/uri-template.json | 33 +- .../draft2020-12/optional/format/uri.json | 81 ++- .../draft2020-12/optional/format/uuid.json | 66 ++- .../tests/draft2020-12/optional/id.json | 12 +- .../optional/refOfUnknownKeyword.json | 27 +- .../draft2020-12/optional/unknownKeyword.json | 12 +- .../tests/draft2020-12/prefixItems.json | 45 +- .../tests/draft2020-12/properties.json | 3 +- .../tests/draft2020-12/propertyNames.json | 31 +- .../external/tests/draft2020-12/ref.json | 187 ++++--- .../tests/draft2020-12/refRemote.json | 138 +++-- .../external/tests/draft2020-12/required.json | 18 +- .../external/tests/draft2020-12/type.json | 3 +- .../tests/draft2020-12/unevaluatedItems.json | 279 ++++++---- .../draft2020-12/unevaluatedProperties.json | 486 ++++++++++++------ .../tests/draft2020-12/uniqueItems.json | 99 ++-- .../tests/draft2020-12/vocabulary.json | 21 +- .../tests/draft4/additionalItems.json | 15 +- .../tests/draft4/additionalProperties.json | 6 +- .../testdata/external/tests/draft4/allOf.json | 18 +- .../external/tests/draft4/default.json | 3 +- .../external/tests/draft4/definitions.json | 9 +- .../external/tests/draft4/dependencies.json | 39 +- .../testdata/external/tests/draft4/enum.json | 21 +- .../external/tests/draft4/format.json | 126 +++-- .../testdata/external/tests/draft4/items.json | 15 +- .../external/tests/draft4/maximum.json | 3 +- .../external/tests/draft4/minProperties.json | 21 +- .../external/tests/draft4/minimum.json | 3 +- .../testdata/external/tests/draft4/not.json | 78 ++- .../testdata/external/tests/draft4/oneOf.json | 24 +- .../draft4/optional/ecmascript-regex.json | 112 ++-- .../draft4/optional/format/date-time.json | 78 ++- .../tests/draft4/optional/format/email.json | 48 +- .../draft4/optional/format/hostname.json | 69 ++- .../tests/draft4/optional/format/ipv4.json | 51 +- .../tests/draft4/optional/format/ipv6.json | 123 +++-- .../tests/draft4/optional/format/unknown.json | 24 +- .../tests/draft4/optional/format/uri.json | 81 ++- .../external/tests/draft4/optional/id.json | 12 +- .../external/tests/draft4/properties.json | 3 +- .../testdata/external/tests/draft4/ref.json | 110 ++-- .../external/tests/draft4/refRemote.json | 75 ++- .../external/tests/draft4/required.json | 18 +- .../external/tests/draft4/uniqueItems.json | 27 +- .../tests/draft6/additionalItems.json | 15 +- .../tests/draft6/additionalProperties.json | 6 +- .../testdata/external/tests/draft6/allOf.json | 24 +- .../testdata/external/tests/draft6/anyOf.json | 6 +- .../external/tests/draft6/boolean_schema.json | 30 +- .../testdata/external/tests/draft6/const.json | 15 +- .../external/tests/draft6/default.json | 3 +- .../external/tests/draft6/definitions.json | 9 +- .../external/tests/draft6/dependencies.json | 45 +- .../testdata/external/tests/draft6/enum.json | 21 +- .../external/tests/draft6/format.json | 189 ++++--- .../testdata/external/tests/draft6/items.json | 39 +- .../external/tests/draft6/maxItems.json | 9 +- .../external/tests/draft6/maxLength.json | 3 +- .../external/tests/draft6/maxProperties.json | 9 +- .../external/tests/draft6/minItems.json | 9 +- .../external/tests/draft6/minLength.json | 3 +- .../external/tests/draft6/minProperties.json | 30 +- .../testdata/external/tests/draft6/not.json | 138 +++-- .../testdata/external/tests/draft6/oneOf.json | 33 +- .../draft6/optional/ecmascript-regex.json | 112 ++-- .../tests/draft6/optional/float-overflow.json | 3 +- .../draft6/optional/format/date-time.json | 78 ++- .../tests/draft6/optional/format/email.json | 48 +- .../draft6/optional/format/hostname.json | 69 ++- .../tests/draft6/optional/format/ipv4.json | 51 +- .../tests/draft6/optional/format/ipv6.json | 123 +++-- .../draft6/optional/format/json-pointer.json | 117 +++-- .../tests/draft6/optional/format/unknown.json | 24 +- .../draft6/optional/format/uri-reference.json | 42 +- .../draft6/optional/format/uri-template.json | 33 +- .../tests/draft6/optional/format/uri.json | 81 ++- .../external/tests/draft6/optional/id.json | 30 +- .../tests/draft6/optional/unknownKeyword.json | 12 +- .../external/tests/draft6/properties.json | 3 +- .../external/tests/draft6/propertyNames.json | 34 +- .../testdata/external/tests/draft6/ref.json | 206 +++++--- .../external/tests/draft6/refRemote.json | 102 ++-- .../external/tests/draft6/required.json | 18 +- .../testdata/external/tests/draft6/type.json | 3 +- .../external/tests/draft6/uniqueItems.json | 27 +- .../tests/draft7/additionalItems.json | 15 +- .../tests/draft7/additionalProperties.json | 6 +- .../testdata/external/tests/draft7/allOf.json | 24 +- .../testdata/external/tests/draft7/anyOf.json | 6 +- .../external/tests/draft7/boolean_schema.json | 30 +- .../testdata/external/tests/draft7/const.json | 15 +- .../external/tests/draft7/contains.json | 9 +- .../external/tests/draft7/default.json | 3 +- .../external/tests/draft7/definitions.json | 9 +- .../external/tests/draft7/dependencies.json | 45 +- .../testdata/external/tests/draft7/enum.json | 21 +- .../external/tests/draft7/format.json | 357 ++++++++----- .../external/tests/draft7/if-then-else.json | 108 ++-- .../testdata/external/tests/draft7/items.json | 39 +- .../external/tests/draft7/maxItems.json | 9 +- .../external/tests/draft7/maxLength.json | 3 +- .../external/tests/draft7/maxProperties.json | 9 +- .../external/tests/draft7/minItems.json | 9 +- .../external/tests/draft7/minLength.json | 3 +- .../external/tests/draft7/minProperties.json | 30 +- .../testdata/external/tests/draft7/not.json | 138 +++-- .../testdata/external/tests/draft7/oneOf.json | 33 +- .../tests/draft7/optional/content.json | 12 +- .../tests/draft7/optional/cross-draft.json | 9 +- .../draft7/optional/ecmascript-regex.json | 112 ++-- .../tests/draft7/optional/float-overflow.json | 3 +- .../draft7/optional/format/date-time.json | 78 ++- .../tests/draft7/optional/format/date.json | 144 ++++-- .../tests/draft7/optional/format/email.json | 48 +- .../draft7/optional/format/hostname.json | 69 ++- .../draft7/optional/format/idn-email.json | 33 +- .../draft7/optional/format/idn-hostname.json | 168 ++++-- .../tests/draft7/optional/format/ipv4.json | 51 +- .../tests/draft7/optional/format/ipv6.json | 123 +++-- .../draft7/optional/format/iri-reference.json | 42 +- .../tests/draft7/optional/format/iri.json | 48 +- .../draft7/optional/format/json-pointer.json | 117 +++-- .../tests/draft7/optional/format/regex.json | 27 +- .../format/relative-json-pointer.json | 57 +- .../tests/draft7/optional/format/time.json | 138 +++-- .../tests/draft7/optional/format/unknown.json | 24 +- .../draft7/optional/format/uri-reference.json | 42 +- .../draft7/optional/format/uri-template.json | 33 +- .../tests/draft7/optional/format/uri.json | 81 ++- .../external/tests/draft7/optional/id.json | 30 +- .../tests/draft7/optional/unknownKeyword.json | 12 +- .../external/tests/draft7/properties.json | 3 +- .../external/tests/draft7/propertyNames.json | 34 +- .../testdata/external/tests/draft7/ref.json | 197 ++++--- .../external/tests/draft7/refRemote.json | 102 ++-- .../external/tests/draft7/required.json | 18 +- .../testdata/external/tests/draft7/type.json | 3 +- .../external/tests/draft7/uniqueItems.json | 27 +- 257 files changed, 9759 insertions(+), 4846 deletions(-) diff --git a/encoding/jsonschema/external_test.go b/encoding/jsonschema/external_test.go index 637faa5cbe8..414b30434d4 100644 --- a/encoding/jsonschema/external_test.go +++ b/encoding/jsonschema/external_test.go @@ -26,13 +26,13 @@ import ( "github.com/go-quicktest/qt" "cuelang.org/go/cue" - "cuelang.org/go/cue/cuecontext" "cuelang.org/go/cue/errors" "cuelang.org/go/cue/format" "cuelang.org/go/cue/token" "cuelang.org/go/encoding/json" "cuelang.org/go/encoding/jsonschema" "cuelang.org/go/encoding/jsonschema/internal/externaltest" + "cuelang.org/go/internal/cuetdtest" "cuelang.org/go/internal/cuetest" ) @@ -52,14 +52,14 @@ func TestExternal(t *testing.T) { // Group the tests under a single subtest so that we can use // t.Parallel and still guarantee that all tests have completed // by the end. - t.Run("tests", func(t *testing.T) { + cuetdtest.SmallMatrix.Run(t, "tests", func(t *testing.T, m *cuetdtest.M) { // Run tests in deterministic order so we get some consistency between runs. for _, filename := range sortedKeys(tests) { schemas := tests[filename] t.Run(testName(filename), func(t *testing.T) { for _, s := range schemas { t.Run(testName(s.Description), func(t *testing.T) { - runExternalSchemaTests(t, filename, s) + runExternalSchemaTests(t, m, filename, s) }) } }) @@ -75,9 +75,9 @@ func TestExternal(t *testing.T) { qt.Assert(t, qt.IsNil(err)) } -func runExternalSchemaTests(t *testing.T, filename string, s *externaltest.Schema) { +func runExternalSchemaTests(t *testing.T, m *cuetdtest.M, filename string, s *externaltest.Schema) { t.Logf("file %v", path.Join("testdata/external", filename)) - ctx := cuecontext.New() + ctx := m.CueContext() jsonAST, err := json.Extract("schema.json", s.Schema) qt.Assert(t, qt.IsNil(err)) jsonValue := ctx.BuildExpr(jsonAST) @@ -112,13 +112,13 @@ func runExternalSchemaTests(t *testing.T, filename string, s *externaltest.Schem t.Logf("txtar:\n%s", schemaFailureTxtar(s)) for _, test := range s.Tests { t.Run("", func(t *testing.T) { - testFailed(t, &test.Skip, test, "could not compile schema") + testFailed(t, m, &test.Skip, test, "could not compile schema") }) } - testFailed(t, &s.Skip, s, fmt.Sprintf("extract error: %v", extractErr)) + testFailed(t, m, &s.Skip, s, fmt.Sprintf("extract error: %v", extractErr)) return } - testSucceeded(t, &s.Skip, s) + testSucceeded(t, m, &s.Skip, s) for _, test := range s.Tests { t.Run(testName(test.Description), func(t *testing.T) { @@ -140,15 +140,15 @@ func runExternalSchemaTests(t *testing.T, filename string, s *externaltest.Schem err = instValue.Unify(schemaValue).Err() if test.Valid { if err != nil { - testFailed(t, &test.Skip, test, errors.Details(err, nil)) + testFailed(t, m, &test.Skip, test, errors.Details(err, nil)) } else { - testSucceeded(t, &test.Skip, test) + testSucceeded(t, m, &test.Skip, test) } } else { if err == nil { - testFailed(t, &test.Skip, test, "unexpected success") + testFailed(t, m, &test.Skip, test, "unexpected success") } else { - testSucceeded(t, &test.Skip, test) + testSucceeded(t, m, &test.Skip, test) } } }) @@ -203,28 +203,34 @@ func testName(s string) string { // testFailed marks the current test as failed with the // given error message, and updates the // skip field pointed to by skipField if necessary. -func testFailed(t *testing.T, skipField *externaltest.Skip, p positioner, errStr string) { +func testFailed(t *testing.T, m *cuetdtest.M, skipField *externaltest.Skip, p positioner, errStr string) { if cuetest.UpdateGoldenFiles { if *skipField == nil && !allowRegressions() { t.Fatalf("test regression; was succeeding, now failing: %v", errStr) } - *skipField = externaltest.Skip{"v2": errStr} + if *skipField == nil { + *skipField = make(externaltest.Skip) + } + (*skipField)[m.Name()] = errStr return } - if *skipField != nil { - t.Skipf("skipping due to known error: %v", *skipField) + if reason := (*skipField)[m.Name()]; reason != "" { + t.Skipf("skipping due to known error: %v", reason) } t.Fatal(errStr) } // testFails marks the current test as succeeded and updates the // skip field pointed to by skipField if necessary. -func testSucceeded(t *testing.T, skipField *externaltest.Skip, p positioner) { +func testSucceeded(t *testing.T, m *cuetdtest.M, skipField *externaltest.Skip, p positioner) { if cuetest.UpdateGoldenFiles { - *skipField = nil + delete(*skipField, m.Name()) + if len(*skipField) == 0 { + *skipField = nil + } return } - if *skipField != nil { + if reason := (*skipField)[m.Name()]; reason != "" { t.Fatalf("unexpectedly more correct behavior (test success) on skipped test") } } diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalItems.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalItems.json index aa0dbff122f..7778e046340 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalItems.json @@ -103,7 +103,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (0 and 3):\n instance.json:1:1\n" } }, { @@ -113,7 +114,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n instance.json:1:1\n" } }, { @@ -124,7 +126,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 3):\n instance.json:1:1\n" } }, { @@ -195,7 +198,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n instance.json:1:1\n" } } ] @@ -226,7 +230,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalProperties.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalProperties.json index 6583ef36e0f..6fc74494db3 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/additionalProperties.json @@ -29,7 +29,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -85,7 +86,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -232,7 +234,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n" + "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n", + "v3": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n" }, "tests": [ { @@ -242,7 +245,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -253,7 +257,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -276,7 +281,8 @@ "additionalProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\"" + "v2": "extract error: unsupported constraint \"dependentSchemas\"", + "v3": "extract error: unsupported constraint \"dependentSchemas\"" }, "tests": [ { @@ -286,7 +292,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -296,7 +303,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -307,7 +315,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/allOf.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/allOf.json index d15cc0e2f91..b3dfcd7bcf3 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/allOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/allOf.json @@ -42,7 +42,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -52,7 +53,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -118,7 +120,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -129,7 +132,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -140,7 +144,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -150,7 +155,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -213,7 +219,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -233,7 +240,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/anchor.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/anchor.json index dcdf6d1a2fc..8a5f4e0d438 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/anchor.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/anchor.json @@ -12,7 +12,8 @@ } }, "skip": { - "v2": "extract error: anchors (foo) not supported (and 1 more errors)" + "v2": "extract error: anchors (foo) not supported (and 1 more errors)", + "v3": "extract error: anchors (foo) not supported (and 1 more errors)" }, "tests": [ { @@ -20,7 +21,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -28,7 +30,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -47,7 +50,8 @@ } }, "skip": { - "v2": "extract error: anchors (foo) not supported (and 1 more errors)" + "v2": "extract error: anchors (foo) not supported (and 1 more errors)", + "v3": "extract error: anchors (foo) not supported (and 1 more errors)" }, "tests": [ { @@ -55,7 +59,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -63,7 +68,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -87,7 +93,8 @@ } }, "skip": { - "v2": "extract error: anchors (foo) not supported (and 1 more errors)" + "v2": "extract error: anchors (foo) not supported (and 1 more errors)", + "v3": "extract error: anchors (foo) not supported (and 1 more errors)" }, "tests": [ { @@ -95,7 +102,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -103,7 +111,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -132,7 +141,8 @@ "$ref": "child1#my_anchor" }, "skip": { - "v2": "extract error: unsupported constraint \"$anchor\" (and 4 more errors)" + "v2": "extract error: unsupported constraint \"$anchor\" (and 4 more errors)", + "v3": "extract error: unsupported constraint \"$anchor\" (and 4 more errors)" }, "tests": [ { @@ -140,7 +150,8 @@ "data": "a", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -148,7 +159,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/anyOf.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/anyOf.json index 483aebf6781..90c2952f8a6 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/anyOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/anyOf.json @@ -111,7 +111,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: 2 errors in empty disjunction:\nexplicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n" + "v2": "extract error: cannot compile resulting schema: 2 errors in empty disjunction:\nexplicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n" }, "tests": [ { @@ -119,7 +120,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/boolean_schema.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/boolean_schema.json index 6b151b0d187..3dd9c3364fa 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/boolean_schema.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/boolean_schema.json @@ -58,7 +58,8 @@ "description": "boolean schema 'false'", "schema": false, "skip": { - "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n" + "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n" }, "tests": [ { @@ -66,7 +67,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -74,7 +76,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -82,7 +85,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -90,7 +94,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -98,7 +103,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -108,7 +114,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -116,7 +123,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +134,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +143,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/const.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/const.json index 36b8cd9b880..0cc4d45979b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/const.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/const.json @@ -56,7 +56,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -324,7 +325,8 @@ "data": 0.0, "valid": true, "skip": { - "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -366,7 +368,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -383,7 +386,8 @@ "data": -2, "valid": true, "skip": { - "v2": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -430,7 +434,8 @@ "data": 9007199254740992.0, "valid": true, "skip": { - "v2": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/contains.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/contains.json index 99fead15eaf..66e6a6da98c 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/contains.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/contains.json @@ -202,7 +202,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -212,7 +213,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -220,7 +222,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/content.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/content.json index a945cb131da..7e355a568a9 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/content.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/content.json @@ -96,7 +96,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"contentSchema\"" + "v2": "extract error: unsupported constraint \"contentSchema\"", + "v3": "extract error: unsupported constraint \"contentSchema\"" }, "tests": [ { @@ -104,7 +105,8 @@ "data": "eyJmb28iOiAiYmFyIn0K", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -112,7 +114,8 @@ "data": "eyJib28iOiAyMCwgImZvbyI6ICJiYXoifQ==", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -120,7 +123,8 @@ "data": "eyJib28iOiAyMH0=", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -128,7 +132,8 @@ "data": "e30=", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -136,7 +141,8 @@ "data": "W10=", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -144,7 +150,8 @@ "data": "ezp9Cg==", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -152,7 +159,8 @@ "data": "{}", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -160,7 +168,8 @@ "data": 100, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/default.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/default.json index 03208105f8d..1f80efb8780 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/default.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/default.json @@ -80,7 +80,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/defs.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/defs.json index f7dfb964020..c36e11654f9 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/defs.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/defs.json @@ -6,7 +6,8 @@ "$ref": "https://json-schema.org/draft/2019-09/schema" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2019-09/schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2019-09/schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2019-09/schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -20,7 +21,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -34,7 +36,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/dependentRequired.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/dependentRequired.json index 3a283226d4c..126691fbc56 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/dependentRequired.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/dependentRequired.json @@ -10,7 +10,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentRequired\"" + "v2": "extract error: unsupported constraint \"dependentRequired\"", + "v3": "extract error: unsupported constraint \"dependentRequired\"" }, "tests": [ { @@ -18,7 +19,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -28,7 +30,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -39,7 +42,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -49,7 +53,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +64,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -67,7 +73,8 @@ "data": "foobar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -75,7 +82,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -89,7 +97,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentRequired\"" + "v2": "extract error: unsupported constraint \"dependentRequired\"", + "v3": "extract error: unsupported constraint \"dependentRequired\"" }, "tests": [ { @@ -97,7 +106,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -107,7 +117,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -115,7 +126,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -132,7 +144,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentRequired\"" + "v2": "extract error: unsupported constraint \"dependentRequired\"", + "v3": "extract error: unsupported constraint \"dependentRequired\"" }, "tests": [ { @@ -140,7 +153,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -151,7 +165,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -163,7 +178,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +190,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -185,7 +202,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -195,7 +213,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -214,7 +233,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentRequired\"" + "v2": "extract error: unsupported constraint \"dependentRequired\"", + "v3": "extract error: unsupported constraint \"dependentRequired\"" }, "tests": [ { @@ -225,7 +245,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -236,7 +257,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -247,7 +269,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -257,7 +280,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/dependentSchemas.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/dependentSchemas.json index 2575bdd062b..3f86d8b5525 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/dependentSchemas.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/dependentSchemas.json @@ -17,7 +17,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\"" + "v2": "extract error: unsupported constraint \"dependentSchemas\"", + "v3": "extract error: unsupported constraint \"dependentSchemas\"" }, "tests": [ { @@ -28,7 +29,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +40,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -49,7 +52,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -60,7 +64,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -71,7 +76,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -81,7 +87,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -89,7 +96,8 @@ "data": "foobar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -97,7 +105,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -112,7 +121,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\"" + "v2": "extract error: unsupported constraint \"dependentSchemas\"", + "v3": "extract error: unsupported constraint \"dependentSchemas\"" }, "tests": [ { @@ -122,7 +132,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -132,7 +143,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -143,7 +155,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -151,7 +164,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -172,7 +186,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\"" + "v2": "extract error: unsupported constraint \"dependentSchemas\"", + "v3": "extract error: unsupported constraint \"dependentSchemas\"" }, "tests": [ { @@ -185,7 +200,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +213,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -208,7 +225,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -218,7 +236,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -240,7 +259,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\"" + "v2": "extract error: unsupported constraint \"dependentSchemas\"", + "v3": "extract error: unsupported constraint \"dependentSchemas\"" }, "tests": [ { @@ -250,7 +270,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -260,7 +281,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -271,7 +293,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -281,7 +304,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/enum.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/enum.json index 6c4d2cf5fc0..72b2008884d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/enum.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/enum.json @@ -69,7 +69,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -161,7 +162,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -169,7 +171,8 @@ "data": {}, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -345,7 +348,8 @@ "data": 0.0, "valid": true, "skip": { - "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -382,7 +386,8 @@ ], "valid": true, "skip": { - "v2": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n" + "v2": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n", + "v3": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:2\n instance.json:1:2\n" } } ] @@ -411,7 +416,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -448,7 +454,8 @@ ], "valid": true, "skip": { - "v2": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n" + "v2": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n", + "v3": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:2\n instance.json:1:2\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/format.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/format.json index 391e1227e52..ed541b51b4e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/format.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/format.json @@ -6,7 +6,8 @@ "format": "email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -66,7 +73,8 @@ "format": "idn-email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -74,7 +82,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -82,7 +91,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -90,7 +100,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -98,7 +109,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -106,7 +118,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -114,7 +127,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -126,7 +140,8 @@ "format": "regex" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -134,7 +149,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +158,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +167,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +176,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +185,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +194,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -186,7 +207,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -194,7 +216,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -202,7 +225,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -210,7 +234,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -218,7 +243,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -226,7 +252,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -234,7 +261,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -246,7 +274,8 @@ "format": "ipv6" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -254,7 +283,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +292,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -270,7 +301,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -278,7 +310,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -286,7 +319,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +328,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -306,7 +341,8 @@ "format": "idn-hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -314,7 +350,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -322,7 +359,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -330,7 +368,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -338,7 +377,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -346,7 +386,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -354,7 +395,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -366,7 +408,8 @@ "format": "hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -374,7 +417,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -382,7 +426,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -390,7 +435,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -398,7 +444,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -406,7 +453,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -414,7 +462,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -426,7 +475,8 @@ "format": "date" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -434,7 +484,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -442,7 +493,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -450,7 +502,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -458,7 +511,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -466,7 +520,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -474,7 +529,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -486,7 +542,8 @@ "format": "date-time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -494,7 +551,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -502,7 +560,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -510,7 +569,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -518,7 +578,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -526,7 +587,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -534,7 +596,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -546,7 +609,8 @@ "format": "time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -554,7 +618,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -562,7 +627,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -570,7 +636,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -578,7 +645,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -586,7 +654,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -594,7 +663,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -606,7 +676,8 @@ "format": "json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -614,7 +685,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -622,7 +694,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -630,7 +703,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -638,7 +712,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -646,7 +721,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -654,7 +730,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -666,7 +743,8 @@ "format": "relative-json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -674,7 +752,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -682,7 +761,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -690,7 +770,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -698,7 +779,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -706,7 +788,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -714,7 +797,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -726,7 +810,8 @@ "format": "iri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -734,7 +819,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -742,7 +828,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -750,7 +837,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -758,7 +846,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -766,7 +855,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -774,7 +864,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -786,7 +877,8 @@ "format": "iri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -794,7 +886,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -802,7 +895,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -810,7 +904,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -818,7 +913,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -826,7 +922,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -834,7 +931,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -846,7 +944,8 @@ "format": "uri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -854,7 +953,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -862,7 +962,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -870,7 +971,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -878,7 +980,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -886,7 +989,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -894,7 +998,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -906,7 +1011,8 @@ "format": "uri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -914,7 +1020,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -922,7 +1029,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -930,7 +1038,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -938,7 +1047,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -946,7 +1056,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -954,7 +1065,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -966,7 +1078,8 @@ "format": "uri-template" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -974,7 +1087,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -982,7 +1096,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -990,7 +1105,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -998,7 +1114,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1006,7 +1123,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1014,7 +1132,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1026,7 +1145,8 @@ "format": "uuid" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -1034,7 +1154,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1042,7 +1163,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1050,7 +1172,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1058,7 +1181,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1066,7 +1190,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1074,7 +1199,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1086,7 +1212,8 @@ "format": "duration" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -1094,7 +1221,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1102,7 +1230,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1110,7 +1239,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1118,7 +1248,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1126,7 +1257,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1134,7 +1266,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/if-then-else.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/if-then-else.json index a68407c326b..7effa9e6e4a 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/if-then-else.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/if-then-else.json @@ -8,7 +8,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\"" + "v2": "extract error: unsupported constraint \"if\"", + "v3": "extract error: unsupported constraint \"if\"" }, "tests": [ { @@ -16,7 +17,8 @@ "data": 0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -24,7 +26,8 @@ "data": "hello", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -38,7 +41,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"then\"" + "v2": "extract error: unsupported constraint \"then\"", + "v3": "extract error: unsupported constraint \"then\"" }, "tests": [ { @@ -46,7 +50,8 @@ "data": 0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +59,8 @@ "data": "hello", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -68,7 +74,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"else\"" + "v2": "extract error: unsupported constraint \"else\"", + "v3": "extract error: unsupported constraint \"else\"" }, "tests": [ { @@ -76,7 +83,8 @@ "data": 0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -84,7 +92,8 @@ "data": "hello", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -101,7 +110,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -109,7 +119,8 @@ "data": -1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +128,8 @@ "data": -100, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +137,8 @@ "data": 3, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -142,7 +155,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -150,7 +164,8 @@ "data": -1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +173,8 @@ "data": 4, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +182,8 @@ "data": 3, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -186,7 +203,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -194,7 +212,8 @@ "data": -1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -202,7 +221,8 @@ "data": -100, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -210,7 +230,8 @@ "data": 4, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -218,7 +239,8 @@ "data": 3, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -246,7 +268,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -254,7 +277,8 @@ "data": -100, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +286,8 @@ "data": 3, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -280,7 +305,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -288,7 +314,8 @@ "data": "then", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -296,7 +323,8 @@ "data": "else", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -314,7 +342,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -322,7 +351,8 @@ "data": "then", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -330,7 +360,8 @@ "data": "else", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -350,7 +381,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"then\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"then\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"then\" (and 2 more errors)" }, "tests": [ { @@ -358,7 +390,8 @@ "data": "yes", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -366,7 +399,8 @@ "data": "other", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -374,7 +408,8 @@ "data": "no", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -382,7 +417,8 @@ "data": "invalid", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/items.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/items.json index a510419b14a..53a8147a6a4 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/items.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/items.json @@ -79,7 +79,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } }, { @@ -91,7 +92,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 3):\n instance.json:1:1\n" } }, { @@ -99,7 +101,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (0 and 2):\n instance.json:1:1\n" } }, { @@ -120,7 +123,8 @@ "items": true }, "skip": { - "v2": "extract error: value of \"items\" must be an object or array" + "v2": "extract error: value of \"items\" must be an object or array", + "v3": "extract error: value of \"items\" must be an object or array" }, "tests": [ { @@ -132,7 +136,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -140,7 +145,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -152,7 +158,8 @@ "items": false }, "skip": { - "v2": "extract error: value of \"items\" must be an object or array" + "v2": "extract error: value of \"items\" must be an object or array", + "v3": "extract error: value of \"items\" must be an object or array" }, "tests": [ { @@ -164,7 +171,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -172,7 +180,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -194,7 +203,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:37\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } }, { @@ -210,7 +220,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:37\nincompatible list lengths (0 and 2):\n instance.json:1:1\n" } } ] @@ -408,7 +419,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -427,7 +439,8 @@ ], "valid": true, "skip": { - "v2": "incompatible list lengths (2 and 3)\n" + "v2": "incompatible list lengths (2 and 3)\n", + "v3": "incompatible list lengths (2 and 3):\n generated.cue:2:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/maxContains.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/maxContains.json index 46ca23ebc0e..0828c563b10 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/maxContains.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/maxContains.json @@ -82,7 +82,8 @@ "maxContains": 1.0 }, "skip": { - "v2": "extract error: value of \"maxContains\" must be a non-negative integer value" + "v2": "extract error: value of \"maxContains\" must be a non-negative integer value", + "v3": "extract error: value of \"maxContains\" must be a non-negative integer value" }, "tests": [ { @@ -92,7 +93,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -103,7 +105,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/maxItems.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/maxItems.json index 98a4b9da6fe..442b98b4b23 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/maxItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/maxItems.json @@ -44,7 +44,8 @@ "maxItems": 2.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -54,7 +55,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -66,7 +68,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/maxLength.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/maxLength.json index c4738846bfb..a729c409b19 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/maxLength.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/maxLength.json @@ -45,7 +45,8 @@ "data": "f", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:4:1\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:4:1\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:4:1\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:4:1\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:4:41\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:4:1\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:4:1\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:4:1\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:4:1\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:4:41\n", + "v3": "conflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:4:41\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/maxProperties.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/maxProperties.json index a4ba701b426..a283dedea6a 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/maxProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/maxProperties.json @@ -58,7 +58,8 @@ "maxProperties": 2.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -68,7 +69,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -80,7 +82,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/minContains.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/minContains.json index 83f546a4370..7300f6c1a58 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/minContains.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/minContains.json @@ -135,7 +135,8 @@ "minContains": 2.0 }, "skip": { - "v2": "extract error: value of \"minContains\" must be a non-negative integer value" + "v2": "extract error: value of \"minContains\" must be a non-negative integer value", + "v3": "extract error: value of \"minContains\" must be a non-negative integer value" }, "tests": [ { @@ -145,7 +146,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -156,7 +158,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/minItems.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/minItems.json index 6e837588f93..08edb8c832e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/minItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/minItems.json @@ -40,7 +40,8 @@ "minItems": 1.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -51,7 +52,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +61,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/minLength.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/minLength.json index 390f7f83922..95c2bd42fdb 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/minLength.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/minLength.json @@ -45,7 +45,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:4:1\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:4:1\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:4:1\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:4:1\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:4:41\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:4:1\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:4:1\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:4:1\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:4:1\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:4:41\n", + "v3": "conflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:4:41\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/minProperties.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/minProperties.json index df754ca8c8b..10696fbd082 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/minProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/minProperties.json @@ -6,7 +6,8 @@ "minProperties": 1 }, "skip": { - "v2": "extract error: unsupported constraint \"minProperties\"" + "v2": "extract error: unsupported constraint \"minProperties\"", + "v3": "extract error: unsupported constraint \"minProperties\"" }, "tests": [ { @@ -17,7 +18,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -27,7 +29,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -35,7 +38,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -43,7 +47,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -51,7 +56,8 @@ "data": "", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +65,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -71,7 +78,8 @@ "minProperties": 1.0 }, "skip": { - "v2": "extract error: unsupported constraint \"minProperties\"" + "v2": "extract error: unsupported constraint \"minProperties\"", + "v3": "extract error: unsupported constraint \"minProperties\"" }, "tests": [ { @@ -82,7 +90,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -90,7 +99,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/not.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/not.json index e0ed33857f9..f15cbaee9c2 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/not.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/not.json @@ -8,7 +8,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -16,7 +17,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -24,7 +26,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -41,7 +44,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -49,7 +53,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -57,7 +62,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -65,7 +71,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -84,7 +91,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -92,7 +100,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +111,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -112,7 +122,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -128,7 +139,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -139,7 +151,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +163,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -162,7 +176,8 @@ "not": {} }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -170,7 +185,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -178,7 +194,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -186,7 +203,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -194,7 +212,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -202,7 +221,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -212,7 +232,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -220,7 +241,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +252,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +261,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -250,7 +274,8 @@ "not": true }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -258,7 +283,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -266,7 +292,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -274,7 +301,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -282,7 +310,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -290,7 +319,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -300,7 +330,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -308,7 +339,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +350,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -326,7 +359,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -338,7 +372,8 @@ "not": false }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -346,7 +381,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -354,7 +390,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -362,7 +399,8 @@ "data": true, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -370,7 +408,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -378,7 +417,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -388,7 +428,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -396,7 +437,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -406,7 +448,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -414,7 +457,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -428,7 +472,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -436,7 +481,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -459,7 +505,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -469,7 +516,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -479,7 +527,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/oneOf.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/oneOf.json index eea11d87d61..de5c86877e9 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/oneOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/oneOf.json @@ -28,7 +28,8 @@ "data": 3, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -68,7 +69,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -89,7 +91,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -128,7 +131,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -149,7 +153,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -204,7 +209,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -239,7 +245,8 @@ "data": 123, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -272,7 +279,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -300,7 +308,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -352,7 +361,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -362,7 +372,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/anchor.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/anchor.json index 1bf4de76f12..9796cd99bd3 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/anchor.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/anchor.json @@ -34,7 +34,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"$anchor\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"$anchor\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"$anchor\" (and 1 more errors)" }, "tests": [ { @@ -45,7 +46,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -55,7 +57,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -63,7 +66,8 @@ "data": "a string to match #/$defs/anchor_in_enum", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -71,7 +75,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/cross-draft.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/cross-draft.json index 65c60eeae56..ec7ffe8f484 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/cross-draft.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/cross-draft.json @@ -7,7 +7,8 @@ "$ref": "http://localhost:1234/draft2020-12/prefixItems.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/prefixItems.json:prefixItems\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/prefixItems.json:prefixItems\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/prefixItems.json:prefixItems\":\n generated.cue:1:8\n" }, "tests": [ { @@ -20,7 +21,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -33,7 +35,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -54,7 +57,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft7/ignore-dependentRequired.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft7/ignore-dependentRequired.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft7/ignore-dependentRequired.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -65,7 +69,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/dependencies-compatibility.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/dependencies-compatibility.json index 99a1b373131..8b7b0a68b72 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/dependencies-compatibility.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/dependencies-compatibility.json @@ -37,7 +37,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -129,7 +130,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -140,7 +142,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -150,7 +153,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -193,7 +197,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -203,7 +208,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -249,7 +255,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -260,7 +267,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -271,7 +279,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -317,7 +326,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -328,7 +338,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -373,7 +384,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -384,7 +396,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -394,7 +407,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/ecmascript-regex.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/ecmascript-regex.json index 85fd9f8520e..f71638f8a3c 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/ecmascript-regex.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/ecmascript-regex.json @@ -47,7 +47,8 @@ "pattern": "^\\cC$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" }, "tests": [ { @@ -55,7 +56,8 @@ "data": "\\cC", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -63,7 +65,8 @@ "data": "\u0003", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -76,7 +79,8 @@ "pattern": "^\\cc$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" }, "tests": [ { @@ -84,7 +88,8 @@ "data": "\\cc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -92,7 +97,8 @@ "data": "\u0003", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -210,7 +216,8 @@ "data": "\u000b", "valid": true, "skip": { - "v2": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n", + "v3": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" } }, { @@ -223,7 +230,8 @@ "data": " ", "valid": true, "skip": { - "v2": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" } }, { @@ -231,7 +239,8 @@ "data": "\ufeff", "valid": true, "skip": { - "v2": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n", + "v3": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" } }, { @@ -244,7 +253,8 @@ "data": "\u2029", "valid": true, "skip": { - "v2": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" } }, { @@ -252,7 +262,8 @@ "data": " ", "valid": true, "skip": { - "v2": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" } }, { @@ -290,7 +301,8 @@ "data": "\u000b", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -303,7 +315,8 @@ "data": " ", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -311,7 +324,8 @@ "data": "\ufeff", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -324,7 +338,8 @@ "data": "\u2029", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -332,7 +347,8 @@ "data": " ", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -354,7 +370,8 @@ "pattern": "\\p{Letter}cole" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`" }, "tests": [ { @@ -362,7 +379,8 @@ "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -370,7 +388,8 @@ "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -378,7 +397,8 @@ "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -386,7 +406,8 @@ "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -475,7 +496,8 @@ "pattern": "^\\p{digit}+$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`" }, "tests": [ { @@ -483,7 +505,8 @@ "data": "42", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -491,7 +514,8 @@ "data": "-%#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -499,7 +523,8 @@ "data": "৪২", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -520,7 +545,10 @@ "data": { "l'ecole": "pas de vraie vie" }, - "valid": true + "valid": true, + "skip": { + "v3": "invalid regexp: error parsing regexp: invalid character class range: `\\p{Letter}`:\n generated.cue:3:36\n" + } }, { "description": "literal unicode character in json string", @@ -543,7 +571,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -573,7 +602,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -583,7 +613,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -593,7 +624,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -616,7 +648,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -626,7 +659,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -663,7 +697,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -673,7 +708,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -694,7 +730,10 @@ "data": { "42": "life, the universe, and everything" }, - "valid": true + "valid": true, + "skip": { + "v3": "invalid regexp: error parsing regexp: invalid character class range: `\\p{digit}`:\n generated.cue:3:34\n" + } }, { "description": "ascii non-digits", @@ -703,7 +742,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/float-overflow.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/float-overflow.json index 2048c84fe87..23eb43c0610 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/float-overflow.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/float-overflow.json @@ -12,7 +12,8 @@ "data": 1E+308, "valid": true, "skip": { - "v2": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:4:1\n instance.json:1:1\n" + "v2": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:4:1\n instance.json:1:1\n", + "v3": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:4:1\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date-time.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date-time.json index a44f1ff70ad..dc7d2540459 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date-time.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date-time.json @@ -6,7 +6,8 @@ "format": "date-time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "1963-06-19T08:30:06.283185Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "1963-06-19T08:30:06Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "1937-01-01T12:00:27.87+00:20", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "1990-12-31T15:59:50.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "1998-12-31T23:59:60Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "1998-12-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "1998-12-31T23:59:61Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "1998-12-31T23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "1998-12-31T22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "1990-02-31T15:59:59.123-08:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "1990-12-31T15:59:59-24:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "1963-06-19T08:30:06.28123+01:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "06/19/1963 08:30:06 PST", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "1963-06-19t08:30:06.283185z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "2013-350T01:01:01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "1963-6-19T08:30:06.283185Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "1963-06-1T08:30:06.283185Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "1963-06-1৪T00:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "1963-06-11T0৪:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date.json index b23b9cb07c8..de7ff164eae 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/date.json @@ -6,7 +6,8 @@ "format": "date" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "1963-06-19", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "2020-01-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "2020-01-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "2021-02-28", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "2021-02-29", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "2020-02-29", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "2020-02-30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "2020-03-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "2020-03-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "2020-04-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "2020-04-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "2020-05-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "2020-05-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "2020-06-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "2020-06-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "2020-07-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "2020-07-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "2020-08-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "2020-08-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +240,8 @@ "data": "2020-09-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +249,8 @@ "data": "2020-09-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +258,8 @@ "data": "2020-10-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +267,8 @@ "data": "2020-10-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -246,7 +276,8 @@ "data": "2020-11-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -254,7 +285,8 @@ "data": "2020-11-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +294,8 @@ "data": "2020-12-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -270,7 +303,8 @@ "data": "2020-12-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -278,7 +312,8 @@ "data": "2020-13-01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -286,7 +321,8 @@ "data": "06/19/1963", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +330,8 @@ "data": "2013-350", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +339,8 @@ "data": "1998-1-20", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -310,7 +348,8 @@ "data": "1998-01-1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +357,8 @@ "data": "1998-13-01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -326,7 +366,8 @@ "data": "1998-04-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -334,7 +375,8 @@ "data": "2021-02-29", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -342,7 +384,8 @@ "data": "2020-02-29", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -350,7 +393,8 @@ "data": "1963-06-1৪", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -358,7 +402,8 @@ "data": "20230328", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -366,7 +411,8 @@ "data": "2023-W01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -374,7 +420,8 @@ "data": "2023-W13-2", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -382,7 +429,8 @@ "data": "2022W527", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/duration.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/duration.json index d85224ebfec..87d83717ba5 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/duration.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/duration.json @@ -6,7 +6,8 @@ "format": "duration" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "P4DT12H30M5S", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "PT1D", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "P", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "P1YT", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "PT", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "P2D1Y", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "P1D2H", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "P2S", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "P4Y", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "PT0S", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "P0D", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "P1M", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "PT1M", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "PT36H", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "P1DT12H", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "P2W", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "P1Y2W", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "P২Y", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "P1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/email.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/email.json index f601cd46a19..b343b9ad4be 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/email.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/email.json @@ -6,7 +6,8 @@ "format": "email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "joe.bloggs@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "te~st@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "~test@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "test~@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": ".test@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "test.@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "te.s.t@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "te..st@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/hostname.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/hostname.json index 11daff01707..e498d279624 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/hostname.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/hostname.json @@ -6,7 +6,8 @@ "format": "hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "www.example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "xn--4gbwdl.xn--wgbh1c", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "-a-host-name-that-starts-with--", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "not_a_valid_host_name", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "-hostname", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "hostname-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "_hostname", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "hostname_", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "host_name", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "hostname", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "host-name", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "h0stn4me", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "1host", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "hostnam3", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/idn-email.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/idn-email.json index dc0ed1e7426..2d760c2c4ae 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/idn-email.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/idn-email.json @@ -6,7 +6,8 @@ "format": "idn-email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "실례@실례.테스트", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "joe.bloggs@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/idn-hostname.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/idn-hostname.json index afedec1b006..90d9a134603 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/idn-hostname.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/idn-hostname.json @@ -6,7 +6,8 @@ "format": "idn-hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "실례.테스트", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "〮실례.테스트", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "실〮례.테스트", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실례례테스트례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례테스트례례실례.테스트", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -95,7 +106,8 @@ "data": "-\u003e $1.00 \u003c--", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -104,7 +116,8 @@ "data": "xn--ihqwcrb4cv8a8dqg056pqjye", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -113,7 +126,8 @@ "data": "xn--X", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -122,7 +136,8 @@ "data": "XN--aa---o47jg78q", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -131,7 +146,8 @@ "data": "-hello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -140,7 +156,8 @@ "data": "hello-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +166,8 @@ "data": "-hello-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +176,8 @@ "data": "ःhello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -167,7 +186,8 @@ "data": "̀hello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -176,7 +196,8 @@ "data": "҈hello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -185,7 +206,8 @@ "data": "ßς་〇", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -194,7 +216,8 @@ "data": "۽۾", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -203,7 +226,8 @@ "data": "ـߺ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -212,7 +236,8 @@ "data": "〱〲〳〴〵〮〯〻", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -221,7 +246,8 @@ "data": "a·l", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +256,8 @@ "data": "·l", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -239,7 +266,8 @@ "data": "l·a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -248,7 +276,8 @@ "data": "l·", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -257,7 +286,8 @@ "data": "l·l", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -266,7 +296,8 @@ "data": "α͵S", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -275,7 +306,8 @@ "data": "α͵", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -284,7 +316,8 @@ "data": "α͵β", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -293,7 +326,8 @@ "data": "A׳ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +336,8 @@ "data": "׳ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -311,7 +346,8 @@ "data": "א׳ב", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -320,7 +356,8 @@ "data": "A״ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -329,7 +366,8 @@ "data": "״ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -338,7 +376,8 @@ "data": "א״ב", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -347,7 +386,8 @@ "data": "def・abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -356,7 +396,8 @@ "data": "・", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -365,7 +406,8 @@ "data": "・ぁ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -374,7 +416,8 @@ "data": "・ァ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -383,7 +426,8 @@ "data": "・丈", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -392,7 +436,8 @@ "data": "ب٠۰", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -401,7 +446,8 @@ "data": "ب٠ب", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -410,7 +456,8 @@ "data": "۰0", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -419,7 +466,8 @@ "data": "क‍ष", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -428,7 +476,8 @@ "data": "‍ष", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -437,7 +486,8 @@ "data": "क्‍ष", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -446,7 +496,8 @@ "data": "क्‌ष", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -455,7 +506,8 @@ "data": "بي‌بي", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -463,7 +515,8 @@ "data": "hostname", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -471,7 +524,8 @@ "data": "host-name", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -479,7 +533,8 @@ "data": "h0stn4me", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -487,7 +542,8 @@ "data": "1host", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -495,7 +551,8 @@ "data": "hostnam3", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/ipv4.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/ipv4.json index 2b652aebdb6..e60139636f0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/ipv4.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/ipv4.json @@ -6,7 +6,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "127.0.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "256.256.256.256", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "127.0", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "0x7f000001", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "2130706433", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -111,7 +124,8 @@ "data": "087.10.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -119,7 +133,8 @@ "data": "87.10.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -127,7 +142,8 @@ "data": "1২7.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -135,7 +151,8 @@ "data": "192.168.1.0/24", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/ipv6.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/ipv6.json index a8caf82d3a3..6426583f489 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/ipv6.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/ipv6.json @@ -6,7 +6,8 @@ "format": "ipv6" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "::1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "12345::", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "::abef", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "::abcef", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "::laptop", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "::42:ff:1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "d6::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": ":2:3:4:5:6:7:8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "1:2:3:4:5:6:7:", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": ":2:3:4::8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "1:d6::42", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "1::d6::42", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "1::d6:192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "1:2::192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "1::2:192.168.256.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "1::2:192.168.ff.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "::ffff:192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +240,8 @@ "data": "1:2:3:4:5:::8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +249,8 @@ "data": "1:2:3:4:5:6:7:8", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +258,8 @@ "data": "1:2:3:4:5:6:7", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +267,8 @@ "data": "1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -246,7 +276,8 @@ "data": "127.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -254,7 +285,8 @@ "data": "1:2:3:4:1.2.3", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +294,8 @@ "data": " ::1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -270,7 +303,8 @@ "data": "::1 ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -278,7 +312,8 @@ "data": "fe80::/64", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -286,7 +321,8 @@ "data": "fe80::a%eth1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +330,8 @@ "data": "1000:1000:1000:1000:1000:1000:255.255.255.255", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +339,8 @@ "data": "100:100:100:100:100:100:255.255.255.255.255", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -310,7 +348,8 @@ "data": "100:100:100:100:100:100:100:255.255.255.255", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +357,8 @@ "data": "1:2:3:4:5:6:7:৪", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -326,7 +366,8 @@ "data": "1:2::192.16৪.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/iri-reference.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/iri-reference.json index 47da4b6e55e..7c318087df2 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/iri-reference.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/iri-reference.json @@ -6,7 +6,8 @@ "format": "iri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "//ƒøø.ßår/?∂éœ=πîx#πîüx", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "/âππ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "\\\\WINDOWS\\filëßåré", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "âππ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "#ƒrägmênt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "#ƒräg\\mênt", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/iri.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/iri.json index 51f60ffeb6d..f250077115b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/iri.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/iri.json @@ -6,7 +6,8 @@ "format": "iri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "http://ƒøø.com/blah_(wîkïpédiå)_blah#ßité-1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "http://ƒøø.ßår/?q=Test%20URL-encoded%20stuff", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "http://-.~_!$\u0026'()*+,;=:%40:80%2f::::::@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "http://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "http://2001:0db8:85a3:0000:0000:8a2e:0370:7334", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "/abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "\\\\WINDOWS\\filëßåré", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "âππ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/json-pointer.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/json-pointer.json index f998c638f81..7e37ba91ab9 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/json-pointer.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/json-pointer.json @@ -6,7 +6,8 @@ "format": "json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "/foo/bar~0/baz~1/%a", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "/foo/bar~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "/foo//bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "/foo/bar/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "/foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "/foo/0", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "/a~1b", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "/c%d", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "/e^f", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "/g|h", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "/i\\j", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "/k\"l", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "/ ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "/m~0n", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "/foo/-", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "/foo/-/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "/~1~0~0~1~1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +240,8 @@ "data": "/~1.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +249,8 @@ "data": "/~0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +258,8 @@ "data": "#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +267,8 @@ "data": "#/", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -246,7 +276,8 @@ "data": "#a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -254,7 +285,8 @@ "data": "/~0~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +294,8 @@ "data": "/~0/~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -270,7 +303,8 @@ "data": "/~2", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -278,7 +312,8 @@ "data": "/~-1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -286,7 +321,8 @@ "data": "/~~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +330,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +339,8 @@ "data": "0", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -310,7 +348,8 @@ "data": "a/a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/regex.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/regex.json index 906ae92198d..c6ad05bf618 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/regex.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/regex.json @@ -6,7 +6,8 @@ "format": "regex" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "([abc])+\\s+$", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "^(abc]", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/relative-json-pointer.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/relative-json-pointer.json index a10c855778e..f4f2c2635a9 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/relative-json-pointer.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/relative-json-pointer.json @@ -6,7 +6,8 @@ "format": "relative-json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "0/foo/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "2/0/baz/1/zip", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "0#", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "/foo/bar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "-1/foo/bar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "+1/foo/bar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "0##", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "01/a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "01#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "120/foo/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/time.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/time.json index c3f9e4d2534..692c21a41a9 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/time.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/time.json @@ -6,7 +6,8 @@ "format": "time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "08:30:06Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "008:030:006Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "8:3:6Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "8:0030:6Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "23:59:60Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "23:59:60+00:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "22:59:60+00:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "23:58:60+00:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "01:29:60+01:30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "23:29:60+23:30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "23:59:60+01:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "23:59:60+00:30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "15:59:60-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "00:29:60-23:30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "23:59:60-01:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "23:59:60-00:30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "23:20:50.52Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +240,8 @@ "data": "08:30:06.283185Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +249,8 @@ "data": "08:30:06+00:20", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +258,8 @@ "data": "08:30:06-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +267,8 @@ "data": "08:30:06-8:000", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -246,7 +276,8 @@ "data": "08:30:06z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -254,7 +285,8 @@ "data": "24:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +294,8 @@ "data": "00:60:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -270,7 +303,8 @@ "data": "00:00:61Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -278,7 +312,8 @@ "data": "22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -286,7 +321,8 @@ "data": "23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +330,8 @@ "data": "01:02:03+24:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +339,8 @@ "data": "01:02:03+00:60", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -310,7 +348,8 @@ "data": "01:02:03Z+00:30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +357,8 @@ "data": "08:30:06 PST", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -326,7 +366,8 @@ "data": "01:01:01,1111", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -334,7 +375,8 @@ "data": "12:00:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -342,7 +384,8 @@ "data": "12:00:00.52", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -350,7 +393,8 @@ "data": "1২:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -358,7 +402,8 @@ "data": "08:30:06#00:20", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -366,7 +411,8 @@ "data": "ab:cd:ef", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/unknown.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/unknown.json index 0ec20229eb1..6031f888f9d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/unknown.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/unknown.json @@ -6,7 +6,8 @@ "format": "unknown" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri-reference.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri-reference.json index 689e7828805..1330ab65749 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri-reference.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri-reference.json @@ -6,7 +6,8 @@ "format": "uri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "http://foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "/abc", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "\\\\WINDOWS\\fileshare", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "abc", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "#fragment", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "#frag\\ment", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri-template.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri-template.json index 53b31f14c85..072781d339a 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri-template.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri-template.json @@ -6,7 +6,8 @@ "format": "uri-template" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "http://example.com/dictionary/{term:1}/{term}", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "http://example.com/dictionary/{term:1}/{term", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "http://example.com/dictionary", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "dictionary/{term:1}/{term}", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri.json index 66dd71a1416..05c4f424fd5 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uri.json @@ -6,7 +6,8 @@ "format": "uri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "http://foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "http://foo.com/blah_(wikipedia)_blah#cite-1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "http://xn--nw2a.xn--j6w193g/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "http://-.~_!$\u0026'()*+,;=:%40:80%2f::::::@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "http://223.255.255.254", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "http://www.ietf.org/rfc/rfc2396.txt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "ldap://[2001:db8::7]/c=GB?objectClass?one", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "mailto:John.Doe@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "news:comp.infosystems.www.servers.unix", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "tel:+1-816-555-1212", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "/abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "\\\\WINDOWS\\fileshare", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "http:// shouldfail.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": ":// should fail", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +240,8 @@ "data": "bar,baz:foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uuid.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uuid.json index b713cf6578a..e445a7eab01 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uuid.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/format/uuid.json @@ -6,7 +6,8 @@ "format": "uuid" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "2EB8AA08-AA98-11EA-B4AA-73B441D16380", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "2eb8aa08-aa98-11ea-b4aa-73b441d16380", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "2eb8aa08-AA98-11ea-B4Aa-73B441D16380", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "00000000-0000-0000-0000-000000000000", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "2eb8aa08-aa98-11ea-b4aa-73b441d1638", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "2eb8aa08-aa98-11ea-73b441d16380", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "2eb8aa08-aa98-11ea-b4ga-73b441d16380", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "2eb8aa08aa9811eab4aa73b441d16380", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "2eb8aa08aa98-11ea-b4aa73b441d16380", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "2eb8-aa08-aa98-11ea-b4aa73b44-1d16380", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "2eb8aa08aa9811eab4aa73b441d16380----", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "98d80576-482e-427f-8434-7f86890ab222", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "99c17cbb-656f-564a-940f-1a4568f03487", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "99c17cbb-656f-664a-940f-1a4568f03487", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "99c17cbb-656f-f64a-940f-1a4568f03487", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/id.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/id.json index e42fd7be1c0..7f86e54440e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/id.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/id.json @@ -34,7 +34,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n" }, "tests": [ { @@ -45,7 +46,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +55,8 @@ "data": "a string to match #/$defs/id_in_enum", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +64,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/refOfUnknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/refOfUnknownKeyword.json index e49bb761d32..7e331714c9b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/refOfUnknownKeyword.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/refOfUnknownKeyword.json @@ -13,7 +13,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unknown-keyword\"" + "v2": "extract error: unsupported constraint \"unknown-keyword\"", + "v3": "extract error: unsupported constraint \"unknown-keyword\"" }, "tests": [ { @@ -23,7 +24,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -33,7 +35,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -54,7 +57,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unknown-keyword\"" + "v2": "extract error: unsupported constraint \"unknown-keyword\"", + "v3": "extract error: unsupported constraint \"unknown-keyword\"" }, "tests": [ { @@ -64,7 +68,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -74,7 +79,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -92,7 +98,8 @@ "$ref": "#/examples/0" }, "skip": { - "v2": "extract error: reference to non-existing value \"examples\"" + "v2": "extract error: reference to non-existing value \"examples\"", + "v3": "extract error: reference to non-existing value \"examples\"" }, "tests": [ { @@ -100,7 +107,8 @@ "data": "a string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -108,7 +116,8 @@ "data": 42, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/unknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/unknownKeyword.json index 4e3ea874462..e10e5644abe 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/unknownKeyword.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/unknownKeyword.json @@ -43,7 +43,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"not\" (and 1 more errors)" }, "tests": [ { @@ -51,7 +52,8 @@ "data": "a string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +61,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -67,7 +70,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/properties.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/properties.json index a91b0c9b82a..0a89f3973e2 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/properties.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/properties.json @@ -108,7 +108,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/propertyNames.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/propertyNames.json index a9562186f3a..c3efc3ee099 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/propertyNames.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/propertyNames.json @@ -8,7 +8,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n" + "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n", + "v3": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n" }, "tests": [ { @@ -19,7 +20,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +32,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +41,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -51,7 +55,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +64,8 @@ "data": "foobar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -67,7 +73,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -97,7 +104,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -140,12 +148,18 @@ "data": { "foo": 1 }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "empty object is valid", "data": {}, - "valid": true + "valid": true, + "skip": { + "v3": "conflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" + } } ] } diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/recursiveRef.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/recursiveRef.json index 9ebc2566887..70d26bb8e33 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/recursiveRef.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/recursiveRef.json @@ -11,7 +11,8 @@ "additionalProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"$recursiveRef\"" + "v2": "extract error: unsupported constraint \"$recursiveRef\"", + "v3": "extract error: unsupported constraint \"$recursiveRef\"" }, "tests": [ { @@ -21,7 +22,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -33,7 +35,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -43,7 +46,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -55,7 +59,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -92,7 +97,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)" }, "tests": [ { @@ -100,7 +106,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +117,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -120,7 +128,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -132,7 +141,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -144,7 +154,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -182,7 +193,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$recursiveAnchor\" (and 2 more errors)" }, "tests": [ { @@ -190,7 +202,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -200,7 +213,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -210,7 +224,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +237,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -234,7 +250,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -272,7 +289,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$recursiveAnchor\" (and 2 more errors)" }, "tests": [ { @@ -280,7 +298,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -290,7 +309,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -300,7 +320,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -312,7 +333,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -324,7 +346,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -361,7 +384,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)" }, "tests": [ { @@ -369,7 +393,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -379,7 +404,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -389,7 +415,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -401,7 +428,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -413,7 +441,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -449,7 +478,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)" }, "tests": [ { @@ -459,7 +489,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -471,7 +502,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -483,7 +515,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -518,7 +551,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"$recursiveAnchor\" (and 1 more errors)" }, "tests": [ { @@ -528,7 +562,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -540,7 +575,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -552,7 +588,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -595,7 +632,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 4 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 4 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 4 more errors)" }, "tests": [ { @@ -605,7 +643,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -615,7 +654,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -658,7 +698,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 4 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 4 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 4 more errors)" }, "tests": [ { @@ -668,7 +709,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -678,7 +720,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/ref.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/ref.json index 0ff263aed86..c67f0ce1731 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/ref.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/ref.json @@ -34,7 +34,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -46,7 +47,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -65,7 +67,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n" + "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n", + "v3": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n" }, "tests": [ { @@ -75,7 +78,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +89,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -104,7 +109,8 @@ ] }, "skip": { - "v2": "extract error: referring to field \"items\" not yet supported" + "v2": "extract error: referring to field \"items\" not yet supported", + "v3": "extract error: referring to field \"items\" not yet supported" }, "tests": [ { @@ -115,7 +121,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +133,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -164,21 +172,30 @@ "data": { "slash": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "tilde invalid", "data": { "tilde": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "percent invalid", "data": { "percent": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "slash valid", @@ -293,7 +310,8 @@ "$ref": "https://json-schema.org/draft/2019-09/schema" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2019-09/schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2019-09/schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2019-09/schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -303,7 +321,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -313,7 +332,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -404,7 +424,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n" + "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n" }, "tests": [ { @@ -412,7 +433,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -459,7 +481,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/draft2019-09/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:9:14\n" + "v2": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/draft2019-09/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:9:14\n", + "v3": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/draft2019-09/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:9:14\n" }, "tests": [ { @@ -499,7 +522,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -539,7 +563,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -575,7 +600,10 @@ "data": { "foo\"bar": "1" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } } ] }, @@ -596,7 +624,8 @@ "$ref": "#/$defs/A" }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -606,7 +635,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -639,7 +669,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -674,7 +705,8 @@ "$ref": "schema-relative-uri-defs2.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -687,7 +719,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -700,7 +733,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -713,7 +747,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -741,7 +776,8 @@ "$ref": "schema-refs-absolute-uris-defs2.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -754,7 +790,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -767,7 +804,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -780,7 +818,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -810,7 +849,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -818,7 +858,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -826,7 +867,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -852,7 +894,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/draft2019-09/ref-and-id1/int.json:int\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/draft2019-09/ref-and-id1/int.json:int\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/draft2019-09/ref-and-id1/int.json:int\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -860,7 +903,8 @@ "data": 5, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -868,7 +912,8 @@ "data": 50, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -895,7 +940,8 @@ } }, "skip": { - "v2": "extract error: anchors (bigint) not supported (and 2 more errors)" + "v2": "extract error: anchors (bigint) not supported (and 2 more errors)", + "v3": "extract error: anchors (bigint) not supported (and 2 more errors)" }, "tests": [ { @@ -903,7 +949,8 @@ "data": 5, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -911,7 +958,8 @@ "data": 50, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1133,7 +1181,8 @@ } }, "skip": { - "v2": "extract error: anchors (something) not supported (and 1 more errors)" + "v2": "extract error: anchors (something) not supported (and 1 more errors)", + "v3": "extract error: anchors (something) not supported (and 1 more errors)" }, "tests": [ { @@ -1143,7 +1192,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1153,7 +1203,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1187,7 +1238,10 @@ { "description": "a non-string is invalid", "data": 12, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } } ] }, @@ -1202,7 +1256,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\"" + "v2": "extract error: unsupported constraint \"if\"", + "v3": "extract error: unsupported constraint \"if\"" }, "tests": [ { @@ -1210,7 +1265,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1218,7 +1274,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1234,7 +1291,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"then\"" + "v2": "extract error: unsupported constraint \"then\"", + "v3": "extract error: unsupported constraint \"then\"" }, "tests": [ { @@ -1242,7 +1300,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1250,7 +1309,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1266,7 +1326,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"else\"" + "v2": "extract error: unsupported constraint \"else\"", + "v3": "extract error: unsupported constraint \"else\"" }, "tests": [ { @@ -1274,7 +1335,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1282,7 +1344,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1305,7 +1368,8 @@ "$ref": "/absref/foobar.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -1313,7 +1377,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1321,7 +1386,8 @@ "data": 12, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1396,7 +1462,8 @@ ] }, "skip": { - "v2": "extract error: cannot refer to $defs section: must refer to one of its elements" + "v2": "extract error: cannot refer to $defs section: must refer to one of its elements", + "v3": "extract error: cannot refer to $defs section: must refer to one of its elements" }, "tests": [ { @@ -1404,7 +1471,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1412,7 +1480,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1443,7 +1512,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$recursiveAnchor\" (and 2 more errors)" }, "tests": [ { @@ -1458,7 +1528,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1474,7 +1545,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/refRemote.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/refRemote.json index 60f85b168ff..92c4a9e4d2b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/refRemote.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/refRemote.json @@ -6,7 +6,8 @@ "$ref": "http://localhost:1234/draft2019-09/integer.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/integer.json:integer\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/integer.json:integer\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/integer.json:integer\":\n generated.cue:1:8\n" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -34,7 +37,8 @@ "$ref": "http://localhost:1234/draft2019-09/subSchemas.json#/$defs/integer" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/subSchemas.json:subSchemas\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" }, "tests": [ { @@ -42,7 +46,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -50,7 +55,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -62,7 +68,8 @@ "$ref": "http://localhost:1234/draft2019-09/locationIndependentIdentifier.json#foo" }, "skip": { - "v2": "extract error: anchors (foo) not supported" + "v2": "extract error: anchors (foo) not supported", + "v3": "extract error: anchors (foo) not supported" }, "tests": [ { @@ -70,7 +77,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +86,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -90,7 +99,8 @@ "$ref": "http://localhost:1234/draft2019-09/subSchemas.json#/$defs/refToInteger" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/subSchemas.json:subSchemas\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" }, "tests": [ { @@ -98,7 +108,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -106,7 +117,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -124,7 +136,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -136,7 +149,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -148,7 +162,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -175,7 +190,8 @@ } }, "skip": { - "v2": "extract error: cannot determine package name from import path \"localhost:1234/draft2019-09/baseUriChangeFolder/\"" + "v2": "extract error: cannot determine package name from import path \"localhost:1234/draft2019-09/baseUriChangeFolder/\"", + "v3": "extract error: cannot determine package name from import path \"localhost:1234/draft2019-09/baseUriChangeFolder/\"" }, "tests": [ { @@ -187,7 +203,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -199,7 +216,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -230,7 +248,8 @@ } }, "skip": { - "v2": "extract error: cannot determine package name from import path \"localhost:1234/draft2019-09/baseUriChangeFolderInSubschema/\"" + "v2": "extract error: cannot determine package name from import path \"localhost:1234/draft2019-09/baseUriChangeFolderInSubschema/\"", + "v3": "extract error: cannot determine package name from import path \"localhost:1234/draft2019-09/baseUriChangeFolderInSubschema/\"" }, "tests": [ { @@ -242,7 +261,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -254,7 +274,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -272,7 +293,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/name-defs.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/name-defs.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/name-defs.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -282,7 +304,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -292,7 +315,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -304,7 +328,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -317,7 +342,8 @@ "$ref": "ref-and-defs.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/ref-and-defs.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/ref-and-defs.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/ref-and-defs.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -327,7 +353,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -337,7 +364,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -349,7 +377,8 @@ "$ref": "http://localhost:1234/draft2019-09/locationIndependentIdentifier.json#/$defs/refToInteger" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/locationIndependentIdentifier.json:locationIndependentIdentifier\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/locationIndependentIdentifier.json:locationIndependentIdentifier\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/locationIndependentIdentifier.json:locationIndependentIdentifier\":\n generated.cue:1:8\n" }, "tests": [ { @@ -357,7 +386,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -365,7 +395,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -382,7 +413,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -394,7 +426,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -406,7 +439,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -418,7 +452,8 @@ "$ref": "http://localhost:1234/different-id-ref-string.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/different-id-ref-string.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/different-id-ref-string.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/different-id-ref-string.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -426,7 +461,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -434,7 +470,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -446,7 +483,8 @@ "$ref": "http://localhost:1234/urn-ref-string.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/urn-ref-string.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/urn-ref-string.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/urn-ref-string.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -454,7 +492,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -462,7 +501,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -474,7 +514,8 @@ "$ref": "http://localhost:1234/nested-absolute-ref-to-string.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested-absolute-ref-to-string.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested-absolute-ref-to-string.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested-absolute-ref-to-string.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -482,7 +523,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -490,7 +532,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -502,7 +545,8 @@ "$ref": "http://localhost:1234/draft2019-09/detached-ref.json#/$defs/foo" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/detached-ref.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/detached-ref.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/detached-ref.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -510,7 +554,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -518,7 +563,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/required.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/required.json index d7b1d33d368..13e5021a7b6 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/required.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/required.json @@ -26,7 +26,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -113,7 +114,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -145,7 +147,8 @@ "data": {}, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -155,7 +158,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -167,7 +171,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -179,7 +184,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/type.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/type.json index 283a2198a1a..1ce4c3d585d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/type.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/type.json @@ -16,7 +16,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/unevaluatedItems.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/unevaluatedItems.json index 68147b2a900..136b0f6a173 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/unevaluatedItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/unevaluatedItems.json @@ -6,7 +6,8 @@ "unevaluatedItems": true }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -24,7 +26,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -36,7 +39,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -44,7 +48,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +59,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -68,7 +74,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -76,7 +83,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +94,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -96,7 +105,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -111,7 +121,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -122,7 +133,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -139,7 +151,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -149,7 +162,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -160,7 +174,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -178,7 +193,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -189,7 +205,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -206,7 +223,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -218,7 +236,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +249,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -251,7 +271,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -263,7 +284,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -275,7 +297,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -302,7 +325,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -313,7 +337,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -325,7 +350,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -347,7 +373,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -358,7 +385,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -369,7 +397,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -380,7 +409,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -402,7 +432,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -412,7 +443,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -424,7 +456,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -448,7 +481,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedItems\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedItems\" (and 1 more errors)" }, "tests": [ { @@ -458,7 +492,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -470,7 +505,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -506,7 +542,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -517,7 +554,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -529,7 +567,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -541,7 +580,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -554,7 +594,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -589,7 +630,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -600,7 +642,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -612,7 +655,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -639,7 +683,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"not\" (and 1 more errors)" }, "tests": [ { @@ -650,7 +695,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -694,7 +740,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 3 more errors)" }, "tests": [ { @@ -706,7 +753,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -719,7 +767,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -732,7 +781,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -746,7 +796,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -761,7 +812,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -769,7 +821,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -779,7 +832,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -807,7 +861,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -818,7 +873,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -830,7 +886,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -858,7 +915,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -869,7 +927,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -881,7 +940,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -919,7 +979,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"$recursiveAnchor\" (and 3 more errors)" }, "tests": [ { @@ -935,7 +996,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -952,7 +1014,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -973,7 +1036,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -983,7 +1047,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1018,7 +1083,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -1030,7 +1096,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1043,7 +1110,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1055,7 +1123,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -1063,7 +1132,8 @@ "data": true, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1071,7 +1141,8 @@ "data": 123, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1079,7 +1150,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1087,7 +1159,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1095,7 +1168,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1103,7 +1177,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1117,7 +1192,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -1127,7 +1203,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1146,7 +1223,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -1156,7 +1234,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1166,7 +1245,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/unevaluatedProperties.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/unevaluatedProperties.json index 8819c13429c..eef87e26d4f 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/unevaluatedProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/unevaluatedProperties.json @@ -7,7 +7,8 @@ "unevaluatedProperties": true }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -15,7 +16,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -25,7 +27,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -41,7 +44,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -49,7 +53,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +64,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +75,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -82,7 +89,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -90,7 +98,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -100,7 +109,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -118,7 +128,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -128,7 +139,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -139,7 +151,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -157,7 +170,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -167,7 +181,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -178,7 +193,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -197,7 +213,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -207,7 +224,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -218,7 +236,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -245,7 +264,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -256,7 +276,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -268,7 +289,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -295,7 +317,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -306,7 +329,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +342,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -341,7 +366,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -351,7 +377,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -362,7 +389,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -388,7 +416,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -398,7 +427,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -409,7 +439,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -459,7 +490,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -470,7 +502,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -482,7 +515,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -494,7 +528,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -507,7 +542,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -547,7 +583,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -558,7 +595,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -570,7 +608,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -600,7 +639,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"not\" (and 1 more errors)" }, "tests": [ { @@ -611,7 +651,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -654,7 +695,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 3 more errors)" }, "tests": [ { @@ -665,7 +707,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -677,7 +720,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -687,7 +731,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -698,7 +743,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -731,7 +777,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -742,7 +789,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -754,7 +802,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -764,7 +813,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -775,7 +825,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -808,7 +859,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -819,7 +871,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -831,7 +884,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -841,7 +895,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -852,7 +907,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -882,7 +938,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)" }, "tests": [ { @@ -893,7 +950,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -903,7 +961,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -924,7 +983,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -934,7 +994,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -944,7 +1005,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -972,7 +1034,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -983,7 +1046,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -995,7 +1059,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1023,7 +1088,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1034,7 +1100,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1046,7 +1113,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1083,7 +1151,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"$recursiveAnchor\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"$recursiveAnchor\" (and 3 more errors)" }, "tests": [ { @@ -1098,7 +1167,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1113,7 +1183,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1134,7 +1205,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1144,7 +1216,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1165,7 +1238,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1175,7 +1249,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1198,7 +1273,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1208,7 +1284,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1219,7 +1296,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1242,7 +1320,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1252,7 +1331,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1263,7 +1343,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1286,7 +1367,8 @@ "unevaluatedProperties": true }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1296,7 +1378,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1307,7 +1390,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1330,7 +1414,8 @@ "unevaluatedProperties": true }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1340,7 +1425,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1351,7 +1437,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1376,7 +1463,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1386,7 +1474,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1397,7 +1486,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1422,7 +1512,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1432,7 +1523,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1443,7 +1535,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1480,7 +1573,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1492,7 +1586,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1505,7 +1600,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1532,7 +1628,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1543,7 +1640,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1553,7 +1651,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1563,7 +1662,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1590,7 +1690,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1601,7 +1702,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1611,7 +1713,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1621,7 +1724,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1639,7 +1743,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1647,7 +1752,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1657,7 +1763,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1668,7 +1775,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1680,7 +1788,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1693,7 +1802,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1707,7 +1817,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1722,7 +1833,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1774,7 +1886,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1782,7 +1895,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1793,7 +1907,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1804,7 +1919,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1815,7 +1931,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1826,7 +1943,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1838,7 +1956,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1850,7 +1969,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1863,7 +1983,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1939,7 +2060,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1947,7 +2069,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1957,7 +2080,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1967,7 +2091,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1977,7 +2102,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1987,7 +2113,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1998,7 +2125,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2009,7 +2137,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2020,7 +2149,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2031,7 +2161,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2042,7 +2173,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2053,7 +2185,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2063,7 +2196,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2074,7 +2208,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2085,7 +2220,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2096,7 +2232,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2107,7 +2244,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2118,7 +2256,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2129,7 +2268,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2139,7 +2279,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2150,7 +2291,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2161,7 +2303,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -2173,7 +2316,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -2181,7 +2325,8 @@ "data": true, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2189,7 +2334,8 @@ "data": 123, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2197,7 +2343,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2205,7 +2352,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2213,7 +2361,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2221,7 +2370,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -2235,7 +2385,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -2245,7 +2396,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -2262,7 +2414,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -2272,7 +2425,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2282,7 +2436,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -2301,7 +2456,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -2311,7 +2467,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2321,7 +2478,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -2344,7 +2502,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)" }, "tests": [ { @@ -2354,7 +2513,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2364,7 +2524,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2375,7 +2536,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/uniqueItems.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/uniqueItems.json index 37e760db881..ae3423c10e5 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/uniqueItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/uniqueItems.json @@ -40,7 +40,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -115,7 +116,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -329,7 +331,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -415,7 +418,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:4:1\n generated.cue:4:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:4:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:4:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:4:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:4:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:4:1\n generated.cue:4:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:4:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:4:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:4:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:4:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:4:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:4:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:4:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:4:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:4:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -428,7 +432,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:4:1\n generated.cue:4:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:4:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:4:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:4:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:4:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:4:1\n generated.cue:4:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:4:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:4:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:4:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:4:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:4:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:4:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:4:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:4:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:4:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -750,7 +755,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -763,7 +769,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -776,7 +783,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -789,7 +797,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/vocabulary.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/vocabulary.json index a87022a8bff..50c57c7a994 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2019-09/vocabulary.json +++ b/encoding/jsonschema/testdata/external/tests/draft2019-09/vocabulary.json @@ -12,7 +12,8 @@ } }, "skip": { - "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2019-09/metaschema-no-validation.json\": $schema URI not recognized" + "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2019-09/metaschema-no-validation.json\": $schema URI not recognized", + "v3": "extract error: invalid $schema URL \"http://localhost:1234/draft2019-09/metaschema-no-validation.json\": $schema URI not recognized" }, "tests": [ { @@ -22,7 +23,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -32,7 +34,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -42,7 +45,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -54,7 +58,8 @@ "type": "number" }, "skip": { - "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2019-09/metaschema-optional-vocabulary.json\": $schema URI not recognized" + "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2019-09/metaschema-optional-vocabulary.json\": $schema URI not recognized", + "v3": "extract error: invalid $schema URL \"http://localhost:1234/draft2019-09/metaschema-optional-vocabulary.json\": $schema URI not recognized" }, "tests": [ { @@ -62,7 +67,8 @@ "data": "foobar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +76,8 @@ "data": 20, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/additionalProperties.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/additionalProperties.json index 25a204ea26f..2e9df04fae0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/additionalProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/additionalProperties.json @@ -29,7 +29,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -85,7 +86,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -232,7 +234,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n" + "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n", + "v3": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n" }, "tests": [ { @@ -242,7 +245,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -253,7 +257,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -276,7 +281,8 @@ "additionalProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\"" + "v2": "extract error: unsupported constraint \"dependentSchemas\"", + "v3": "extract error: unsupported constraint \"dependentSchemas\"" }, "tests": [ { @@ -286,7 +292,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -296,7 +303,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -307,7 +315,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/allOf.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/allOf.json index f1477e6dedf..4c6e2a8c253 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/allOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/allOf.json @@ -42,7 +42,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -52,7 +53,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -118,7 +120,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -129,7 +132,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -140,7 +144,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -150,7 +155,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -213,7 +219,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -233,7 +240,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/anchor.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/anchor.json index 12a92c9ff35..aaaf7c0bd46 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/anchor.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/anchor.json @@ -12,7 +12,8 @@ } }, "skip": { - "v2": "extract error: anchors (foo) not supported (and 1 more errors)" + "v2": "extract error: anchors (foo) not supported (and 1 more errors)", + "v3": "extract error: anchors (foo) not supported (and 1 more errors)" }, "tests": [ { @@ -20,7 +21,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -28,7 +30,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -47,7 +50,8 @@ } }, "skip": { - "v2": "extract error: anchors (foo) not supported (and 1 more errors)" + "v2": "extract error: anchors (foo) not supported (and 1 more errors)", + "v3": "extract error: anchors (foo) not supported (and 1 more errors)" }, "tests": [ { @@ -55,7 +59,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -63,7 +68,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -87,7 +93,8 @@ } }, "skip": { - "v2": "extract error: anchors (foo) not supported (and 1 more errors)" + "v2": "extract error: anchors (foo) not supported (and 1 more errors)", + "v3": "extract error: anchors (foo) not supported (and 1 more errors)" }, "tests": [ { @@ -95,7 +102,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -103,7 +111,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -132,7 +141,8 @@ "$ref": "child1#my_anchor" }, "skip": { - "v2": "extract error: unsupported constraint \"$anchor\" (and 4 more errors)" + "v2": "extract error: unsupported constraint \"$anchor\" (and 4 more errors)", + "v3": "extract error: unsupported constraint \"$anchor\" (and 4 more errors)" }, "tests": [ { @@ -140,7 +150,8 @@ "data": "a", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -148,7 +159,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/anyOf.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/anyOf.json index 60f1ec01019..13366e06bb7 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/anyOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/anyOf.json @@ -111,7 +111,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: 2 errors in empty disjunction:\nexplicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n" + "v2": "extract error: cannot compile resulting schema: 2 errors in empty disjunction:\nexplicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n" }, "tests": [ { @@ -119,7 +120,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/boolean_schema.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/boolean_schema.json index 6b151b0d187..3dd9c3364fa 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/boolean_schema.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/boolean_schema.json @@ -58,7 +58,8 @@ "description": "boolean schema 'false'", "schema": false, "skip": { - "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n" + "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n" }, "tests": [ { @@ -66,7 +67,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -74,7 +76,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -82,7 +85,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -90,7 +94,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -98,7 +103,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -108,7 +114,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -116,7 +123,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +134,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +143,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/const.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/const.json index b2b064888be..ec880fa3c4e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/const.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/const.json @@ -56,7 +56,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -324,7 +325,8 @@ "data": 0.0, "valid": true, "skip": { - "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -366,7 +368,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -383,7 +386,8 @@ "data": -2, "valid": true, "skip": { - "v2": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -430,7 +434,8 @@ "data": 9007199254740992.0, "valid": true, "skip": { - "v2": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/contains.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/contains.json index 74f837e6481..d9a0435a687 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/contains.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/contains.json @@ -202,7 +202,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -212,7 +213,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -220,7 +222,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/content.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/content.json index 78c8637d5fe..806880fcfa0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/content.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/content.json @@ -96,7 +96,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"contentSchema\"" + "v2": "extract error: unsupported constraint \"contentSchema\"", + "v3": "extract error: unsupported constraint \"contentSchema\"" }, "tests": [ { @@ -104,7 +105,8 @@ "data": "eyJmb28iOiAiYmFyIn0K", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -112,7 +114,8 @@ "data": "eyJib28iOiAyMCwgImZvbyI6ICJiYXoifQ==", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -120,7 +123,8 @@ "data": "eyJib28iOiAyMH0=", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -128,7 +132,8 @@ "data": "e30=", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -136,7 +141,8 @@ "data": "W10=", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -144,7 +150,8 @@ "data": "ezp9Cg==", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -152,7 +159,8 @@ "data": "{}", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -160,7 +168,8 @@ "data": 100, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/default.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/default.json index 457b0c9556a..bf57305149c 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/default.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/default.json @@ -80,7 +80,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/defs.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/defs.json index 11ce201ae3d..34f9d0fc274 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/defs.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/defs.json @@ -6,7 +6,8 @@ "$ref": "https://json-schema.org/draft/2020-12/schema" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2020-12/schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2020-12/schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2020-12/schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -20,7 +21,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -34,7 +36,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/dependentRequired.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/dependentRequired.json index ff715a61a8b..a3ea69de461 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/dependentRequired.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/dependentRequired.json @@ -10,7 +10,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentRequired\"" + "v2": "extract error: unsupported constraint \"dependentRequired\"", + "v3": "extract error: unsupported constraint \"dependentRequired\"" }, "tests": [ { @@ -18,7 +19,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -28,7 +30,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -39,7 +42,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -49,7 +53,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +64,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -67,7 +73,8 @@ "data": "foobar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -75,7 +82,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -89,7 +97,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentRequired\"" + "v2": "extract error: unsupported constraint \"dependentRequired\"", + "v3": "extract error: unsupported constraint \"dependentRequired\"" }, "tests": [ { @@ -97,7 +106,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -107,7 +117,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -115,7 +126,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -132,7 +144,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentRequired\"" + "v2": "extract error: unsupported constraint \"dependentRequired\"", + "v3": "extract error: unsupported constraint \"dependentRequired\"" }, "tests": [ { @@ -140,7 +153,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -151,7 +165,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -163,7 +178,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +190,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -185,7 +202,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -195,7 +213,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -214,7 +233,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentRequired\"" + "v2": "extract error: unsupported constraint \"dependentRequired\"", + "v3": "extract error: unsupported constraint \"dependentRequired\"" }, "tests": [ { @@ -225,7 +245,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -236,7 +257,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -247,7 +269,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -257,7 +280,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/dependentSchemas.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/dependentSchemas.json index 3ead4a53832..681dba434e1 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/dependentSchemas.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/dependentSchemas.json @@ -17,7 +17,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\"" + "v2": "extract error: unsupported constraint \"dependentSchemas\"", + "v3": "extract error: unsupported constraint \"dependentSchemas\"" }, "tests": [ { @@ -28,7 +29,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +40,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -49,7 +52,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -60,7 +64,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -71,7 +76,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -81,7 +87,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -89,7 +96,8 @@ "data": "foobar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -97,7 +105,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -112,7 +121,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\"" + "v2": "extract error: unsupported constraint \"dependentSchemas\"", + "v3": "extract error: unsupported constraint \"dependentSchemas\"" }, "tests": [ { @@ -122,7 +132,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -132,7 +143,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -143,7 +155,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -151,7 +164,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -172,7 +186,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\"" + "v2": "extract error: unsupported constraint \"dependentSchemas\"", + "v3": "extract error: unsupported constraint \"dependentSchemas\"" }, "tests": [ { @@ -185,7 +200,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +213,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -208,7 +225,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -218,7 +236,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -240,7 +259,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\"" + "v2": "extract error: unsupported constraint \"dependentSchemas\"", + "v3": "extract error: unsupported constraint \"dependentSchemas\"" }, "tests": [ { @@ -250,7 +270,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -260,7 +281,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -271,7 +293,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -281,7 +304,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/dynamicRef.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/dynamicRef.json index 5c6e9080566..097da7a9489 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/dynamicRef.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/dynamicRef.json @@ -16,7 +16,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicRef\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicRef\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicRef\" (and 1 more errors)" }, "tests": [ { @@ -27,7 +28,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +40,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -60,7 +63,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicRef\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicRef\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicRef\" (and 1 more errors)" }, "tests": [ { @@ -71,7 +75,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -82,7 +87,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -104,7 +110,8 @@ } }, "skip": { - "v2": "extract error: anchors (items) not supported (and 1 more errors)" + "v2": "extract error: anchors (items) not supported (and 1 more errors)", + "v3": "extract error: anchors (items) not supported (and 1 more errors)" }, "tests": [ { @@ -115,7 +122,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +134,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -158,7 +167,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" }, "tests": [ { @@ -169,7 +179,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -180,7 +191,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -213,7 +225,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" }, "tests": [ { @@ -224,7 +237,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -235,7 +249,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -271,7 +286,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" }, "tests": [ { @@ -282,7 +298,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -293,7 +310,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -325,7 +343,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$anchor\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$anchor\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$anchor\" (and 2 more errors)" }, "tests": [ { @@ -336,7 +355,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -368,7 +388,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" }, "tests": [ { @@ -379,7 +400,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -412,7 +434,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\" (and 3 more errors)" }, "tests": [ { @@ -423,7 +446,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -464,7 +488,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" }, "tests": [ { @@ -479,7 +504,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -494,7 +520,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -535,7 +562,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\" (and 2 more errors)" }, "tests": [ { @@ -550,7 +578,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -616,7 +645,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 6 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 6 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 6 more errors)" }, "tests": [ { @@ -629,7 +659,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -642,7 +673,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -655,7 +687,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -668,7 +701,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -714,7 +748,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 3 more errors)" }, "tests": [ { @@ -722,7 +757,8 @@ "data": "a string", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -730,7 +766,8 @@ "data": 42, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -738,7 +775,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -753,7 +791,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\" (and 1 more errors)" }, "tests": [ { @@ -767,7 +806,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -781,7 +821,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -806,7 +847,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\"" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\"", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\"" }, "tests": [ { @@ -816,7 +858,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -830,7 +873,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -844,7 +888,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -875,7 +920,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\"" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\"", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\"" }, "tests": [ { @@ -885,7 +931,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -899,7 +946,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -913,7 +961,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -944,7 +993,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\"" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\"", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\"" }, "tests": [ { @@ -954,7 +1004,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -968,7 +1019,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -982,7 +1034,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -993,7 +1046,8 @@ "$ref": "http://localhost:1234/draft2020-12/detached-dynamicref.json#/$defs/foo" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/detached-dynamicref.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/detached-dynamicref.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/detached-dynamicref.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -1001,7 +1055,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1009,7 +1064,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1032,7 +1088,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicRef\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicRef\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicRef\" (and 1 more errors)" }, "tests": [ { @@ -1042,7 +1099,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1052,7 +1110,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1100,7 +1159,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicRef\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicRef\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicRef\" (and 2 more errors)" }, "tests": [ { @@ -1112,7 +1172,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1124,7 +1185,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/enum.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/enum.json index ccc1e2201f0..eacda647e5b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/enum.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/enum.json @@ -69,7 +69,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -161,7 +162,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -169,7 +171,8 @@ "data": {}, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -345,7 +348,8 @@ "data": 0.0, "valid": true, "skip": { - "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -382,7 +386,8 @@ ], "valid": true, "skip": { - "v2": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n" + "v2": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n", + "v3": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:2\n instance.json:1:2\n" } } ] @@ -411,7 +416,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -448,7 +454,8 @@ ], "valid": true, "skip": { - "v2": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n" + "v2": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n", + "v3": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:2\n instance.json:1:2\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/format.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/format.json index 099a40b9756..25cc96da6c7 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/format.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/format.json @@ -6,7 +6,8 @@ "format": "email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "2962", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -74,7 +82,8 @@ "format": "idn-email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -82,7 +91,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -90,7 +100,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -98,7 +109,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -106,7 +118,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -114,7 +127,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -122,7 +136,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -130,7 +145,8 @@ "data": "2962", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -142,7 +158,8 @@ "format": "regex" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -150,7 +167,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +176,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +185,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +194,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +203,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +212,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +221,8 @@ "data": "^(abc]", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -210,7 +234,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -218,7 +243,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -226,7 +252,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -234,7 +261,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -242,7 +270,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -250,7 +279,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -258,7 +288,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -266,7 +297,8 @@ "data": "127.0.0.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -278,7 +310,8 @@ "format": "ipv6" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -286,7 +319,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +328,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +337,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -310,7 +346,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +355,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -326,7 +364,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -334,7 +373,8 @@ "data": "12345::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -346,7 +386,8 @@ "format": "idn-hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -354,7 +395,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -362,7 +404,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -370,7 +413,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -378,7 +422,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -386,7 +431,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -394,7 +440,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -402,7 +449,8 @@ "data": "〮실례.테스트", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -414,7 +462,8 @@ "format": "hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -422,7 +471,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -430,7 +480,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -438,7 +489,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -446,7 +498,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -454,7 +507,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -462,7 +516,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -470,7 +525,8 @@ "data": "-a-host-name-that-starts-with--", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -482,7 +538,8 @@ "format": "date" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -490,7 +547,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -498,7 +556,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -506,7 +565,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -514,7 +574,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -522,7 +583,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -530,7 +592,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -538,7 +601,8 @@ "data": "06/19/1963", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -550,7 +614,8 @@ "format": "date-time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -558,7 +623,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -566,7 +632,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -574,7 +641,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -582,7 +650,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -590,7 +659,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -598,7 +668,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -606,7 +677,8 @@ "data": "1990-02-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -618,7 +690,8 @@ "format": "time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -626,7 +699,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -634,7 +708,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -642,7 +717,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -650,7 +726,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -658,7 +735,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -666,7 +744,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -674,7 +753,8 @@ "data": "08:30:06 PST", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -686,7 +766,8 @@ "format": "json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -694,7 +775,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -702,7 +784,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -710,7 +793,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -718,7 +802,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -726,7 +811,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -734,7 +820,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -742,7 +829,8 @@ "data": "/foo/bar~", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -754,7 +842,8 @@ "format": "relative-json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -762,7 +851,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -770,7 +860,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -778,7 +869,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -786,7 +878,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -794,7 +887,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -802,7 +896,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -810,7 +905,8 @@ "data": "/foo/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -822,7 +918,8 @@ "format": "iri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -830,7 +927,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -838,7 +936,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -846,7 +945,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -854,7 +954,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -862,7 +963,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -870,7 +972,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -878,7 +981,8 @@ "data": "http://2001:0db8:85a3:0000:0000:8a2e:0370:7334", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -890,7 +994,8 @@ "format": "iri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -898,7 +1003,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -906,7 +1012,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -914,7 +1021,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -922,7 +1030,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -930,7 +1039,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -938,7 +1048,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -946,7 +1057,8 @@ "data": "\\\\WINDOWS\\filëßåré", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -958,7 +1070,8 @@ "format": "uri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -966,7 +1079,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -974,7 +1088,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -982,7 +1097,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -990,7 +1106,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -998,7 +1115,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1006,7 +1124,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1014,7 +1133,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1026,7 +1146,8 @@ "format": "uri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -1034,7 +1155,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1042,7 +1164,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1050,7 +1173,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1058,7 +1182,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1066,7 +1191,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1074,7 +1200,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1082,7 +1209,8 @@ "data": "\\\\WINDOWS\\fileshare", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1094,7 +1222,8 @@ "format": "uri-template" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -1102,7 +1231,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1110,7 +1240,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1118,7 +1249,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1126,7 +1258,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1134,7 +1267,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1142,7 +1276,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1150,7 +1285,8 @@ "data": "http://example.com/dictionary/{term:1}/{term", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1162,7 +1298,8 @@ "format": "uuid" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -1170,7 +1307,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1178,7 +1316,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1186,7 +1325,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1194,7 +1334,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1202,7 +1343,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1210,7 +1352,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1218,7 +1361,8 @@ "data": "2eb8aa08-aa98-11ea-b4aa-73b441d1638", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1230,7 +1374,8 @@ "format": "duration" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -1238,7 +1383,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1246,7 +1392,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1254,7 +1401,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1262,7 +1410,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1270,7 +1419,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1278,7 +1428,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1286,7 +1437,8 @@ "data": "PT1D", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/if-then-else.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/if-then-else.json index 94776f6a137..182c6133eb0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/if-then-else.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/if-then-else.json @@ -8,7 +8,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\"" + "v2": "extract error: unsupported constraint \"if\"", + "v3": "extract error: unsupported constraint \"if\"" }, "tests": [ { @@ -16,7 +17,8 @@ "data": 0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -24,7 +26,8 @@ "data": "hello", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -38,7 +41,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"then\"" + "v2": "extract error: unsupported constraint \"then\"", + "v3": "extract error: unsupported constraint \"then\"" }, "tests": [ { @@ -46,7 +50,8 @@ "data": 0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +59,8 @@ "data": "hello", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -68,7 +74,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"else\"" + "v2": "extract error: unsupported constraint \"else\"", + "v3": "extract error: unsupported constraint \"else\"" }, "tests": [ { @@ -76,7 +83,8 @@ "data": 0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -84,7 +92,8 @@ "data": "hello", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -101,7 +110,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -109,7 +119,8 @@ "data": -1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +128,8 @@ "data": -100, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +137,8 @@ "data": 3, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -142,7 +155,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -150,7 +164,8 @@ "data": -1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +173,8 @@ "data": 4, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +182,8 @@ "data": 3, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -186,7 +203,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -194,7 +212,8 @@ "data": -1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -202,7 +221,8 @@ "data": -100, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -210,7 +230,8 @@ "data": 4, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -218,7 +239,8 @@ "data": 3, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -246,7 +268,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -254,7 +277,8 @@ "data": -100, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +286,8 @@ "data": 3, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -280,7 +305,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -288,7 +314,8 @@ "data": "then", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -296,7 +323,8 @@ "data": "else", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -314,7 +342,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -322,7 +351,8 @@ "data": "then", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -330,7 +360,8 @@ "data": "else", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -350,7 +381,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"then\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"then\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"then\" (and 2 more errors)" }, "tests": [ { @@ -358,7 +390,8 @@ "data": "yes", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -366,7 +399,8 @@ "data": "other", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -374,7 +408,8 @@ "data": "no", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -382,7 +417,8 @@ "data": "invalid", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/items.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/items.json index e2a087ecf42..80d0d15cdf4 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/items.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/items.json @@ -49,7 +49,8 @@ "items": true }, "skip": { - "v2": "extract error: value of \"items\" must be an object or array" + "v2": "extract error: value of \"items\" must be an object or array", + "v3": "extract error: value of \"items\" must be an object or array" }, "tests": [ { @@ -61,7 +62,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +71,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -81,7 +84,8 @@ "items": false }, "skip": { - "v2": "extract error: value of \"items\" must be an object or array" + "v2": "extract error: value of \"items\" must be an object or array", + "v3": "extract error: value of \"items\" must be an object or array" }, "tests": [ { @@ -93,7 +97,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +106,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -145,7 +151,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 3 more errors)" }, "tests": [ { @@ -178,7 +185,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -219,7 +227,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -255,7 +264,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -283,7 +293,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -314,7 +325,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -333,7 +345,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -467,7 +480,8 @@ "items": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" }, "tests": [ { @@ -475,7 +489,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -485,7 +500,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -496,7 +512,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -508,7 +525,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -521,7 +539,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -544,7 +563,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\"" + "v2": "extract error: unsupported constraint \"prefixItems\"", + "v3": "extract error: unsupported constraint \"prefixItems\"" }, "tests": [ { @@ -555,7 +575,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -566,7 +587,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -585,7 +607,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\"" + "v2": "extract error: unsupported constraint \"prefixItems\"", + "v3": "extract error: unsupported constraint \"prefixItems\"" }, "tests": [ { @@ -597,7 +620,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -608,7 +632,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -623,7 +648,8 @@ "items": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" }, "tests": [ { @@ -635,7 +661,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -645,7 +672,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/maxContains.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/maxContains.json index 802b101fc70..ee8be6cffe3 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/maxContains.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/maxContains.json @@ -82,7 +82,8 @@ "maxContains": 1.0 }, "skip": { - "v2": "extract error: value of \"maxContains\" must be a non-negative integer value" + "v2": "extract error: value of \"maxContains\" must be a non-negative integer value", + "v3": "extract error: value of \"maxContains\" must be a non-negative integer value" }, "tests": [ { @@ -92,7 +93,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -103,7 +105,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/maxItems.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/maxItems.json index 502f231a6b9..c9462d2f8af 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/maxItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/maxItems.json @@ -44,7 +44,8 @@ "maxItems": 2.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -54,7 +55,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -66,7 +68,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/maxLength.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/maxLength.json index 9820bf82925..4c5caa5e9cb 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/maxLength.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/maxLength.json @@ -45,7 +45,8 @@ "data": "f", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:4:1\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:4:1\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:4:1\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:4:1\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:4:41\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:4:1\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:4:1\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:4:1\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:4:1\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:4:41\n", + "v3": "conflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:4:41\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/maxProperties.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/maxProperties.json index 28ca6b6fdcf..89857c93780 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/maxProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/maxProperties.json @@ -58,7 +58,8 @@ "maxProperties": 2.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -68,7 +69,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -80,7 +82,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/minContains.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/minContains.json index d6ff8356208..027e71cedab 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/minContains.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/minContains.json @@ -135,7 +135,8 @@ "minContains": 2.0 }, "skip": { - "v2": "extract error: value of \"minContains\" must be a non-negative integer value" + "v2": "extract error: value of \"minContains\" must be a non-negative integer value", + "v3": "extract error: value of \"minContains\" must be a non-negative integer value" }, "tests": [ { @@ -145,7 +146,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -156,7 +158,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/minItems.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/minItems.json index e20758db8e7..e8c3f423cd1 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/minItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/minItems.json @@ -40,7 +40,8 @@ "minItems": 1.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -51,7 +52,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +61,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/minLength.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/minLength.json index 79163776168..b600b0b5f7e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/minLength.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/minLength.json @@ -45,7 +45,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:4:1\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:4:1\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:4:1\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:4:1\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:4:41\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:4:1\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:4:1\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:4:1\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:4:1\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:4:41\n", + "v3": "conflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:4:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:4:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:4:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:4:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:4:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:4:41\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/minProperties.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/minProperties.json index f32cccbbeaf..8109a2e9bee 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/minProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/minProperties.json @@ -6,7 +6,8 @@ "minProperties": 1 }, "skip": { - "v2": "extract error: unsupported constraint \"minProperties\"" + "v2": "extract error: unsupported constraint \"minProperties\"", + "v3": "extract error: unsupported constraint \"minProperties\"" }, "tests": [ { @@ -17,7 +18,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -27,7 +29,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -35,7 +38,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -43,7 +47,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -51,7 +56,8 @@ "data": "", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +65,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -71,7 +78,8 @@ "minProperties": 1.0 }, "skip": { - "v2": "extract error: unsupported constraint \"minProperties\"" + "v2": "extract error: unsupported constraint \"minProperties\"", + "v3": "extract error: unsupported constraint \"minProperties\"" }, "tests": [ { @@ -82,7 +90,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -90,7 +99,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/not.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/not.json index 46d269adf34..21956368ddc 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/not.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/not.json @@ -8,7 +8,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -16,7 +17,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -24,7 +26,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -41,7 +44,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -49,7 +53,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -57,7 +62,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -65,7 +71,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -84,7 +91,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -92,7 +100,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +111,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -112,7 +122,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -128,7 +139,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -139,7 +151,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +163,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -162,7 +176,8 @@ "not": {} }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -170,7 +185,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -178,7 +194,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -186,7 +203,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -194,7 +212,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -202,7 +221,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -212,7 +232,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -220,7 +241,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +252,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +261,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -250,7 +274,8 @@ "not": true }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -258,7 +283,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -266,7 +292,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -274,7 +301,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -282,7 +310,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -290,7 +319,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -300,7 +330,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -308,7 +339,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +350,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -326,7 +359,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -338,7 +372,8 @@ "not": false }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -346,7 +381,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -354,7 +390,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -362,7 +399,8 @@ "data": true, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -370,7 +408,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -378,7 +417,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -388,7 +428,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -396,7 +437,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -406,7 +448,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -414,7 +457,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -428,7 +472,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -436,7 +481,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -459,7 +505,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -469,7 +516,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -479,7 +527,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/oneOf.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/oneOf.json index 58f30106482..36d38bc8a90 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/oneOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/oneOf.json @@ -28,7 +28,8 @@ "data": 3, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -68,7 +69,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -89,7 +91,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -128,7 +131,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -149,7 +153,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -204,7 +209,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -239,7 +245,8 @@ "data": 123, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -272,7 +279,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -300,7 +308,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -352,7 +361,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -362,7 +372,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/anchor.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/anchor.json index 18ea4744a95..7fbb8e56562 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/anchor.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/anchor.json @@ -34,7 +34,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"$anchor\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"$anchor\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"$anchor\" (and 1 more errors)" }, "tests": [ { @@ -45,7 +46,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -55,7 +57,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -63,7 +66,8 @@ "data": "a string to match #/$defs/anchor_in_enum", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -71,7 +75,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/cross-draft.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/cross-draft.json index cffb7e0338e..957af457f42 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/cross-draft.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/cross-draft.json @@ -7,7 +7,8 @@ "$ref": "http://localhost:1234/draft2019-09/ignore-prefixItems.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/ignore-prefixItems.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/ignore-prefixItems.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/ignore-prefixItems.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -20,7 +21,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/dependencies-compatibility.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/dependencies-compatibility.json index de5e7ac0e71..8c214e33012 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/dependencies-compatibility.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/dependencies-compatibility.json @@ -37,7 +37,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -129,7 +130,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -140,7 +142,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -150,7 +153,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -193,7 +197,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -203,7 +208,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -249,7 +255,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -260,7 +267,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -271,7 +279,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -317,7 +326,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -328,7 +338,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -373,7 +384,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -384,7 +396,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -394,7 +407,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/dynamicRef.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/dynamicRef.json index 51ac36932f1..309cb34ecb6 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/dynamicRef.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/dynamicRef.json @@ -42,7 +42,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicRef\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicRef\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicRef\" (and 2 more errors)" }, "tests": [ { @@ -54,7 +55,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -66,7 +68,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/ecmascript-regex.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/ecmascript-regex.json index 0606a22154b..a3a32f9d2f5 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/ecmascript-regex.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/ecmascript-regex.json @@ -47,7 +47,8 @@ "pattern": "^\\cC$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" }, "tests": [ { @@ -55,7 +56,8 @@ "data": "\\cC", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -63,7 +65,8 @@ "data": "\u0003", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -76,7 +79,8 @@ "pattern": "^\\cc$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" }, "tests": [ { @@ -84,7 +88,8 @@ "data": "\\cc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -92,7 +97,8 @@ "data": "\u0003", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -210,7 +216,8 @@ "data": "\u000b", "valid": true, "skip": { - "v2": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n", + "v3": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" } }, { @@ -223,7 +230,8 @@ "data": " ", "valid": true, "skip": { - "v2": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" } }, { @@ -231,7 +239,8 @@ "data": "\ufeff", "valid": true, "skip": { - "v2": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n", + "v3": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" } }, { @@ -244,7 +253,8 @@ "data": "\u2029", "valid": true, "skip": { - "v2": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" } }, { @@ -252,7 +262,8 @@ "data": " ", "valid": true, "skip": { - "v2": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n generated.cue:1:1\n instance.json:1:1\n" } }, { @@ -290,7 +301,8 @@ "data": "\u000b", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -303,7 +315,8 @@ "data": " ", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -311,7 +324,8 @@ "data": "\ufeff", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -324,7 +338,8 @@ "data": "\u2029", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -332,7 +347,8 @@ "data": " ", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -354,7 +370,8 @@ "pattern": "\\p{Letter}cole" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`" }, "tests": [ { @@ -362,7 +379,8 @@ "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -370,7 +388,8 @@ "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -378,7 +397,8 @@ "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -386,7 +406,8 @@ "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -475,7 +496,8 @@ "format": "regex" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -483,7 +505,8 @@ "data": "\\a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -495,7 +518,8 @@ "pattern": "^\\p{digit}+$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`" }, "tests": [ { @@ -503,7 +527,8 @@ "data": "42", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -511,7 +536,8 @@ "data": "-%#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -519,7 +545,8 @@ "data": "৪২", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -540,7 +567,10 @@ "data": { "l'ecole": "pas de vraie vie" }, - "valid": true + "valid": true, + "skip": { + "v3": "invalid regexp: error parsing regexp: invalid character class range: `\\p{Letter}`:\n generated.cue:3:36\n" + } }, { "description": "literal unicode character in json string", @@ -563,7 +593,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -593,7 +624,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -603,7 +635,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -613,7 +646,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -636,7 +670,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -646,7 +681,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -683,7 +719,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -693,7 +730,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -714,7 +752,10 @@ "data": { "42": "life, the universe, and everything" }, - "valid": true + "valid": true, + "skip": { + "v3": "invalid regexp: error parsing regexp: invalid character class range: `\\p{digit}`:\n generated.cue:3:34\n" + } }, { "description": "ascii non-digits", @@ -723,7 +764,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/float-overflow.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/float-overflow.json index ce346f87935..2f9092e46a7 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/float-overflow.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/float-overflow.json @@ -12,7 +12,8 @@ "data": 1E+308, "valid": true, "skip": { - "v2": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:4:1\n instance.json:1:1\n" + "v2": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:4:1\n instance.json:1:1\n", + "v3": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:4:1\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format-assertion.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format-assertion.json index 98254fddd22..1c1a6c2bf82 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format-assertion.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format-assertion.json @@ -7,7 +7,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/format-assertion-false.json\": $schema URI not recognized (and 1 more errors)" + "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/format-assertion-false.json\": $schema URI not recognized (and 1 more errors)", + "v3": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/format-assertion-false.json\": $schema URI not recognized (and 1 more errors)" }, "tests": [ { @@ -15,7 +16,8 @@ "data": "127.0.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -23,7 +25,8 @@ "data": "not-an-ipv4", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -36,7 +39,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/format-assertion-true.json\": $schema URI not recognized (and 1 more errors)" + "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/format-assertion-true.json\": $schema URI not recognized (and 1 more errors)", + "v3": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/format-assertion-true.json\": $schema URI not recognized (and 1 more errors)" }, "tests": [ { @@ -44,7 +48,8 @@ "data": "127.0.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -52,7 +57,8 @@ "data": "not-an-ipv4", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date-time.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date-time.json index 8ee7d3c0896..8f77de04cce 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date-time.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date-time.json @@ -6,7 +6,8 @@ "format": "date-time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "1963-06-19T08:30:06.283185Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "1963-06-19T08:30:06Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "1937-01-01T12:00:27.87+00:20", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "1990-12-31T15:59:50.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "1998-12-31T23:59:60Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "1998-12-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "1998-12-31T23:59:61Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "1998-12-31T23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "1998-12-31T22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "1990-02-31T15:59:59.123-08:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "1990-12-31T15:59:59-24:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "1963-06-19T08:30:06.28123+01:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "06/19/1963 08:30:06 PST", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "1963-06-19t08:30:06.283185z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "2013-350T01:01:01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "1963-6-19T08:30:06.283185Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "1963-06-1T08:30:06.283185Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "1963-06-1৪T00:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "1963-06-11T0৪:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date.json index 4a8891be32d..492c9a1726a 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/date.json @@ -6,7 +6,8 @@ "format": "date" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "1963-06-19", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "2020-01-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "2020-01-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "2021-02-28", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "2021-02-29", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "2020-02-29", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "2020-02-30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "2020-03-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "2020-03-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "2020-04-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "2020-04-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "2020-05-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "2020-05-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "2020-06-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "2020-06-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "2020-07-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "2020-07-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "2020-08-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "2020-08-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +240,8 @@ "data": "2020-09-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +249,8 @@ "data": "2020-09-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +258,8 @@ "data": "2020-10-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +267,8 @@ "data": "2020-10-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -246,7 +276,8 @@ "data": "2020-11-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -254,7 +285,8 @@ "data": "2020-11-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +294,8 @@ "data": "2020-12-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -270,7 +303,8 @@ "data": "2020-12-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -278,7 +312,8 @@ "data": "2020-13-01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -286,7 +321,8 @@ "data": "06/19/1963", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +330,8 @@ "data": "2013-350", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +339,8 @@ "data": "1998-1-20", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -310,7 +348,8 @@ "data": "1998-01-1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +357,8 @@ "data": "1998-13-01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -326,7 +366,8 @@ "data": "1998-04-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -334,7 +375,8 @@ "data": "2021-02-29", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -342,7 +384,8 @@ "data": "2020-02-29", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -350,7 +393,8 @@ "data": "1963-06-1৪", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -358,7 +402,8 @@ "data": "20230328", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -366,7 +411,8 @@ "data": "2023-W01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -374,7 +420,8 @@ "data": "2023-W13-2", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -382,7 +429,8 @@ "data": "2022W527", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/duration.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/duration.json index d7574c05de0..0705101167d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/duration.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/duration.json @@ -6,7 +6,8 @@ "format": "duration" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "P4DT12H30M5S", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "PT1D", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "P", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "P1YT", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "PT", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "P2D1Y", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "P1D2H", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "P2S", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "P4Y", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "PT0S", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "P0D", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "P1M", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "PT1M", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "PT36H", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "P1DT12H", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "P2W", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "P1Y2W", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "P২Y", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "P1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/email.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/email.json index c68aa9b2640..956134f1463 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/email.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/email.json @@ -6,7 +6,8 @@ "format": "email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "joe.bloggs@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "te~st@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "~test@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "test~@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "\"joe bloggs\"@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "\"joe..bloggs\"@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "\"joe@bloggs\"@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "joe.bloggs@[127.0.0.1]", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "joe.bloggs@[IPv6:::1]", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": ".test@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "test.@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "te.s.t@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "te..st@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "joe.bloggs@invalid=domain.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "joe.bloggs@[127.0.0.300]", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/hostname.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/hostname.json index 74600a9fb96..8c53203828e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/hostname.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/hostname.json @@ -6,7 +6,8 @@ "format": "hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "www.example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "xn--4gbwdl.xn--wgbh1c", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "-a-host-name-that-starts-with--", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "not_a_valid_host_name", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "-hostname", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "hostname-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "_hostname", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "hostname_", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "host_name", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "hostname", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "host-name", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "h0stn4me", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "1host", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "hostnam3", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/idn-email.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/idn-email.json index 244a119fa2c..5311e01325a 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/idn-email.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/idn-email.json @@ -6,7 +6,8 @@ "format": "idn-email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "실례@실례.테스트", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "joe.bloggs@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/idn-hostname.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/idn-hostname.json index 898e08cdb8a..a26a206fe32 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/idn-hostname.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/idn-hostname.json @@ -6,7 +6,8 @@ "format": "idn-hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "실례.테스트", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "〮실례.테스트", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "실〮례.테스트", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실례례테스트례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례테스트례례실례.테스트", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -95,7 +106,8 @@ "data": "-\u003e $1.00 \u003c--", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -104,7 +116,8 @@ "data": "xn--ihqwcrb4cv8a8dqg056pqjye", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -113,7 +126,8 @@ "data": "xn--X", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -122,7 +136,8 @@ "data": "XN--aa---o47jg78q", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -131,7 +146,8 @@ "data": "-hello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -140,7 +156,8 @@ "data": "hello-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +166,8 @@ "data": "-hello-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +176,8 @@ "data": "ःhello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -167,7 +186,8 @@ "data": "̀hello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -176,7 +196,8 @@ "data": "҈hello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -185,7 +206,8 @@ "data": "ßς་〇", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -194,7 +216,8 @@ "data": "۽۾", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -203,7 +226,8 @@ "data": "ـߺ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -212,7 +236,8 @@ "data": "〱〲〳〴〵〮〯〻", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -221,7 +246,8 @@ "data": "a·l", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +256,8 @@ "data": "·l", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -239,7 +266,8 @@ "data": "l·a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -248,7 +276,8 @@ "data": "l·", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -257,7 +286,8 @@ "data": "l·l", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -266,7 +296,8 @@ "data": "α͵S", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -275,7 +306,8 @@ "data": "α͵", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -284,7 +316,8 @@ "data": "α͵β", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -293,7 +326,8 @@ "data": "A׳ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +336,8 @@ "data": "׳ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -311,7 +346,8 @@ "data": "א׳ב", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -320,7 +356,8 @@ "data": "A״ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -329,7 +366,8 @@ "data": "״ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -338,7 +376,8 @@ "data": "א״ב", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -347,7 +386,8 @@ "data": "def・abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -356,7 +396,8 @@ "data": "・", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -365,7 +406,8 @@ "data": "・ぁ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -374,7 +416,8 @@ "data": "・ァ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -383,7 +426,8 @@ "data": "・丈", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -392,7 +436,8 @@ "data": "ب٠۰", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -401,7 +446,8 @@ "data": "ب٠ب", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -410,7 +456,8 @@ "data": "۰0", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -419,7 +466,8 @@ "data": "क‍ष", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -428,7 +476,8 @@ "data": "‍ष", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -437,7 +486,8 @@ "data": "क्‍ष", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -446,7 +496,8 @@ "data": "क्‌ष", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -455,7 +506,8 @@ "data": "بي‌بي", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -463,7 +515,8 @@ "data": "hostname", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -471,7 +524,8 @@ "data": "host-name", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -479,7 +533,8 @@ "data": "h0stn4me", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -487,7 +542,8 @@ "data": "1host", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -495,7 +551,8 @@ "data": "hostnam3", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/ipv4.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/ipv4.json index ec1ebdce33e..3112696cb12 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/ipv4.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/ipv4.json @@ -6,7 +6,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "127.0.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "256.256.256.256", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "127.0", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "0x7f000001", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "2130706433", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -111,7 +124,8 @@ "data": "087.10.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -119,7 +133,8 @@ "data": "87.10.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -127,7 +142,8 @@ "data": "1২7.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -135,7 +151,8 @@ "data": "192.168.1.0/24", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/ipv6.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/ipv6.json index f15aa425310..9405923804f 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/ipv6.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/ipv6.json @@ -6,7 +6,8 @@ "format": "ipv6" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "::1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "12345::", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "::abef", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "::abcef", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "::laptop", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "::42:ff:1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "d6::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": ":2:3:4:5:6:7:8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "1:2:3:4:5:6:7:", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": ":2:3:4::8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "1:d6::42", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "1::d6::42", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "1::d6:192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "1:2::192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "1::2:192.168.256.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "1::2:192.168.ff.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "::ffff:192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +240,8 @@ "data": "1:2:3:4:5:::8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +249,8 @@ "data": "1:2:3:4:5:6:7:8", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +258,8 @@ "data": "1:2:3:4:5:6:7", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +267,8 @@ "data": "1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -246,7 +276,8 @@ "data": "127.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -254,7 +285,8 @@ "data": "1:2:3:4:1.2.3", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +294,8 @@ "data": " ::1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -270,7 +303,8 @@ "data": "::1 ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -278,7 +312,8 @@ "data": "fe80::/64", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -286,7 +321,8 @@ "data": "fe80::a%eth1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +330,8 @@ "data": "1000:1000:1000:1000:1000:1000:255.255.255.255", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +339,8 @@ "data": "100:100:100:100:100:100:255.255.255.255.255", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -310,7 +348,8 @@ "data": "100:100:100:100:100:100:100:255.255.255.255", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +357,8 @@ "data": "1:2:3:4:5:6:7:৪", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -326,7 +366,8 @@ "data": "1:2::192.16৪.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/iri-reference.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/iri-reference.json index ba12fd82f10..6ee512f0d59 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/iri-reference.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/iri-reference.json @@ -6,7 +6,8 @@ "format": "iri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "//ƒøø.ßår/?∂éœ=πîx#πîüx", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "/âππ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "\\\\WINDOWS\\filëßåré", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "âππ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "#ƒrägmênt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "#ƒräg\\mênt", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/iri.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/iri.json index 2309971c8a9..cce02436069 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/iri.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/iri.json @@ -6,7 +6,8 @@ "format": "iri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "http://ƒøø.com/blah_(wîkïpédiå)_blah#ßité-1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "http://ƒøø.ßår/?q=Test%20URL-encoded%20stuff", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "http://-.~_!$\u0026'()*+,;=:%40:80%2f::::::@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "http://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "http://2001:0db8:85a3:0000:0000:8a2e:0370:7334", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "/abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "\\\\WINDOWS\\filëßåré", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "âππ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/json-pointer.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/json-pointer.json index fe5f757e35c..60638cf4a41 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/json-pointer.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/json-pointer.json @@ -6,7 +6,8 @@ "format": "json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "/foo/bar~0/baz~1/%a", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "/foo/bar~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "/foo//bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "/foo/bar/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "/foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "/foo/0", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "/a~1b", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "/c%d", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "/e^f", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "/g|h", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "/i\\j", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "/k\"l", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "/ ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "/m~0n", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "/foo/-", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "/foo/-/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "/~1~0~0~1~1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +240,8 @@ "data": "/~1.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +249,8 @@ "data": "/~0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +258,8 @@ "data": "#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +267,8 @@ "data": "#/", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -246,7 +276,8 @@ "data": "#a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -254,7 +285,8 @@ "data": "/~0~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +294,8 @@ "data": "/~0/~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -270,7 +303,8 @@ "data": "/~2", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -278,7 +312,8 @@ "data": "/~-1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -286,7 +321,8 @@ "data": "/~~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +330,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +339,8 @@ "data": "0", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -310,7 +348,8 @@ "data": "a/a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/regex.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/regex.json index 5b50322c13c..858ed77bb85 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/regex.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/regex.json @@ -6,7 +6,8 @@ "format": "regex" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "([abc])+\\s+$", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "^(abc]", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/relative-json-pointer.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/relative-json-pointer.json index af7e16b2ce5..ef6d03e8c13 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/relative-json-pointer.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/relative-json-pointer.json @@ -6,7 +6,8 @@ "format": "relative-json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "0/foo/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "2/0/baz/1/zip", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "0#", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "/foo/bar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "-1/foo/bar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "+1/foo/bar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "0##", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "01/a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "01#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "120/foo/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/time.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/time.json index 8551bd44c16..db3feff707e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/time.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/time.json @@ -6,7 +6,8 @@ "format": "time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "08:30:06Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "008:030:006Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "8:3:6Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "8:0030:6Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "23:59:60Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "23:59:60+00:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "22:59:60+00:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "23:58:60+00:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "01:29:60+01:30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "23:29:60+23:30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "23:59:60+01:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "23:59:60+00:30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "15:59:60-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "00:29:60-23:30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "23:59:60-01:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "23:59:60-00:30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": "23:20:50.52Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +240,8 @@ "data": "08:30:06.283185Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +249,8 @@ "data": "08:30:06+00:20", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +258,8 @@ "data": "08:30:06-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +267,8 @@ "data": "08:30:06-8:000", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -246,7 +276,8 @@ "data": "08:30:06z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -254,7 +285,8 @@ "data": "24:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -262,7 +294,8 @@ "data": "00:60:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -270,7 +303,8 @@ "data": "00:00:61Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -278,7 +312,8 @@ "data": "22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -286,7 +321,8 @@ "data": "23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +330,8 @@ "data": "01:02:03+24:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +339,8 @@ "data": "01:02:03+00:60", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -310,7 +348,8 @@ "data": "01:02:03Z+00:30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +357,8 @@ "data": "08:30:06 PST", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -326,7 +366,8 @@ "data": "01:01:01,1111", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -334,7 +375,8 @@ "data": "12:00:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -342,7 +384,8 @@ "data": "12:00:00.52", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -350,7 +393,8 @@ "data": "1২:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -358,7 +402,8 @@ "data": "08:30:06#00:20", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -366,7 +411,8 @@ "data": "ab:cd:ef", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/unknown.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/unknown.json index 98b51d770c8..9e43086eef1 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/unknown.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/unknown.json @@ -6,7 +6,8 @@ "format": "unknown" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri-reference.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri-reference.json index c93e22918e7..d18261067c9 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri-reference.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri-reference.json @@ -6,7 +6,8 @@ "format": "uri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "http://foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "/abc", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "\\\\WINDOWS\\fileshare", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "abc", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "#fragment", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "#frag\\ment", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri-template.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri-template.json index a1123426c53..16a1564ae64 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri-template.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri-template.json @@ -6,7 +6,8 @@ "format": "uri-template" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "http://example.com/dictionary/{term:1}/{term}", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "http://example.com/dictionary/{term:1}/{term", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "http://example.com/dictionary", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "dictionary/{term:1}/{term}", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri.json index 7eb5793ed8d..17666d6e731 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uri.json @@ -6,7 +6,8 @@ "format": "uri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "http://foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "http://foo.com/blah_(wikipedia)_blah#cite-1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "http://xn--nw2a.xn--j6w193g/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "http://-.~_!$\u0026'()*+,;=:%40:80%2f::::::@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "http://223.255.255.254", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "http://www.ietf.org/rfc/rfc2396.txt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "ldap://[2001:db8::7]/c=GB?objectClass?one", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "mailto:John.Doe@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "news:comp.infosystems.www.servers.unix", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "tel:+1-816-555-1212", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "/abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -182,7 +204,8 @@ "data": "\\\\WINDOWS\\fileshare", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -190,7 +213,8 @@ "data": "abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +222,8 @@ "data": "http:// shouldfail.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +231,8 @@ "data": ":// should fail", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +240,8 @@ "data": "bar,baz:foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uuid.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uuid.json index fd2cad296af..79037d57eed 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uuid.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/format/uuid.json @@ -6,7 +6,8 @@ "format": "uuid" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +33,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +42,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -46,7 +51,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +60,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -62,7 +69,8 @@ "data": "2EB8AA08-AA98-11EA-B4AA-73B441D16380", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +78,8 @@ "data": "2eb8aa08-aa98-11ea-b4aa-73b441d16380", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +87,8 @@ "data": "2eb8aa08-AA98-11ea-B4Aa-73B441D16380", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +96,8 @@ "data": "00000000-0000-0000-0000-000000000000", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "2eb8aa08-aa98-11ea-b4aa-73b441d1638", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -102,7 +114,8 @@ "data": "2eb8aa08-aa98-11ea-73b441d16380", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "2eb8aa08-aa98-11ea-b4ga-73b441d16380", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "2eb8aa08aa9811eab4aa73b441d16380", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "2eb8aa08aa98-11ea-b4aa73b441d16380", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "2eb8-aa08-aa98-11ea-b4aa73b44-1d16380", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -142,7 +159,8 @@ "data": "2eb8aa08aa9811eab4aa73b441d16380----", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -150,7 +168,8 @@ "data": "98d80576-482e-427f-8434-7f86890ab222", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -158,7 +177,8 @@ "data": "99c17cbb-656f-564a-940f-1a4568f03487", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +186,8 @@ "data": "99c17cbb-656f-664a-940f-1a4568f03487", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -174,7 +195,8 @@ "data": "99c17cbb-656f-f64a-940f-1a4568f03487", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/id.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/id.json index a6bc3356f9e..c3b45d9ecb9 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/id.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/id.json @@ -34,7 +34,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n" }, "tests": [ { @@ -45,7 +46,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +55,8 @@ "data": "a string to match #/$defs/id_in_enum", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +64,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/refOfUnknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/refOfUnknownKeyword.json index efdd79b0eb8..349f82dac92 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/refOfUnknownKeyword.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/refOfUnknownKeyword.json @@ -13,7 +13,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unknown-keyword\"" + "v2": "extract error: unsupported constraint \"unknown-keyword\"", + "v3": "extract error: unsupported constraint \"unknown-keyword\"" }, "tests": [ { @@ -23,7 +24,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -33,7 +35,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -54,7 +57,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unknown-keyword\"" + "v2": "extract error: unsupported constraint \"unknown-keyword\"", + "v3": "extract error: unsupported constraint \"unknown-keyword\"" }, "tests": [ { @@ -64,7 +68,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -74,7 +79,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -92,7 +98,8 @@ "$ref": "#/examples/0" }, "skip": { - "v2": "extract error: reference to non-existing value \"examples\"" + "v2": "extract error: reference to non-existing value \"examples\"", + "v3": "extract error: reference to non-existing value \"examples\"" }, "tests": [ { @@ -100,7 +107,8 @@ "data": "a string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -108,7 +116,8 @@ "data": 42, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/unknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/unknownKeyword.json index 346913aec7b..3b205a67f33 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/unknownKeyword.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/unknownKeyword.json @@ -43,7 +43,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"not\" (and 1 more errors)" }, "tests": [ { @@ -51,7 +52,8 @@ "data": "a string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +61,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -67,7 +70,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/prefixItems.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/prefixItems.json index 7c1b645b00d..14228dba3f0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/prefixItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/prefixItems.json @@ -13,7 +13,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\"" + "v2": "extract error: unsupported constraint \"prefixItems\"", + "v3": "extract error: unsupported constraint \"prefixItems\"" }, "tests": [ { @@ -24,7 +25,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -35,7 +37,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +48,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -57,7 +61,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -65,7 +70,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +83,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -92,7 +99,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\"" + "v2": "extract error: unsupported constraint \"prefixItems\"", + "v3": "extract error: unsupported constraint \"prefixItems\"" }, "tests": [ { @@ -102,7 +110,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -113,7 +122,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -121,7 +131,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -137,7 +148,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\"" + "v2": "extract error: unsupported constraint \"prefixItems\"", + "v3": "extract error: unsupported constraint \"prefixItems\"" }, "tests": [ { @@ -149,7 +161,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -165,7 +178,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\"" + "v2": "extract error: unsupported constraint \"prefixItems\"", + "v3": "extract error: unsupported constraint \"prefixItems\"" }, "tests": [ { @@ -175,7 +189,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/properties.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/properties.json index 7c0d84497c3..5fcb6f0c03e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/properties.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/properties.json @@ -108,7 +108,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/propertyNames.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/propertyNames.json index b86b7b1d59d..0641b6134b5 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/propertyNames.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/propertyNames.json @@ -8,7 +8,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n" + "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n", + "v3": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:5:3\n" }, "tests": [ { @@ -19,7 +20,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -30,7 +32,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -38,7 +41,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -51,7 +55,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +64,8 @@ "data": "foobar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -67,7 +73,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -105,12 +112,18 @@ "data": { "foo": 1 }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "empty object is valid", "data": {}, - "valid": true + "valid": true, + "skip": { + "v3": "conflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" + } } ] } diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/ref.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/ref.json index 085eb8215af..8c8054da623 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/ref.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/ref.json @@ -34,7 +34,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -46,7 +47,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -65,7 +67,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n" + "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n", + "v3": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n" }, "tests": [ { @@ -75,7 +78,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +89,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -104,7 +109,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\"" + "v2": "extract error: unsupported constraint \"prefixItems\"", + "v3": "extract error: unsupported constraint \"prefixItems\"" }, "tests": [ { @@ -115,7 +121,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +133,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -164,21 +172,30 @@ "data": { "slash": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "tilde invalid", "data": { "tilde": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "percent invalid", "data": { "percent": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "slash valid", @@ -293,7 +310,8 @@ "$ref": "https://json-schema.org/draft/2020-12/schema" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2020-12/schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2020-12/schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"json-schema.org/draft/2020-12/schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -303,7 +321,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -313,7 +332,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -404,7 +424,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n" + "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n" }, "tests": [ { @@ -412,7 +433,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -459,7 +481,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/draft2020-12/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:9:14\n" + "v2": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/draft2020-12/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:9:14\n", + "v3": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/draft2020-12/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:9:14\n" }, "tests": [ { @@ -499,7 +522,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -539,7 +563,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -575,7 +600,10 @@ "data": { "foo\"bar": "1" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } } ] }, @@ -596,7 +624,8 @@ "$ref": "#/$defs/A" }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -606,7 +635,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -639,7 +669,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -674,7 +705,8 @@ "$ref": "schema-relative-uri-defs2.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -687,7 +719,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -700,7 +733,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -713,7 +747,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -741,7 +776,8 @@ "$ref": "schema-refs-absolute-uris-defs2.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -754,7 +790,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -767,7 +804,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -780,7 +818,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -810,7 +849,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -818,7 +858,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -826,7 +867,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -852,7 +894,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/draft2020-12/ref-and-id1/int.json:int\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/draft2020-12/ref-and-id1/int.json:int\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/draft2020-12/ref-and-id1/int.json:int\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -860,7 +903,8 @@ "data": 5, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -868,7 +912,8 @@ "data": 50, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -895,7 +940,8 @@ } }, "skip": { - "v2": "extract error: anchors (bigint) not supported (and 2 more errors)" + "v2": "extract error: anchors (bigint) not supported (and 2 more errors)", + "v3": "extract error: anchors (bigint) not supported (and 2 more errors)" }, "tests": [ { @@ -903,7 +949,8 @@ "data": 5, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -911,7 +958,8 @@ "data": 50, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1133,7 +1181,8 @@ } }, "skip": { - "v2": "extract error: anchors (something) not supported (and 1 more errors)" + "v2": "extract error: anchors (something) not supported (and 1 more errors)", + "v3": "extract error: anchors (something) not supported (and 1 more errors)" }, "tests": [ { @@ -1143,7 +1192,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1153,7 +1203,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1187,7 +1238,10 @@ { "description": "a non-string is invalid", "data": 12, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } } ] }, @@ -1202,7 +1256,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\"" + "v2": "extract error: unsupported constraint \"if\"", + "v3": "extract error: unsupported constraint \"if\"" }, "tests": [ { @@ -1210,7 +1265,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1218,7 +1274,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1234,7 +1291,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"then\"" + "v2": "extract error: unsupported constraint \"then\"", + "v3": "extract error: unsupported constraint \"then\"" }, "tests": [ { @@ -1242,7 +1300,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1250,7 +1309,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1266,7 +1326,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"else\"" + "v2": "extract error: unsupported constraint \"else\"", + "v3": "extract error: unsupported constraint \"else\"" }, "tests": [ { @@ -1274,7 +1335,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1282,7 +1344,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1305,7 +1368,8 @@ "$ref": "/absref/foobar.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -1313,7 +1377,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1321,7 +1386,8 @@ "data": 12, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1396,7 +1462,8 @@ ] }, "skip": { - "v2": "extract error: cannot refer to $defs section: must refer to one of its elements" + "v2": "extract error: cannot refer to $defs section: must refer to one of its elements", + "v3": "extract error: cannot refer to $defs section: must refer to one of its elements" }, "tests": [ { @@ -1404,7 +1471,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1412,7 +1480,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/refRemote.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/refRemote.json index 8c88288304d..a5da1d6a83e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/refRemote.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/refRemote.json @@ -6,7 +6,8 @@ "$ref": "http://localhost:1234/draft2020-12/integer.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/integer.json:integer\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/integer.json:integer\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/integer.json:integer\":\n generated.cue:1:8\n" }, "tests": [ { @@ -14,7 +15,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -22,7 +24,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -34,7 +37,8 @@ "$ref": "http://localhost:1234/draft2020-12/subSchemas.json#/$defs/integer" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/subSchemas.json:subSchemas\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" }, "tests": [ { @@ -42,7 +46,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -50,7 +55,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -62,7 +68,8 @@ "$ref": "http://localhost:1234/draft2020-12/locationIndependentIdentifier.json#foo" }, "skip": { - "v2": "extract error: anchors (foo) not supported" + "v2": "extract error: anchors (foo) not supported", + "v3": "extract error: anchors (foo) not supported" }, "tests": [ { @@ -70,7 +77,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +86,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -90,7 +99,8 @@ "$ref": "http://localhost:1234/draft2020-12/subSchemas.json#/$defs/refToInteger" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/subSchemas.json:subSchemas\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" }, "tests": [ { @@ -98,7 +108,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -106,7 +117,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -124,7 +136,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -136,7 +149,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -148,7 +162,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -175,7 +190,8 @@ } }, "skip": { - "v2": "extract error: cannot determine package name from import path \"localhost:1234/draft2020-12/baseUriChangeFolder/\"" + "v2": "extract error: cannot determine package name from import path \"localhost:1234/draft2020-12/baseUriChangeFolder/\"", + "v3": "extract error: cannot determine package name from import path \"localhost:1234/draft2020-12/baseUriChangeFolder/\"" }, "tests": [ { @@ -187,7 +203,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -199,7 +216,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -230,7 +248,8 @@ } }, "skip": { - "v2": "extract error: cannot determine package name from import path \"localhost:1234/draft2020-12/baseUriChangeFolderInSubschema/\"" + "v2": "extract error: cannot determine package name from import path \"localhost:1234/draft2020-12/baseUriChangeFolderInSubschema/\"", + "v3": "extract error: cannot determine package name from import path \"localhost:1234/draft2020-12/baseUriChangeFolderInSubschema/\"" }, "tests": [ { @@ -242,7 +261,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -254,7 +274,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -272,7 +293,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/name-defs.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/name-defs.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/name-defs.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -282,7 +304,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -292,7 +315,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -304,7 +328,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -317,7 +342,8 @@ "$ref": "ref-and-defs.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/ref-and-defs.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/ref-and-defs.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/ref-and-defs.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -327,7 +353,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -337,7 +364,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -349,7 +377,8 @@ "$ref": "http://localhost:1234/draft2020-12/locationIndependentIdentifier.json#/$defs/refToInteger" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/locationIndependentIdentifier.json:locationIndependentIdentifier\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/locationIndependentIdentifier.json:locationIndependentIdentifier\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/locationIndependentIdentifier.json:locationIndependentIdentifier\":\n generated.cue:1:8\n" }, "tests": [ { @@ -357,7 +386,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -365,7 +395,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -382,7 +413,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -394,7 +426,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -406,7 +439,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -418,7 +452,8 @@ "$ref": "http://localhost:1234/different-id-ref-string.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/different-id-ref-string.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/different-id-ref-string.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/different-id-ref-string.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -426,7 +461,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -434,7 +470,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -446,7 +483,8 @@ "$ref": "http://localhost:1234/urn-ref-string.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/urn-ref-string.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/urn-ref-string.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/urn-ref-string.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -454,7 +492,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -462,7 +501,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -474,7 +514,8 @@ "$ref": "http://localhost:1234/nested-absolute-ref-to-string.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested-absolute-ref-to-string.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested-absolute-ref-to-string.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested-absolute-ref-to-string.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -482,7 +523,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -490,7 +532,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -502,7 +545,8 @@ "$ref": "http://localhost:1234/draft2020-12/detached-ref.json#/$defs/foo" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/detached-ref.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/detached-ref.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/detached-ref.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -510,7 +554,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -518,7 +563,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/required.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/required.json index 789803d43e1..56cd0717cab 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/required.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/required.json @@ -26,7 +26,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -113,7 +114,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -145,7 +147,8 @@ "data": {}, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -155,7 +158,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -167,7 +171,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -179,7 +184,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/type.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/type.json index d6d9ad223c0..83e5d9dbd4e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/type.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/type.json @@ -16,7 +16,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/unevaluatedItems.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/unevaluatedItems.json index 8e455ffade2..a4595fe41ff 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/unevaluatedItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/unevaluatedItems.json @@ -6,7 +6,8 @@ "unevaluatedItems": true }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -14,7 +15,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -24,7 +26,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -36,7 +39,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -44,7 +48,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -54,7 +59,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -68,7 +74,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -76,7 +83,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -86,7 +94,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -96,7 +105,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -111,7 +121,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -122,7 +133,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -139,7 +151,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" }, "tests": [ { @@ -149,7 +162,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -160,7 +174,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -178,7 +193,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)" }, "tests": [ { @@ -189,7 +205,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -206,7 +223,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -220,7 +238,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -232,7 +251,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -259,7 +279,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)" }, "tests": [ { @@ -270,7 +291,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -282,7 +304,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -304,7 +327,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -315,7 +339,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -326,7 +351,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -337,7 +363,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -359,7 +386,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedItems\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedItems\" (and 2 more errors)" }, "tests": [ { @@ -369,7 +397,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -381,7 +410,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -405,7 +435,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedItems\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedItems\" (and 2 more errors)" }, "tests": [ { @@ -415,7 +446,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -427,7 +459,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -463,7 +496,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 3 more errors)" }, "tests": [ { @@ -474,7 +508,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -486,7 +521,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -498,7 +534,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -511,7 +548,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -546,7 +584,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 3 more errors)" }, "tests": [ { @@ -557,7 +596,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -569,7 +609,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -596,7 +637,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)" }, "tests": [ { @@ -607,7 +649,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -651,7 +694,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 4 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 4 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 4 more errors)" }, "tests": [ { @@ -663,7 +707,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -676,7 +721,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -689,7 +735,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -703,7 +750,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -718,7 +766,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -726,7 +775,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -736,7 +786,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -764,7 +815,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)" }, "tests": [ { @@ -775,7 +827,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -787,7 +840,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -815,7 +869,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedItems\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedItems\" (and 2 more errors)" }, "tests": [ { @@ -826,7 +881,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -838,7 +894,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -880,7 +937,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 5 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 5 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\" (and 5 more errors)" }, "tests": [ { @@ -891,7 +949,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -903,7 +962,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -924,7 +984,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" }, "tests": [ { @@ -934,7 +995,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -969,7 +1031,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 2 more errors)" }, "tests": [ { @@ -981,7 +1044,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -994,7 +1058,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1012,7 +1077,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" }, "tests": [ { @@ -1023,7 +1089,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1034,7 +1101,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1046,7 +1114,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1072,7 +1141,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -1086,7 +1156,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1100,7 +1171,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1131,7 +1203,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -1139,7 +1212,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1150,7 +1224,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1164,7 +1239,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1179,7 +1255,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1190,7 +1267,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1201,7 +1279,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1215,7 +1294,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1229,7 +1309,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1241,7 +1322,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -1249,7 +1331,8 @@ "data": true, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1257,7 +1340,8 @@ "data": 123, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1265,7 +1349,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1273,7 +1358,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1281,7 +1367,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1289,7 +1376,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1303,7 +1391,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedItems\"" + "v2": "extract error: unsupported constraint \"unevaluatedItems\"", + "v3": "extract error: unsupported constraint \"unevaluatedItems\"" }, "tests": [ { @@ -1313,7 +1402,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1332,7 +1422,8 @@ "unevaluatedItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -1342,7 +1433,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1352,7 +1444,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/unevaluatedProperties.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/unevaluatedProperties.json index d493dd9478c..0dbe4a1bd0d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/unevaluatedProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/unevaluatedProperties.json @@ -7,7 +7,8 @@ "unevaluatedProperties": true }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -15,7 +16,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -25,7 +27,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -41,7 +44,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -49,7 +53,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -59,7 +64,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +75,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -82,7 +89,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -90,7 +98,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -100,7 +109,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -118,7 +128,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -128,7 +139,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -139,7 +151,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -157,7 +170,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -167,7 +181,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -178,7 +193,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -197,7 +213,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -207,7 +224,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -218,7 +236,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -245,7 +264,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -256,7 +276,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -268,7 +289,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -295,7 +317,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -306,7 +329,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -318,7 +342,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -341,7 +366,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -351,7 +377,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -362,7 +389,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -388,7 +416,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -398,7 +427,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -409,7 +439,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -459,7 +490,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -470,7 +502,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -482,7 +515,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -494,7 +528,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -507,7 +542,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -547,7 +583,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -558,7 +595,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -570,7 +608,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -600,7 +639,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"not\" (and 1 more errors)" }, "tests": [ { @@ -611,7 +651,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -654,7 +695,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 3 more errors)" }, "tests": [ { @@ -665,7 +707,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -677,7 +720,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -687,7 +731,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -698,7 +743,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -731,7 +777,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -742,7 +789,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -754,7 +802,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -764,7 +813,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -775,7 +825,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -808,7 +859,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -819,7 +871,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -831,7 +884,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -841,7 +895,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -852,7 +907,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -882,7 +938,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)" }, "tests": [ { @@ -893,7 +950,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -903,7 +961,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -924,7 +983,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -934,7 +994,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -944,7 +1005,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -972,7 +1034,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -983,7 +1046,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -995,7 +1059,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1023,7 +1088,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1034,7 +1100,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1046,7 +1113,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1087,7 +1155,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 3 more errors)" + "v2": "extract error: unsupported constraint \"$dynamicAnchor\" (and 3 more errors)", + "v3": "extract error: unsupported constraint \"$dynamicAnchor\" (and 3 more errors)" }, "tests": [ { @@ -1098,7 +1167,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1110,7 +1180,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1131,7 +1202,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1141,7 +1213,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1162,7 +1235,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1172,7 +1246,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1195,7 +1270,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1205,7 +1281,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1216,7 +1293,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1239,7 +1317,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1249,7 +1328,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1260,7 +1340,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1283,7 +1364,8 @@ "unevaluatedProperties": true }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1293,7 +1375,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1304,7 +1387,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1327,7 +1411,8 @@ "unevaluatedProperties": true }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1337,7 +1422,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1348,7 +1434,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1373,7 +1460,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1383,7 +1471,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1394,7 +1483,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1419,7 +1509,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1429,7 +1520,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1440,7 +1532,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1477,7 +1570,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1489,7 +1583,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1502,7 +1597,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1529,7 +1625,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1540,7 +1637,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1550,7 +1648,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1560,7 +1659,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1587,7 +1687,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1598,7 +1699,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1608,7 +1710,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1618,7 +1721,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1636,7 +1740,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1644,7 +1749,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1654,7 +1760,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1665,7 +1772,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1677,7 +1785,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1690,7 +1799,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1704,7 +1814,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1719,7 +1830,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1771,7 +1883,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -1779,7 +1892,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1790,7 +1904,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1801,7 +1916,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1812,7 +1928,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1823,7 +1940,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1835,7 +1953,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1847,7 +1966,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1860,7 +1980,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1936,7 +2057,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\" (and 1 more errors)" }, "tests": [ { @@ -1944,7 +2066,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1954,7 +2077,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1964,7 +2088,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1974,7 +2099,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1984,7 +2110,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1995,7 +2122,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2006,7 +2134,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2017,7 +2146,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2028,7 +2158,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2039,7 +2170,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2050,7 +2182,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2060,7 +2193,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2071,7 +2205,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2082,7 +2217,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2093,7 +2229,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2104,7 +2241,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2115,7 +2253,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2126,7 +2265,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2136,7 +2276,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2147,7 +2288,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2158,7 +2300,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -2170,7 +2313,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -2178,7 +2322,8 @@ "data": true, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2186,7 +2331,8 @@ "data": 123, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2194,7 +2340,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2202,7 +2349,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2210,7 +2358,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2218,7 +2367,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -2232,7 +2382,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -2242,7 +2393,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -2259,7 +2411,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"unevaluatedProperties\"" + "v2": "extract error: unsupported constraint \"unevaluatedProperties\"", + "v3": "extract error: unsupported constraint \"unevaluatedProperties\"" }, "tests": [ { @@ -2269,7 +2422,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2279,7 +2433,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -2298,7 +2453,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -2308,7 +2464,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2318,7 +2475,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -2341,7 +2499,8 @@ "unevaluatedProperties": false }, "skip": { - "v2": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"dependentSchemas\" (and 1 more errors)" }, "tests": [ { @@ -2351,7 +2510,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2361,7 +2521,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -2372,7 +2533,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/uniqueItems.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/uniqueItems.json index 13b9f3b09a2..2ac81312935 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/uniqueItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/uniqueItems.json @@ -40,7 +40,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -115,7 +116,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -329,7 +331,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -373,7 +376,8 @@ "uniqueItems": true }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\"" + "v2": "extract error: unsupported constraint \"prefixItems\"", + "v3": "extract error: unsupported constraint \"prefixItems\"" }, "tests": [ { @@ -384,7 +388,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -395,7 +400,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -406,7 +412,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -417,7 +424,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -430,7 +438,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -443,7 +452,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -456,7 +466,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -469,7 +480,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -490,7 +502,8 @@ "items": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" }, "tests": [ { @@ -501,7 +514,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -512,7 +526,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -523,7 +538,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -534,7 +550,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -546,7 +563,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -747,7 +765,8 @@ "uniqueItems": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\"" + "v2": "extract error: unsupported constraint \"prefixItems\"", + "v3": "extract error: unsupported constraint \"prefixItems\"" }, "tests": [ { @@ -758,7 +777,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -769,7 +789,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -780,7 +801,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -791,7 +813,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -804,7 +827,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -817,7 +841,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -830,7 +855,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -843,7 +869,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -864,7 +891,8 @@ "items": false }, "skip": { - "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"prefixItems\" (and 1 more errors)" }, "tests": [ { @@ -875,7 +903,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -886,7 +915,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -897,7 +927,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -908,7 +939,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -920,7 +952,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/vocabulary.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/vocabulary.json index 6e8f15c4dc0..786178f3b71 100644 --- a/encoding/jsonschema/testdata/external/tests/draft2020-12/vocabulary.json +++ b/encoding/jsonschema/testdata/external/tests/draft2020-12/vocabulary.json @@ -12,7 +12,8 @@ } }, "skip": { - "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/metaschema-no-validation.json\": $schema URI not recognized" + "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/metaschema-no-validation.json\": $schema URI not recognized", + "v3": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/metaschema-no-validation.json\": $schema URI not recognized" }, "tests": [ { @@ -22,7 +23,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -32,7 +34,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -42,7 +45,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -54,7 +58,8 @@ "type": "number" }, "skip": { - "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/metaschema-optional-vocabulary.json\": $schema URI not recognized" + "v2": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/metaschema-optional-vocabulary.json\": $schema URI not recognized", + "v3": "extract error: invalid $schema URL \"http://localhost:1234/draft2020-12/metaschema-optional-vocabulary.json\": $schema URI not recognized" }, "tests": [ { @@ -62,7 +67,8 @@ "data": "foobar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -70,7 +76,8 @@ "data": 20, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/additionalItems.json b/encoding/jsonschema/testdata/external/tests/draft4/additionalItems.json index 3ec3db777a2..361d9685173 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/additionalItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/additionalItems.json @@ -68,7 +68,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (0 and 3):\n instance.json:1:1\n" } }, { @@ -78,7 +79,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n instance.json:1:1\n" } }, { @@ -89,7 +91,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 3):\n instance.json:1:1\n" } }, { @@ -158,7 +161,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n instance.json:1:1\n" } } ] @@ -188,7 +192,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/additionalProperties.json b/encoding/jsonschema/testdata/external/tests/draft4/additionalProperties.json index 886910bea6f..53bc63bacad 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/additionalProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/additionalProperties.json @@ -28,7 +28,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -83,7 +84,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/allOf.json b/encoding/jsonschema/testdata/external/tests/draft4/allOf.json index f35fae4e7a0..f82bbe413ad 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/allOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/allOf.json @@ -41,7 +41,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -51,7 +52,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -116,7 +118,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -127,7 +130,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -138,7 +142,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -148,7 +153,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/default.json b/encoding/jsonschema/testdata/external/tests/draft4/default.json index cf3e76db0f4..ab3c2cadff6 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/default.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/default.json @@ -77,7 +77,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/definitions.json b/encoding/jsonschema/testdata/external/tests/draft4/definitions.json index e61da850da6..82756cbb21c 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/definitions.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/definitions.json @@ -5,7 +5,8 @@ "$ref": "http://json-schema.org/draft-04/schema#" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-04/schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-04/schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-04/schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -19,7 +20,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -33,7 +35,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/dependencies.json b/encoding/jsonschema/testdata/external/tests/draft4/dependencies.json index b63baf74fa7..c10a84e8194 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/dependencies.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/dependencies.json @@ -36,7 +36,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -99,7 +100,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -110,7 +112,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -120,7 +123,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -165,7 +169,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -176,7 +181,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -187,7 +193,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -247,7 +254,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -258,7 +266,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -268,7 +277,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -278,7 +288,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -306,7 +317,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -324,7 +336,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/enum.json b/encoding/jsonschema/testdata/external/tests/draft4/enum.json index b4790fd1bf0..ea737c3320b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/enum.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/enum.json @@ -67,7 +67,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -157,7 +158,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -165,7 +167,8 @@ "data": {}, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -335,7 +338,8 @@ "data": 0.0, "valid": true, "skip": { - "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -371,7 +375,8 @@ ], "valid": true, "skip": { - "v2": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n" + "v2": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n", + "v3": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:2\n instance.json:1:2\n" } } ] @@ -399,7 +404,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -435,7 +441,8 @@ ], "valid": true, "skip": { - "v2": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n" + "v2": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n", + "v3": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:2\n instance.json:1:2\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/format.json b/encoding/jsonschema/testdata/external/tests/draft4/format.json index dd9bec90a44..11a12719537 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/format.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/format.json @@ -5,7 +5,8 @@ "format": "email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -64,7 +71,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -72,7 +80,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -80,7 +89,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -88,7 +98,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -96,7 +107,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -104,7 +116,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -112,7 +125,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -123,7 +137,8 @@ "format": "ipv6" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -131,7 +146,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -139,7 +155,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -147,7 +164,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -155,7 +173,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -163,7 +182,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -171,7 +191,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -182,7 +203,8 @@ "format": "hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -190,7 +212,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +221,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +230,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +239,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +248,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +257,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -241,7 +269,8 @@ "format": "date-time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -249,7 +278,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -257,7 +287,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -265,7 +296,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -273,7 +305,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -281,7 +314,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -289,7 +323,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -300,7 +335,8 @@ "format": "uri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -308,7 +344,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -316,7 +353,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -324,7 +362,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -332,7 +371,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -340,7 +380,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -348,7 +389,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/items.json b/encoding/jsonschema/testdata/external/tests/draft4/items.json index 6a619fa1b82..840e4bf1247 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/items.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/items.json @@ -77,7 +77,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } }, { @@ -89,7 +90,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 3):\n instance.json:1:1\n" } }, { @@ -97,7 +99,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (0 and 2):\n instance.json:1:1\n" } }, { @@ -303,7 +306,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -322,7 +326,8 @@ ], "valid": true, "skip": { - "v2": "incompatible list lengths (2 and 3)\n" + "v2": "incompatible list lengths (2 and 3)\n", + "v3": "incompatible list lengths (2 and 3):\n generated.cue:2:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/maximum.json b/encoding/jsonschema/testdata/external/tests/draft4/maximum.json index 6d41ba790fb..0079946edf8 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/maximum.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/maximum.json @@ -72,7 +72,8 @@ "data": 3.0, "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values 3.0 and [...] (mismatched types float and list):\n generated.cue:2:1\n generated.cue:2:31\n instance.json:1:1\nconflicting values 3.0 and bool (mismatched types float and bool):\n generated.cue:2:1\n generated.cue:2:8\n instance.json:1:1\nconflicting values 3.0 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 3.0 and string (mismatched types float and string):\n generated.cue:2:1\n generated.cue:2:22\n instance.json:1:1\nconflicting values 3.0 and {...} (mismatched types float and struct):\n generated.cue:2:1\n generated.cue:2:39\n instance.json:1:1\ninvalid value 3.0 (out of bound \u003c3.0):\n generated.cue:2:15\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values 3.0 and [...] (mismatched types float and list):\n generated.cue:2:1\n generated.cue:2:31\n instance.json:1:1\nconflicting values 3.0 and bool (mismatched types float and bool):\n generated.cue:2:1\n generated.cue:2:8\n instance.json:1:1\nconflicting values 3.0 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 3.0 and string (mismatched types float and string):\n generated.cue:2:1\n generated.cue:2:22\n instance.json:1:1\nconflicting values 3.0 and {...} (mismatched types float and struct):\n generated.cue:2:1\n generated.cue:2:39\n instance.json:1:1\ninvalid value 3.0 (out of bound \u003c3.0):\n generated.cue:2:15\n instance.json:1:1\n", + "v3": "conflicting values 3.0 and [...] (mismatched types float and list):\n generated.cue:2:31\n instance.json:1:1\nconflicting values 3.0 and bool (mismatched types float and bool):\n generated.cue:2:8\n instance.json:1:1\nconflicting values 3.0 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 3.0 and string (mismatched types float and string):\n generated.cue:2:22\n instance.json:1:1\nconflicting values 3.0 and {...} (mismatched types float and struct):\n generated.cue:2:39\n instance.json:1:1\ninvalid value 3.0 (out of bound \u003c3.0):\n generated.cue:2:15\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/minProperties.json b/encoding/jsonschema/testdata/external/tests/draft4/minProperties.json index 3d87aedd825..c74cab8f83d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/minProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/minProperties.json @@ -5,7 +5,8 @@ "minProperties": 1 }, "skip": { - "v2": "extract error: unsupported constraint \"minProperties\"" + "v2": "extract error: unsupported constraint \"minProperties\"", + "v3": "extract error: unsupported constraint \"minProperties\"" }, "tests": [ { @@ -16,7 +17,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -26,7 +28,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -34,7 +37,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -42,7 +46,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -50,7 +55,8 @@ "data": "", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -58,7 +64,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/minimum.json b/encoding/jsonschema/testdata/external/tests/draft4/minimum.json index a79db939d5a..1c19dd9d19c 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/minimum.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/minimum.json @@ -44,7 +44,8 @@ "data": 1.1, "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values 1.1 and [...] (mismatched types float and list):\n generated.cue:2:1\n generated.cue:2:31\n instance.json:1:1\nconflicting values 1.1 and bool (mismatched types float and bool):\n generated.cue:2:1\n generated.cue:2:8\n instance.json:1:1\nconflicting values 1.1 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 1.1 and string (mismatched types float and string):\n generated.cue:2:1\n generated.cue:2:22\n instance.json:1:1\nconflicting values 1.1 and {...} (mismatched types float and struct):\n generated.cue:2:1\n generated.cue:2:39\n instance.json:1:1\ninvalid value 1.1 (out of bound \u003e1.1):\n generated.cue:2:15\n instance.json:1:1\n" + "v2": "6 errors in empty disjunction:\nconflicting values 1.1 and [...] (mismatched types float and list):\n generated.cue:2:1\n generated.cue:2:31\n instance.json:1:1\nconflicting values 1.1 and bool (mismatched types float and bool):\n generated.cue:2:1\n generated.cue:2:8\n instance.json:1:1\nconflicting values 1.1 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 1.1 and string (mismatched types float and string):\n generated.cue:2:1\n generated.cue:2:22\n instance.json:1:1\nconflicting values 1.1 and {...} (mismatched types float and struct):\n generated.cue:2:1\n generated.cue:2:39\n instance.json:1:1\ninvalid value 1.1 (out of bound \u003e1.1):\n generated.cue:2:15\n instance.json:1:1\n", + "v3": "conflicting values 1.1 and [...] (mismatched types float and list):\n generated.cue:2:31\n instance.json:1:1\nconflicting values 1.1 and bool (mismatched types float and bool):\n generated.cue:2:8\n instance.json:1:1\nconflicting values 1.1 and null (mismatched types float and null):\n generated.cue:2:1\n instance.json:1:1\nconflicting values 1.1 and string (mismatched types float and string):\n generated.cue:2:22\n instance.json:1:1\nconflicting values 1.1 and {...} (mismatched types float and struct):\n generated.cue:2:39\n instance.json:1:1\ninvalid value 1.1 (out of bound \u003e1.1):\n generated.cue:2:15\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/not.json b/encoding/jsonschema/testdata/external/tests/draft4/not.json index 5c2b081de13..1d9fdbee579 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/not.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/not.json @@ -7,7 +7,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -15,7 +16,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -23,7 +25,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -39,7 +42,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -47,7 +51,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -55,7 +60,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -63,7 +69,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -81,7 +88,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -89,7 +97,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -99,7 +108,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +119,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -124,7 +135,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -135,7 +147,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -146,7 +159,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -157,7 +171,8 @@ "not": {} }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -165,7 +180,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +189,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +198,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +207,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +216,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -207,7 +227,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -215,7 +236,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -225,7 +247,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -233,7 +256,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -246,7 +270,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -254,7 +279,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/oneOf.json b/encoding/jsonschema/testdata/external/tests/draft4/oneOf.json index 4b46c1f0276..c126c70a05b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/oneOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/oneOf.json @@ -27,7 +27,8 @@ "data": 3, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -66,7 +67,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -120,7 +122,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -154,7 +157,8 @@ "data": 123, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -186,7 +190,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -214,7 +219,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -265,7 +271,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -275,7 +282,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/ecmascript-regex.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/ecmascript-regex.json index d6ed773e661..b563aff49df 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/optional/ecmascript-regex.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/optional/ecmascript-regex.json @@ -44,7 +44,8 @@ "pattern": "^\\cC$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" }, "tests": [ { @@ -52,7 +53,8 @@ "data": "\\cC", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -60,7 +62,8 @@ "data": "\u0003", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -72,7 +75,8 @@ "pattern": "^\\cc$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" }, "tests": [ { @@ -80,7 +84,8 @@ "data": "\\cc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -88,7 +93,8 @@ "data": "\u0003", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -201,7 +207,8 @@ "data": "\u000b", "valid": true, "skip": { - "v2": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -214,7 +221,8 @@ "data": " ", "valid": true, "skip": { - "v2": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -222,7 +230,8 @@ "data": "\ufeff", "valid": true, "skip": { - "v2": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -235,7 +244,8 @@ "data": "\u2029", "valid": true, "skip": { - "v2": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -243,7 +253,8 @@ "data": " ", "valid": true, "skip": { - "v2": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -280,7 +291,8 @@ "data": "\u000b", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -293,7 +305,8 @@ "data": " ", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -301,7 +314,8 @@ "data": "\ufeff", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -314,7 +328,8 @@ "data": "\u2029", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -322,7 +337,8 @@ "data": " ", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -343,7 +359,8 @@ "pattern": "\\p{Letter}cole" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`" }, "tests": [ { @@ -351,7 +368,8 @@ "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -359,7 +377,8 @@ "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -367,7 +386,8 @@ "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -375,7 +395,8 @@ "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -460,7 +481,8 @@ "pattern": "^\\p{digit}+$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`" }, "tests": [ { @@ -468,7 +490,8 @@ "data": "42", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -476,7 +499,8 @@ "data": "-%#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -484,7 +508,8 @@ "data": "৪২", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -504,7 +529,10 @@ "data": { "l'ecole": "pas de vraie vie" }, - "valid": true + "valid": true, + "skip": { + "v3": "invalid regexp: error parsing regexp: invalid character class range: `\\p{Letter}`:\n generated.cue:2:36\n" + } }, { "description": "literal unicode character in json string", @@ -527,7 +555,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -556,7 +585,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -566,7 +596,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -576,7 +607,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -598,7 +630,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -608,7 +641,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -644,7 +678,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -654,7 +689,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -674,7 +710,10 @@ "data": { "42": "life, the universe, and everything" }, - "valid": true + "valid": true, + "skip": { + "v3": "invalid regexp: error parsing regexp: invalid character class range: `\\p{digit}`:\n generated.cue:2:34\n" + } }, { "description": "ascii non-digits", @@ -683,7 +722,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/date-time.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/date-time.json index 09e03859f36..7a3439278e3 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/date-time.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/date-time.json @@ -5,7 +5,8 @@ "format": "date-time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "1963-06-19T08:30:06.283185Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "1963-06-19T08:30:06Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "1937-01-01T12:00:27.87+00:20", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "1990-12-31T15:59:50.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "1998-12-31T23:59:60Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "1998-12-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "1998-12-31T23:59:61Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "1998-12-31T23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "1998-12-31T22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "1990-02-31T15:59:59.123-08:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "1990-12-31T15:59:59-24:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "1963-06-19T08:30:06.28123+01:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "06/19/1963 08:30:06 PST", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "1963-06-19t08:30:06.283185z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "2013-350T01:01:01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "1963-6-19T08:30:06.283185Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "1963-06-1T08:30:06.283185Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "1963-06-1৪T00:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": "1963-06-11T0৪:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/email.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/email.json index e791b93a8a7..3126f798d81 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/email.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/email.json @@ -5,7 +5,8 @@ "format": "email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "joe.bloggs@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "te~st@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "~test@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "test~@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": ".test@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "test.@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "te.s.t@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "te..st@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/hostname.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/hostname.json index d982f483380..6cb65820ed8 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/hostname.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/hostname.json @@ -5,7 +5,8 @@ "format": "hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "www.example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "xn--4gbwdl.xn--wgbh1c", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "-a-host-name-that-starts-with--", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "not_a_valid_host_name", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "-hostname", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "hostname-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "_hostname", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "hostname_", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "host_name", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "hostname", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "host-name", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "h0stn4me", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "hostnam3", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/ipv4.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/ipv4.json index 4dce8dd0475..c86761d6230 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/ipv4.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/ipv4.json @@ -5,7 +5,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "127.0.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "256.256.256.256", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "127.0", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "0x7f000001", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "2130706433", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "087.10.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "87.10.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "1২7.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "192.168.1.0/24", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/ipv6.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/ipv6.json index 4e3387563b2..e182ce25c5d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/ipv6.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/ipv6.json @@ -5,7 +5,8 @@ "format": "ipv6" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "::1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "12345::", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "::abef", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "::abcef", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "::laptop", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "::42:ff:1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "d6::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": ":2:3:4:5:6:7:8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "1:2:3:4:5:6:7:", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": ":2:3:4::8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "1:d6::42", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "1::d6::42", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "1::d6:192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "1:2::192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "1::2:192.168.256.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "1::2:192.168.ff.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": "::ffff:192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -213,7 +239,8 @@ "data": "1:2:3:4:5:::8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -221,7 +248,8 @@ "data": "1:2:3:4:5:6:7:8", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -229,7 +257,8 @@ "data": "1:2:3:4:5:6:7", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -237,7 +266,8 @@ "data": "1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -245,7 +275,8 @@ "data": "127.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -253,7 +284,8 @@ "data": "1:2:3:4:1.2.3", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -261,7 +293,8 @@ "data": " ::1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -269,7 +302,8 @@ "data": "::1 ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -277,7 +311,8 @@ "data": "fe80::/64", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -285,7 +320,8 @@ "data": "fe80::a%eth1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -293,7 +329,8 @@ "data": "1000:1000:1000:1000:1000:1000:255.255.255.255", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -301,7 +338,8 @@ "data": "100:100:100:100:100:100:255.255.255.255.255", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -309,7 +347,8 @@ "data": "100:100:100:100:100:100:100:255.255.255.255", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -317,7 +356,8 @@ "data": "1:2:3:4:5:6:7:৪", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -325,7 +365,8 @@ "data": "1:2::192.16৪.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/unknown.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/unknown.json index 7efc1f15fdd..31243e23adc 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/unknown.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/unknown.json @@ -5,7 +5,8 @@ "format": "unknown" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/uri.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/uri.json index a687a994a24..317953f4d7e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/optional/format/uri.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/optional/format/uri.json @@ -5,7 +5,8 @@ "format": "uri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "http://foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "http://foo.com/blah_(wikipedia)_blah#cite-1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "http://xn--nw2a.xn--j6w193g/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "http://-.~_!$\u0026'()*+,;=:%40:80%2f::::::@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "http://223.255.255.254", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "http://www.ietf.org/rfc/rfc2396.txt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "ldap://[2001:db8::7]/c=GB?objectClass?one", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "mailto:John.Doe@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "news:comp.infosystems.www.servers.unix", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "tel:+1-816-555-1212", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "/abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "\\\\WINDOWS\\fileshare", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "http:// shouldfail.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": ":// should fail", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -213,7 +239,8 @@ "data": "bar,baz:foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/id.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/id.json index 4a2306f759a..0db77d32ce8 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/optional/id.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/optional/id.json @@ -33,7 +33,8 @@ ] }, "skip": { - "v2": "extract error: constraint \"const\" is not supported in JSON schema version http://json-schema.org/draft-04/schema#" + "v2": "extract error: constraint \"const\" is not supported in JSON schema version http://json-schema.org/draft-04/schema#", + "v3": "extract error: constraint \"const\" is not supported in JSON schema version http://json-schema.org/draft-04/schema#" }, "tests": [ { @@ -44,7 +45,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -52,7 +54,8 @@ "data": "a string to match #/definitions/id_in_enum", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -60,7 +63,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/properties.json b/encoding/jsonschema/testdata/external/tests/draft4/properties.json index e37cca24169..9f4104609f4 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/properties.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/properties.json @@ -106,7 +106,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/ref.json b/encoding/jsonschema/testdata/external/tests/draft4/ref.json index a3f30b6531e..0259ee17fba 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/ref.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/ref.json @@ -33,7 +33,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -45,7 +46,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -63,7 +65,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n" + "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n", + "v3": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n" }, "tests": [ { @@ -73,7 +76,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -83,7 +87,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -101,7 +106,8 @@ ] }, "skip": { - "v2": "extract error: referring to field \"items\" not yet supported" + "v2": "extract error: referring to field \"items\" not yet supported", + "v3": "extract error: referring to field \"items\" not yet supported" }, "tests": [ { @@ -112,7 +118,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -123,7 +130,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -160,21 +168,30 @@ "data": { "slash": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "tilde invalid", "data": { "tilde": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "percent invalid", "data": { "percent": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "slash valid", @@ -275,7 +292,8 @@ }, "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [...] and {foo:[1,2,3]} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {foo:[1,2,3]} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {foo:[1,2,3]} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {foo:[1,2,3]} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {foo:[1,2,3]} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [...] and {foo:[1,2,3]} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {foo:[1,2,3]} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {foo:[1,2,3]} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {foo:[1,2,3]} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {foo:[1,2,3]} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\n", + "v3": "cannot combine regular field \"foo\" with [[1,2,3],[]]:\n generated.cue:1:1\n instance.json:1:1\ncannot combine regular field \"foo\" with null:\n generated.cue:3:1\ncannot combine regular field \"foo\" with {foo:[1,2,3],#reffed:[]}:\n generated.cue:1:1\n instance.json:1:1\nconflicting values [...] and {foo:[1,2,3]} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {foo:[1,2,3]} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {foo:[1,2,3]} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {foo:[1,2,3]} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {foo:[1,2,3]} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\nfoo: conflicting values [1,2,3] and bool (mismatched types list and bool):\n generated.cue:4:26\n instance.json:1:8\nfoo: conflicting values [1,2,3] and null (mismatched types list and null):\n generated.cue:4:19\n instance.json:1:8\nfoo: conflicting values [1,2,3] and number (mismatched types list and number):\n generated.cue:4:33\n instance.json:1:8\nfoo: conflicting values [1,2,3] and string (mismatched types list and string):\n generated.cue:4:42\n instance.json:1:8\nfoo: conflicting values [1,2,3] and {...} (mismatched types list and struct):\n generated.cue:4:70\n instance.json:1:8\nfoo: invalid value [1,2,3] (does not satisfy list.MaxItems(2)): len(list) \u003e MaxItems(2) (3 \u003e 2):\n generated.cue:4:51\n generated.cue:4:65\n instance.json:1:8\n" } }, { @@ -311,7 +329,8 @@ ] }, "skip": { - "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-04/schema# (and 1 more errors)" + "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-04/schema# (and 1 more errors)", + "v3": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-04/schema# (and 1 more errors)" }, "tests": [ { @@ -319,7 +338,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -327,7 +347,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -338,7 +359,8 @@ "$ref": "http://json-schema.org/draft-04/schema#" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-04/schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-04/schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-04/schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -348,7 +370,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -358,7 +381,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -461,7 +485,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:8:14\n" + "v2": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:8:14\n", + "v3": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:8:14\n" }, "tests": [ { @@ -501,7 +526,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -541,7 +567,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -576,7 +603,10 @@ "data": { "foo\"bar": "1" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } } ] }, @@ -596,7 +626,8 @@ } }, "skip": { - "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)" + "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)", + "v3": "extract error: $id URI may not contain a fragment (and 1 more errors)" }, "tests": [ { @@ -604,7 +635,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -612,7 +644,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -639,7 +672,8 @@ } }, "skip": { - "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)" + "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)", + "v3": "extract error: $id URI may not contain a fragment (and 1 more errors)" }, "tests": [ { @@ -647,7 +681,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -655,7 +690,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -713,7 +749,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -721,7 +758,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -729,7 +767,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -809,7 +848,8 @@ ] }, "skip": { - "v2": "extract error: cannot refer to definitions section: must refer to one of its elements" + "v2": "extract error: cannot refer to definitions section: must refer to one of its elements", + "v3": "extract error: cannot refer to definitions section: must refer to one of its elements" }, "tests": [ { @@ -817,7 +857,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -825,7 +866,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/refRemote.json b/encoding/jsonschema/testdata/external/tests/draft4/refRemote.json index f886a7368aa..9686e624909 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/refRemote.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/refRemote.json @@ -5,7 +5,8 @@ "$ref": "http://localhost:1234/integer.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/integer.json:integer\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/integer.json:integer\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/integer.json:integer\":\n generated.cue:1:8\n" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -32,7 +35,8 @@ "$ref": "http://localhost:1234/subSchemas.json#/definitions/integer" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" }, "tests": [ { @@ -40,7 +44,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -48,7 +53,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -59,7 +65,8 @@ "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" }, "tests": [ { @@ -67,7 +74,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -75,7 +83,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -92,7 +101,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -104,7 +114,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -116,7 +127,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -142,7 +154,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolder/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolder/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolder/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -154,7 +167,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +180,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -196,7 +211,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolderInSubschema/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolderInSubschema/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolderInSubschema/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -208,7 +224,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -220,7 +237,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -237,7 +255,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/name.json:name\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/name.json:name\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/name.json:name\":\n generated.cue:1:8\n" }, "tests": [ { @@ -247,7 +266,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -257,7 +277,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -269,7 +290,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -280,7 +302,8 @@ "$ref": "http://localhost:1234/locationIndependentIdentifierDraft4.json#/definitions/refToInteger" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/locationIndependentIdentifierDraft4.json:locationIndependentIdentifierDraft4\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/locationIndependentIdentifierDraft4.json:locationIndependentIdentifierDraft4\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/locationIndependentIdentifierDraft4.json:locationIndependentIdentifierDraft4\":\n generated.cue:1:8\n" }, "tests": [ { @@ -288,7 +311,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -296,7 +320,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft4/required.json b/encoding/jsonschema/testdata/external/tests/draft4/required.json index bea15a929db..1cf72692433 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/required.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/required.json @@ -25,7 +25,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -93,7 +94,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -124,7 +126,8 @@ "data": {}, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -134,7 +137,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -146,7 +150,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -158,7 +163,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft4/uniqueItems.json b/encoding/jsonschema/testdata/external/tests/draft4/uniqueItems.json index 41ece6051e1..e184cffa329 100644 --- a/encoding/jsonschema/testdata/external/tests/draft4/uniqueItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft4/uniqueItems.json @@ -39,7 +39,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -114,7 +115,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -328,7 +330,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -413,7 +416,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -426,7 +430,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -745,7 +750,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -758,7 +764,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -771,7 +778,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -784,7 +792,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/additionalItems.json b/encoding/jsonschema/testdata/external/tests/draft6/additionalItems.json index 0df77b12b34..3943c2ba5cb 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/additionalItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/additionalItems.json @@ -99,7 +99,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (0 and 3):\n instance.json:1:1\n" } }, { @@ -109,7 +110,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n instance.json:1:1\n" } }, { @@ -120,7 +122,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 3):\n instance.json:1:1\n" } }, { @@ -189,7 +192,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n instance.json:1:1\n" } } ] @@ -219,7 +223,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/additionalProperties.json b/encoding/jsonschema/testdata/external/tests/draft6/additionalProperties.json index 886910bea6f..53bc63bacad 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/additionalProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/additionalProperties.json @@ -28,7 +28,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -83,7 +84,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/allOf.json b/encoding/jsonschema/testdata/external/tests/draft6/allOf.json index 0d412850444..2f756b0a34e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/allOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/allOf.json @@ -41,7 +41,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -51,7 +52,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -116,7 +118,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -127,7 +130,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -138,7 +142,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -148,7 +153,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -208,7 +214,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -227,7 +234,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/anyOf.json b/encoding/jsonschema/testdata/external/tests/draft6/anyOf.json index cc264724712..30bef053b81 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/anyOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/anyOf.json @@ -106,7 +106,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: 2 errors in empty disjunction:\nexplicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n" + "v2": "extract error: cannot compile resulting schema: 2 errors in empty disjunction:\nexplicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n" }, "tests": [ { @@ -114,7 +115,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/boolean_schema.json b/encoding/jsonschema/testdata/external/tests/draft6/boolean_schema.json index 6b151b0d187..3dd9c3364fa 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/boolean_schema.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/boolean_schema.json @@ -58,7 +58,8 @@ "description": "boolean schema 'false'", "schema": false, "skip": { - "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n" + "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n" }, "tests": [ { @@ -66,7 +67,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -74,7 +76,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -82,7 +85,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -90,7 +94,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -98,7 +103,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -108,7 +114,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -116,7 +123,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +134,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +143,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/const.json b/encoding/jsonschema/testdata/external/tests/draft6/const.json index d17f8c59c28..04390e0e05f 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/const.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/const.json @@ -54,7 +54,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -313,7 +314,8 @@ "data": 0.0, "valid": true, "skip": { - "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -354,7 +356,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -370,7 +373,8 @@ "data": -2, "valid": true, "skip": { - "v2": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -416,7 +420,8 @@ "data": 9007199254740992.0, "valid": true, "skip": { - "v2": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/default.json b/encoding/jsonschema/testdata/external/tests/draft6/default.json index cf3e76db0f4..ab3c2cadff6 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/default.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/default.json @@ -77,7 +77,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/definitions.json b/encoding/jsonschema/testdata/external/tests/draft6/definitions.json index 296b3b3e237..b947d2b46df 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/definitions.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/definitions.json @@ -5,7 +5,8 @@ "$ref": "http://json-schema.org/draft-06/schema#" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-06/schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-06/schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-06/schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -19,7 +20,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -33,7 +35,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/dependencies.json b/encoding/jsonschema/testdata/external/tests/draft6/dependencies.json index b643913060a..7f1d8838894 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/dependencies.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/dependencies.json @@ -36,7 +36,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -126,7 +127,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -137,7 +139,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -147,7 +150,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -192,7 +196,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -203,7 +208,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -214,7 +220,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -242,7 +249,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -253,7 +261,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -318,7 +327,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -329,7 +339,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -339,7 +350,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -349,7 +361,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -377,7 +390,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -395,7 +409,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/enum.json b/encoding/jsonschema/testdata/external/tests/draft6/enum.json index b4790fd1bf0..ea737c3320b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/enum.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/enum.json @@ -67,7 +67,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -157,7 +158,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -165,7 +167,8 @@ "data": {}, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -335,7 +338,8 @@ "data": 0.0, "valid": true, "skip": { - "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -371,7 +375,8 @@ ], "valid": true, "skip": { - "v2": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n" + "v2": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n", + "v3": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:2\n instance.json:1:2\n" } } ] @@ -399,7 +404,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -435,7 +441,8 @@ ], "valid": true, "skip": { - "v2": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n" + "v2": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n", + "v3": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:2\n instance.json:1:2\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/format.json b/encoding/jsonschema/testdata/external/tests/draft6/format.json index 608c7665e9f..ce5cb5e0582 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/format.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/format.json @@ -5,7 +5,8 @@ "format": "email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -64,7 +71,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -72,7 +80,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -80,7 +89,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -88,7 +98,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -96,7 +107,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -104,7 +116,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -112,7 +125,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -123,7 +137,8 @@ "format": "ipv6" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -131,7 +146,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -139,7 +155,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -147,7 +164,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -155,7 +173,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -163,7 +182,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -171,7 +191,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -182,7 +203,8 @@ "format": "hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -190,7 +212,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +221,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +230,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +239,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +248,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +257,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -241,7 +269,8 @@ "format": "date-time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -249,7 +278,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -257,7 +287,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -265,7 +296,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -273,7 +305,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -281,7 +314,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -289,7 +323,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -300,7 +335,8 @@ "format": "json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -308,7 +344,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -316,7 +353,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -324,7 +362,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -332,7 +371,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -340,7 +380,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -348,7 +389,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -359,7 +401,8 @@ "format": "uri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -367,7 +410,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -375,7 +419,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -383,7 +428,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -391,7 +437,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -399,7 +446,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -407,7 +455,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -418,7 +467,8 @@ "format": "uri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -426,7 +476,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -434,7 +485,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -442,7 +494,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -450,7 +503,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -458,7 +512,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -466,7 +521,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -477,7 +533,8 @@ "format": "uri-template" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -485,7 +542,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -493,7 +551,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -501,7 +560,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -509,7 +569,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -517,7 +578,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -525,7 +587,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/items.json b/encoding/jsonschema/testdata/external/tests/draft6/items.json index 2da560dac25..7604aaa9b27 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/items.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/items.json @@ -77,7 +77,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } }, { @@ -89,7 +90,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 3):\n instance.json:1:1\n" } }, { @@ -97,7 +99,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (0 and 2):\n instance.json:1:1\n" } }, { @@ -117,7 +120,8 @@ "items": true }, "skip": { - "v2": "extract error: value of \"items\" must be an object or array" + "v2": "extract error: value of \"items\" must be an object or array", + "v3": "extract error: value of \"items\" must be an object or array" }, "tests": [ { @@ -129,7 +133,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -137,7 +142,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -148,7 +154,8 @@ "items": false }, "skip": { - "v2": "extract error: value of \"items\" must be an object or array" + "v2": "extract error: value of \"items\" must be an object or array", + "v3": "extract error: value of \"items\" must be an object or array" }, "tests": [ { @@ -160,7 +167,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -168,7 +176,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -189,7 +198,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:37\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } }, { @@ -205,7 +215,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:37\nincompatible list lengths (0 and 2):\n instance.json:1:1\n" } } ] @@ -402,7 +413,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -421,7 +433,8 @@ ], "valid": true, "skip": { - "v2": "incompatible list lengths (2 and 3)\n" + "v2": "incompatible list lengths (2 and 3)\n", + "v3": "incompatible list lengths (2 and 3):\n generated.cue:2:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/maxItems.json b/encoding/jsonschema/testdata/external/tests/draft6/maxItems.json index 68542167397..37f7889f85b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/maxItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/maxItems.json @@ -42,7 +42,8 @@ "maxItems": 2.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -52,7 +53,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -64,7 +66,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/maxLength.json b/encoding/jsonschema/testdata/external/tests/draft6/maxLength.json index 713503d30e9..3f9b9978123 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/maxLength.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/maxLength.json @@ -43,7 +43,8 @@ "data": "f", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:3:41\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:3:41\n", + "v3": "conflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:3:41\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/maxProperties.json b/encoding/jsonschema/testdata/external/tests/draft6/maxProperties.json index 92ff969c65c..261461ee6c0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/maxProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/maxProperties.json @@ -56,7 +56,8 @@ "maxProperties": 2.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -66,7 +67,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +80,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/minItems.json b/encoding/jsonschema/testdata/external/tests/draft6/minItems.json index df455ceec14..1e7bbed8936 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/minItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/minItems.json @@ -38,7 +38,8 @@ "minItems": 1.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -49,7 +50,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -57,7 +59,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/minLength.json b/encoding/jsonschema/testdata/external/tests/draft6/minLength.json index 161ca95893b..e9b59177848 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/minLength.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/minLength.json @@ -43,7 +43,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:3:41\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:3:41\n", + "v3": "conflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:3:41\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/minProperties.json b/encoding/jsonschema/testdata/external/tests/draft6/minProperties.json index 35c7e2b330c..6812a39410c 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/minProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/minProperties.json @@ -5,7 +5,8 @@ "minProperties": 1 }, "skip": { - "v2": "extract error: unsupported constraint \"minProperties\"" + "v2": "extract error: unsupported constraint \"minProperties\"", + "v3": "extract error: unsupported constraint \"minProperties\"" }, "tests": [ { @@ -16,7 +17,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -26,7 +28,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -34,7 +37,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -42,7 +46,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -50,7 +55,8 @@ "data": "", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -58,7 +64,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -69,7 +76,8 @@ "minProperties": 1.0 }, "skip": { - "v2": "extract error: unsupported constraint \"minProperties\"" + "v2": "extract error: unsupported constraint \"minProperties\"", + "v3": "extract error: unsupported constraint \"minProperties\"" }, "tests": [ { @@ -80,7 +88,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -88,7 +97,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/not.json b/encoding/jsonschema/testdata/external/tests/draft6/not.json index 62c0ae8c573..5ec504d1d8d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/not.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/not.json @@ -7,7 +7,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -15,7 +16,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -23,7 +25,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -39,7 +42,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -47,7 +51,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -55,7 +60,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -63,7 +69,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -81,7 +88,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -89,7 +97,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -99,7 +108,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +119,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -124,7 +135,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -135,7 +147,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -146,7 +159,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -157,7 +171,8 @@ "not": {} }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -165,7 +180,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +189,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +198,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +207,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +216,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -207,7 +227,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -215,7 +236,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -225,7 +247,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -233,7 +256,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -244,7 +268,8 @@ "not": true }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -252,7 +277,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -260,7 +286,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -268,7 +295,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -276,7 +304,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -284,7 +313,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +324,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +333,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -312,7 +344,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -320,7 +353,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -331,7 +365,8 @@ "not": false }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -339,7 +374,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -347,7 +383,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -355,7 +392,8 @@ "data": true, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -363,7 +401,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -371,7 +410,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -381,7 +421,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -389,7 +430,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -399,7 +441,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -407,7 +450,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -420,7 +464,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -428,7 +473,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/oneOf.json b/encoding/jsonschema/testdata/external/tests/draft6/oneOf.json index 808bcb75ad2..cd5e22cf057 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/oneOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/oneOf.json @@ -27,7 +27,8 @@ "data": 3, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -66,7 +67,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -86,7 +88,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -123,7 +126,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -143,7 +147,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -197,7 +202,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -231,7 +237,8 @@ "data": 123, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -263,7 +270,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -291,7 +299,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -342,7 +351,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -352,7 +362,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/ecmascript-regex.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/ecmascript-regex.json index 23b1178e7db..58a19c8b6b0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/ecmascript-regex.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/ecmascript-regex.json @@ -44,7 +44,8 @@ "pattern": "^\\cC$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" }, "tests": [ { @@ -52,7 +53,8 @@ "data": "\\cC", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -60,7 +62,8 @@ "data": "\u0003", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -72,7 +75,8 @@ "pattern": "^\\cc$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" }, "tests": [ { @@ -80,7 +84,8 @@ "data": "\\cc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -88,7 +93,8 @@ "data": "\u0003", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -201,7 +207,8 @@ "data": "\u000b", "valid": true, "skip": { - "v2": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -214,7 +221,8 @@ "data": " ", "valid": true, "skip": { - "v2": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -222,7 +230,8 @@ "data": "\ufeff", "valid": true, "skip": { - "v2": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -235,7 +244,8 @@ "data": "\u2029", "valid": true, "skip": { - "v2": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -243,7 +253,8 @@ "data": " ", "valid": true, "skip": { - "v2": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -280,7 +291,8 @@ "data": "\u000b", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -293,7 +305,8 @@ "data": " ", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -301,7 +314,8 @@ "data": "\ufeff", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -314,7 +328,8 @@ "data": "\u2029", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -322,7 +337,8 @@ "data": " ", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -343,7 +359,8 @@ "pattern": "\\p{Letter}cole" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`" }, "tests": [ { @@ -351,7 +368,8 @@ "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -359,7 +377,8 @@ "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -367,7 +386,8 @@ "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -375,7 +395,8 @@ "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -460,7 +481,8 @@ "pattern": "^\\p{digit}+$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`" }, "tests": [ { @@ -468,7 +490,8 @@ "data": "42", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -476,7 +499,8 @@ "data": "-%#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -484,7 +508,8 @@ "data": "৪২", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -504,7 +529,10 @@ "data": { "l'ecole": "pas de vraie vie" }, - "valid": true + "valid": true, + "skip": { + "v3": "invalid regexp: error parsing regexp: invalid character class range: `\\p{Letter}`:\n generated.cue:2:36\n" + } }, { "description": "literal unicode character in json string", @@ -527,7 +555,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -556,7 +585,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -566,7 +596,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -576,7 +607,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -598,7 +630,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -608,7 +641,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -644,7 +678,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -654,7 +689,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -674,7 +710,10 @@ "data": { "42": "life, the universe, and everything" }, - "valid": true + "valid": true, + "skip": { + "v3": "invalid regexp: error parsing regexp: invalid character class range: `\\p{digit}`:\n generated.cue:2:34\n" + } }, { "description": "ascii non-digits", @@ -683,7 +722,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/float-overflow.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/float-overflow.json index dc94bfd2c57..6d9da903fb5 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/float-overflow.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/float-overflow.json @@ -11,7 +11,8 @@ "data": 1E+308, "valid": true, "skip": { - "v2": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:3:1\n instance.json:1:1\n" + "v2": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:3:1\n instance.json:1:1\n", + "v3": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:3:1\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/date-time.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/date-time.json index 09e03859f36..7a3439278e3 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/date-time.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/date-time.json @@ -5,7 +5,8 @@ "format": "date-time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "1963-06-19T08:30:06.283185Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "1963-06-19T08:30:06Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "1937-01-01T12:00:27.87+00:20", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "1990-12-31T15:59:50.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "1998-12-31T23:59:60Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "1998-12-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "1998-12-31T23:59:61Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "1998-12-31T23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "1998-12-31T22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "1990-02-31T15:59:59.123-08:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "1990-12-31T15:59:59-24:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "1963-06-19T08:30:06.28123+01:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "06/19/1963 08:30:06 PST", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "1963-06-19t08:30:06.283185z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "2013-350T01:01:01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "1963-6-19T08:30:06.283185Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "1963-06-1T08:30:06.283185Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "1963-06-1৪T00:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": "1963-06-11T0৪:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/email.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/email.json index e791b93a8a7..3126f798d81 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/email.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/email.json @@ -5,7 +5,8 @@ "format": "email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "joe.bloggs@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "te~st@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "~test@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "test~@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": ".test@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "test.@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "te.s.t@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "te..st@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/hostname.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/hostname.json index d982f483380..6cb65820ed8 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/hostname.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/hostname.json @@ -5,7 +5,8 @@ "format": "hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "www.example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "xn--4gbwdl.xn--wgbh1c", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "-a-host-name-that-starts-with--", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "not_a_valid_host_name", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "-hostname", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "hostname-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "_hostname", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "hostname_", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "host_name", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "hostname", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "host-name", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "h0stn4me", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "hostnam3", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/ipv4.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/ipv4.json index 4dce8dd0475..c86761d6230 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/ipv4.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/ipv4.json @@ -5,7 +5,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "127.0.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "256.256.256.256", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "127.0", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "0x7f000001", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "2130706433", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "087.10.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "87.10.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "1২7.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "192.168.1.0/24", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/ipv6.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/ipv6.json index 4e3387563b2..e182ce25c5d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/ipv6.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/ipv6.json @@ -5,7 +5,8 @@ "format": "ipv6" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "::1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "12345::", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "::abef", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "::abcef", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "::laptop", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "::42:ff:1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "d6::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": ":2:3:4:5:6:7:8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "1:2:3:4:5:6:7:", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": ":2:3:4::8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "1:d6::42", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "1::d6::42", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "1::d6:192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "1:2::192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "1::2:192.168.256.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "1::2:192.168.ff.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": "::ffff:192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -213,7 +239,8 @@ "data": "1:2:3:4:5:::8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -221,7 +248,8 @@ "data": "1:2:3:4:5:6:7:8", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -229,7 +257,8 @@ "data": "1:2:3:4:5:6:7", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -237,7 +266,8 @@ "data": "1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -245,7 +275,8 @@ "data": "127.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -253,7 +284,8 @@ "data": "1:2:3:4:1.2.3", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -261,7 +293,8 @@ "data": " ::1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -269,7 +302,8 @@ "data": "::1 ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -277,7 +311,8 @@ "data": "fe80::/64", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -285,7 +320,8 @@ "data": "fe80::a%eth1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -293,7 +329,8 @@ "data": "1000:1000:1000:1000:1000:1000:255.255.255.255", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -301,7 +338,8 @@ "data": "100:100:100:100:100:100:255.255.255.255.255", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -309,7 +347,8 @@ "data": "100:100:100:100:100:100:100:255.255.255.255", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -317,7 +356,8 @@ "data": "1:2:3:4:5:6:7:৪", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -325,7 +365,8 @@ "data": "1:2::192.16৪.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/json-pointer.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/json-pointer.json index 8091767c1cb..6473b0ea8fc 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/json-pointer.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/json-pointer.json @@ -5,7 +5,8 @@ "format": "json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "/foo/bar~0/baz~1/%a", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "/foo/bar~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "/foo//bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "/foo/bar/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "/foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "/foo/0", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "/a~1b", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "/c%d", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "/e^f", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "/g|h", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "/i\\j", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "/k\"l", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "/ ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "/m~0n", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "/foo/-", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "/foo/-/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": "/~1~0~0~1~1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -213,7 +239,8 @@ "data": "/~1.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -221,7 +248,8 @@ "data": "/~0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -229,7 +257,8 @@ "data": "#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -237,7 +266,8 @@ "data": "#/", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -245,7 +275,8 @@ "data": "#a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -253,7 +284,8 @@ "data": "/~0~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -261,7 +293,8 @@ "data": "/~0/~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -269,7 +302,8 @@ "data": "/~2", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -277,7 +311,8 @@ "data": "/~-1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -285,7 +320,8 @@ "data": "/~~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -293,7 +329,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -301,7 +338,8 @@ "data": "0", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -309,7 +347,8 @@ "data": "a/a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/unknown.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/unknown.json index 7efc1f15fdd..31243e23adc 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/unknown.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/unknown.json @@ -5,7 +5,8 @@ "format": "unknown" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri-reference.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri-reference.json index 48e4a95c754..ed2c1384b9c 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri-reference.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri-reference.json @@ -5,7 +5,8 @@ "format": "uri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "http://foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "/abc", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "\\\\WINDOWS\\fileshare", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "abc", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "#fragment", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "#frag\\ment", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri-template.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri-template.json index 3ec13f98c73..9010266869a 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri-template.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri-template.json @@ -5,7 +5,8 @@ "format": "uri-template" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "http://example.com/dictionary/{term:1}/{term}", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "http://example.com/dictionary/{term:1}/{term", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "http://example.com/dictionary", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "dictionary/{term:1}/{term}", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri.json index a687a994a24..317953f4d7e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/format/uri.json @@ -5,7 +5,8 @@ "format": "uri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "http://foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "http://foo.com/blah_(wikipedia)_blah#cite-1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "http://xn--nw2a.xn--j6w193g/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "http://-.~_!$\u0026'()*+,;=:%40:80%2f::::::@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "http://223.255.255.254", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "http://www.ietf.org/rfc/rfc2396.txt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "ldap://[2001:db8::7]/c=GB?objectClass?one", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "mailto:John.Doe@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "news:comp.infosystems.www.servers.unix", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "tel:+1-816-555-1212", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "/abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "\\\\WINDOWS\\fileshare", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "http:// shouldfail.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": ":// should fail", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -213,7 +239,8 @@ "data": "bar,baz:foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/id.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/id.json index 2230107d6b1..26f6dac57c4 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/id.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/id.json @@ -33,7 +33,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n" }, "tests": [ { @@ -44,7 +45,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -52,7 +54,8 @@ "data": "a string to match #/definitions/id_in_enum", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -60,7 +63,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -94,7 +98,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -102,7 +107,8 @@ "data": "skip not_a_real_anchor", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +116,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -144,7 +151,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -152,7 +160,8 @@ "data": "skip not_a_real_id", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -160,7 +169,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/unknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/unknownKeyword.json index 095e398d4ce..509e4141700 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/optional/unknownKeyword.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/optional/unknownKeyword.json @@ -42,7 +42,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"not\" (and 1 more errors)" }, "tests": [ { @@ -50,7 +51,8 @@ "data": "a string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -58,7 +60,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -66,7 +69,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/properties.json b/encoding/jsonschema/testdata/external/tests/draft6/properties.json index a34885b6362..1f493c24357 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/properties.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/properties.json @@ -106,7 +106,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/propertyNames.json b/encoding/jsonschema/testdata/external/tests/draft6/propertyNames.json index 18c84592655..4cafe38f8b0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/propertyNames.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/propertyNames.json @@ -7,7 +7,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:4:3\n" + "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:4:3\n", + "v3": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:4:3\n" }, "tests": [ { @@ -18,7 +19,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +31,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +40,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -50,7 +54,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -58,7 +63,8 @@ "data": "foobar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -66,7 +72,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -95,7 +102,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -136,12 +144,18 @@ "data": { "foo": 1 }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "empty object is valid", "data": {}, - "valid": true + "valid": true, + "skip": { + "v3": "conflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" + } } ] } diff --git a/encoding/jsonschema/testdata/external/tests/draft6/ref.json b/encoding/jsonschema/testdata/external/tests/draft6/ref.json index 3188532f1a2..70202ddfbb9 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/ref.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/ref.json @@ -33,7 +33,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -45,7 +46,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -63,7 +65,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n" + "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n", + "v3": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n" }, "tests": [ { @@ -73,7 +76,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -83,7 +87,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -101,7 +106,8 @@ ] }, "skip": { - "v2": "extract error: referring to field \"items\" not yet supported" + "v2": "extract error: referring to field \"items\" not yet supported", + "v3": "extract error: referring to field \"items\" not yet supported" }, "tests": [ { @@ -112,7 +118,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -123,7 +130,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -160,21 +168,30 @@ "data": { "slash": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "tilde invalid", "data": { "tilde": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "percent invalid", "data": { "percent": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "slash valid", @@ -275,7 +292,8 @@ }, "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [...] and {foo:[1,2,3]} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {foo:[1,2,3]} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {foo:[1,2,3]} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {foo:[1,2,3]} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {foo:[1,2,3]} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [...] and {foo:[1,2,3]} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {foo:[1,2,3]} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {foo:[1,2,3]} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {foo:[1,2,3]} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {foo:[1,2,3]} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\n", + "v3": "cannot combine regular field \"foo\" with [[1,2,3],[]]:\n generated.cue:1:1\n instance.json:1:1\ncannot combine regular field \"foo\" with null:\n generated.cue:3:1\ncannot combine regular field \"foo\" with {foo:[1,2,3],#reffed:[]}:\n generated.cue:1:1\n instance.json:1:1\nconflicting values [...] and {foo:[1,2,3]} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {foo:[1,2,3]} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {foo:[1,2,3]} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {foo:[1,2,3]} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {foo:[1,2,3]} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\nfoo: conflicting values [1,2,3] and bool (mismatched types list and bool):\n generated.cue:4:26\n instance.json:1:8\nfoo: conflicting values [1,2,3] and null (mismatched types list and null):\n generated.cue:4:19\n instance.json:1:8\nfoo: conflicting values [1,2,3] and number (mismatched types list and number):\n generated.cue:4:33\n instance.json:1:8\nfoo: conflicting values [1,2,3] and string (mismatched types list and string):\n generated.cue:4:42\n instance.json:1:8\nfoo: conflicting values [1,2,3] and {...} (mismatched types list and struct):\n generated.cue:4:70\n instance.json:1:8\nfoo: invalid value [1,2,3] (does not satisfy list.MaxItems(2)): len(list) \u003e MaxItems(2) (3 \u003e 2):\n generated.cue:4:51\n generated.cue:4:65\n instance.json:1:8\n" } }, { @@ -311,7 +329,8 @@ ] }, "skip": { - "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema# (and 1 more errors)" + "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema# (and 1 more errors)", + "v3": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema# (and 1 more errors)" }, "tests": [ { @@ -319,7 +338,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -327,7 +347,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -338,7 +359,8 @@ "$ref": "http://json-schema.org/draft-06/schema#" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-06/schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-06/schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-06/schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -348,7 +370,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -358,7 +381,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -453,7 +477,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n" + "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n" }, "tests": [ { @@ -461,7 +486,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -507,7 +533,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:8:14\n" + "v2": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:8:14\n", + "v3": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:8:14\n" }, "tests": [ { @@ -547,7 +574,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -587,7 +615,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -622,7 +651,10 @@ "data": { "foo\"bar": "1" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } } ] }, @@ -642,7 +674,8 @@ } }, "skip": { - "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)" + "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)", + "v3": "extract error: $id URI may not contain a fragment (and 1 more errors)" }, "tests": [ { @@ -650,7 +683,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -658,7 +692,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -680,7 +715,8 @@ } }, "skip": { - "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)" + "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)", + "v3": "extract error: $id URI may not contain a fragment (and 1 more errors)" }, "tests": [ { @@ -688,7 +724,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -696,7 +733,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -723,7 +761,8 @@ } }, "skip": { - "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)" + "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)", + "v3": "extract error: $id URI may not contain a fragment (and 1 more errors)" }, "tests": [ { @@ -731,7 +770,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -739,7 +779,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -771,7 +812,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -813,7 +855,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -826,7 +869,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -839,7 +883,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -852,7 +897,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -887,7 +933,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -900,7 +947,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -913,7 +961,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -926,7 +975,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -944,7 +994,8 @@ } }, "skip": { - "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#" + "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#", + "v3": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#" }, "tests": [ { @@ -954,7 +1005,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -964,7 +1016,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -986,7 +1039,8 @@ } }, "skip": { - "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#" + "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#", + "v3": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#" }, "tests": [ { @@ -996,7 +1050,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1006,7 +1061,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1028,7 +1084,8 @@ } }, "skip": { - "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#" + "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#", + "v3": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#" }, "tests": [ { @@ -1038,7 +1095,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1048,7 +1106,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1070,7 +1129,8 @@ } }, "skip": { - "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#" + "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#", + "v3": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#" }, "tests": [ { @@ -1080,7 +1140,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1090,7 +1151,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1112,7 +1174,8 @@ } }, "skip": { - "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#" + "v2": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#", + "v3": "extract error: constraint \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#" }, "tests": [ { @@ -1122,7 +1185,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1132,7 +1196,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1186,7 +1251,8 @@ } }, "skip": { - "v2": "extract error: anchors (something) not supported (and 1 more errors)" + "v2": "extract error: anchors (something) not supported (and 1 more errors)", + "v3": "extract error: anchors (something) not supported (and 1 more errors)" }, "tests": [ { @@ -1196,7 +1262,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1206,7 +1273,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1232,7 +1300,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -1240,7 +1309,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1248,7 +1318,8 @@ "data": 12, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1328,7 +1399,8 @@ ] }, "skip": { - "v2": "extract error: cannot refer to definitions section: must refer to one of its elements" + "v2": "extract error: cannot refer to definitions section: must refer to one of its elements", + "v3": "extract error: cannot refer to definitions section: must refer to one of its elements" }, "tests": [ { @@ -1336,7 +1408,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1344,7 +1417,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/refRemote.json b/encoding/jsonschema/testdata/external/tests/draft6/refRemote.json index e5b95f674cb..c2c95f58a63 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/refRemote.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/refRemote.json @@ -5,7 +5,8 @@ "$ref": "http://localhost:1234/integer.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/integer.json:integer\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/integer.json:integer\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/integer.json:integer\":\n generated.cue:1:8\n" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -32,7 +35,8 @@ "$ref": "http://localhost:1234/subSchemas.json#/definitions/integer" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" }, "tests": [ { @@ -40,7 +44,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -48,7 +53,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -59,7 +65,8 @@ "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" }, "tests": [ { @@ -67,7 +74,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -75,7 +83,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -92,7 +101,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -104,7 +114,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -116,7 +127,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -142,7 +154,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolder/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolder/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolder/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -154,7 +167,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +180,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -196,7 +211,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolderInSubschema/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolderInSubschema/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolderInSubschema/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -208,7 +224,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -220,7 +237,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -237,7 +255,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/name.json:name\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/name.json:name\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/name.json:name\":\n generated.cue:1:8\n" }, "tests": [ { @@ -247,7 +266,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -257,7 +277,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -269,7 +290,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -285,7 +307,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/ref-and-definitions.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/ref-and-definitions.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/ref-and-definitions.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -295,7 +318,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -305,7 +329,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -316,7 +341,8 @@ "$ref": "http://localhost:1234/locationIndependentIdentifierPre2019.json#/definitions/refToInteger" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/locationIndependentIdentifierPre2019.json:locationIndependentIdentifierPre2019\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/locationIndependentIdentifierPre2019.json:locationIndependentIdentifierPre2019\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/locationIndependentIdentifierPre2019.json:locationIndependentIdentifierPre2019\":\n generated.cue:1:8\n" }, "tests": [ { @@ -324,7 +350,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -332,7 +359,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -348,7 +376,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -360,7 +389,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -372,7 +402,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -383,7 +414,8 @@ "$ref": "http://localhost:1234/draft6/detached-ref.json#/definitions/foo" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft6/detached-ref.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft6/detached-ref.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft6/detached-ref.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -391,7 +423,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -399,7 +432,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft6/required.json b/encoding/jsonschema/testdata/external/tests/draft6/required.json index 2fa196e6af9..b9311493cc6 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/required.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/required.json @@ -25,7 +25,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -109,7 +110,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -140,7 +142,8 @@ "data": {}, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -150,7 +153,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -162,7 +166,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -174,7 +179,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/type.json b/encoding/jsonschema/testdata/external/tests/draft6/type.json index 9399419c766..af59bc1f9ab 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/type.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/type.json @@ -15,7 +15,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft6/uniqueItems.json b/encoding/jsonschema/testdata/external/tests/draft6/uniqueItems.json index 41ece6051e1..e184cffa329 100644 --- a/encoding/jsonschema/testdata/external/tests/draft6/uniqueItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft6/uniqueItems.json @@ -39,7 +39,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -114,7 +115,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -328,7 +330,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -413,7 +416,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -426,7 +430,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -745,7 +750,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -758,7 +764,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -771,7 +778,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -784,7 +792,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/additionalItems.json b/encoding/jsonschema/testdata/external/tests/draft7/additionalItems.json index 0df77b12b34..3943c2ba5cb 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/additionalItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/additionalItems.json @@ -99,7 +99,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (0 and 3):\n instance.json:1:1\n" } }, { @@ -109,7 +110,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n instance.json:1:1\n" } }, { @@ -120,7 +122,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,2] and {...} (mismatched types list and struct):\n generated.cue:2:45\n instance.json:1:1\nconflicting values bool and [1,2] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,2] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,2] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,2] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 3):\n instance.json:1:1\n" } }, { @@ -189,7 +192,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,\"foo\",false] and {...} (mismatched types list and struct):\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,\"foo\",false] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",false] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",false] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",false] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 3):\n instance.json:1:1\n" } } ] @@ -219,7 +223,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,null] and {...} (mismatched types list and struct):\n generated.cue:2:41\n instance.json:1:1\nconflicting values bool and [1,null] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,null] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,null] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,null] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/additionalProperties.json b/encoding/jsonschema/testdata/external/tests/draft7/additionalProperties.json index 886910bea6f..53bc63bacad 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/additionalProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/additionalProperties.json @@ -28,7 +28,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -83,7 +84,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/allOf.json b/encoding/jsonschema/testdata/external/tests/draft7/allOf.json index 0d412850444..2f756b0a34e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/allOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/allOf.json @@ -41,7 +41,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -51,7 +52,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -116,7 +118,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -127,7 +130,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -138,7 +142,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -148,7 +153,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -208,7 +214,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -227,7 +234,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/anyOf.json b/encoding/jsonschema/testdata/external/tests/draft7/anyOf.json index cc264724712..30bef053b81 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/anyOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/anyOf.json @@ -106,7 +106,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: 2 errors in empty disjunction:\nexplicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n" + "v2": "extract error: cannot compile resulting schema: 2 errors in empty disjunction:\nexplicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:7\n" }, "tests": [ { @@ -114,7 +115,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/boolean_schema.json b/encoding/jsonschema/testdata/external/tests/draft7/boolean_schema.json index 6b151b0d187..3dd9c3364fa 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/boolean_schema.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/boolean_schema.json @@ -58,7 +58,8 @@ "description": "boolean schema 'false'", "schema": false, "skip": { - "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n" + "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:2:1\n" }, "tests": [ { @@ -66,7 +67,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -74,7 +76,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -82,7 +85,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -90,7 +94,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -98,7 +103,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -108,7 +114,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -116,7 +123,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +134,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +143,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/const.json b/encoding/jsonschema/testdata/external/tests/draft7/const.json index d17f8c59c28..04390e0e05f 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/const.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/const.json @@ -54,7 +54,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -313,7 +314,8 @@ "data": 0.0, "valid": true, "skip": { - "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -354,7 +356,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -370,7 +373,8 @@ "data": -2, "valid": true, "skip": { - "v2": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values -2 and -2.0 (mismatched types int and float):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -416,7 +420,8 @@ "data": 9007199254740992.0, "valid": true, "skip": { - "v2": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 9007199254740992.0 and 9007199254740992 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/contains.json b/encoding/jsonschema/testdata/external/tests/draft7/contains.json index 762c7da092c..401621361c6 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/contains.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/contains.json @@ -196,7 +196,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -206,7 +207,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +216,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/default.json b/encoding/jsonschema/testdata/external/tests/draft7/default.json index cf3e76db0f4..ab3c2cadff6 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/default.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/default.json @@ -77,7 +77,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/definitions.json b/encoding/jsonschema/testdata/external/tests/draft7/definitions.json index 973884f87a8..5e0cb4be9b5 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/definitions.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/definitions.json @@ -5,7 +5,8 @@ "$ref": "http://json-schema.org/draft-07/schema#" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-07/schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-07/schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-07/schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -19,7 +20,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -33,7 +35,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/dependencies.json b/encoding/jsonschema/testdata/external/tests/draft7/dependencies.json index b643913060a..7f1d8838894 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/dependencies.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/dependencies.json @@ -36,7 +36,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -126,7 +127,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -137,7 +139,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -147,7 +150,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -192,7 +196,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -203,7 +208,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -214,7 +220,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -242,7 +249,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -253,7 +261,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -318,7 +327,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -329,7 +339,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -339,7 +350,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -349,7 +361,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -377,7 +390,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -395,7 +409,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/enum.json b/encoding/jsonschema/testdata/external/tests/draft7/enum.json index b4790fd1bf0..ea737c3320b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/enum.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/enum.json @@ -67,7 +67,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -157,7 +158,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -165,7 +167,8 @@ "data": {}, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -335,7 +338,8 @@ "data": 0.0, "valid": true, "skip": { - "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -371,7 +375,8 @@ ], "valid": true, "skip": { - "v2": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n" + "v2": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n", + "v3": "0: conflicting values 0.0 and 0 (mismatched types float and int):\n generated.cue:2:2\n instance.json:1:2\n" } } ] @@ -399,7 +404,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } } ] @@ -435,7 +441,8 @@ ], "valid": true, "skip": { - "v2": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n" + "v2": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:1\n generated.cue:2:2\n instance.json:1:2\n", + "v3": "0: conflicting values 1.0 and 1 (mismatched types float and int):\n generated.cue:2:2\n instance.json:1:2\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/format.json b/encoding/jsonschema/testdata/external/tests/draft7/format.json index 2c073a88f63..c494bd410cd 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/format.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/format.json @@ -5,7 +5,8 @@ "format": "email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -64,7 +71,8 @@ "format": "idn-email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -72,7 +80,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -80,7 +89,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -88,7 +98,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -96,7 +107,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -104,7 +116,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -112,7 +125,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -123,7 +137,8 @@ "format": "regex" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -131,7 +146,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -139,7 +155,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -147,7 +164,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -155,7 +173,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -163,7 +182,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -171,7 +191,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -182,7 +203,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -190,7 +212,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -198,7 +221,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -206,7 +230,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -214,7 +239,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -222,7 +248,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -230,7 +257,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -241,7 +269,8 @@ "format": "ipv6" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -249,7 +278,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -257,7 +287,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -265,7 +296,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -273,7 +305,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -281,7 +314,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -289,7 +323,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -300,7 +335,8 @@ "format": "idn-hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -308,7 +344,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -316,7 +353,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -324,7 +362,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -332,7 +371,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -340,7 +380,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -348,7 +389,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -359,7 +401,8 @@ "format": "hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -367,7 +410,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -375,7 +419,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -383,7 +428,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -391,7 +437,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -399,7 +446,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -407,7 +455,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -418,7 +467,8 @@ "format": "date" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -426,7 +476,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -434,7 +485,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -442,7 +494,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -450,7 +503,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -458,7 +512,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -466,7 +521,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -477,7 +533,8 @@ "format": "date-time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -485,7 +542,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -493,7 +551,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -501,7 +560,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -509,7 +569,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -517,7 +578,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -525,7 +587,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -536,7 +599,8 @@ "format": "time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -544,7 +608,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -552,7 +617,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -560,7 +626,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -568,7 +635,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -576,7 +644,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -584,7 +653,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -595,7 +665,8 @@ "format": "json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -603,7 +674,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -611,7 +683,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -619,7 +692,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -627,7 +701,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -635,7 +710,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -643,7 +719,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -654,7 +731,8 @@ "format": "relative-json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -662,7 +740,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -670,7 +749,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -678,7 +758,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -686,7 +767,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -694,7 +776,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -702,7 +785,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -713,7 +797,8 @@ "format": "iri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -721,7 +806,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -729,7 +815,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -737,7 +824,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -745,7 +833,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -753,7 +842,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -761,7 +851,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -772,7 +863,8 @@ "format": "iri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -780,7 +872,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -788,7 +881,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -796,7 +890,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -804,7 +899,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -812,7 +908,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -820,7 +917,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -831,7 +929,8 @@ "format": "uri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -839,7 +938,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -847,7 +947,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -855,7 +956,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -863,7 +965,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -871,7 +974,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -879,7 +983,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -890,7 +995,8 @@ "format": "uri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -898,7 +1004,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -906,7 +1013,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -914,7 +1022,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -922,7 +1031,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -930,7 +1040,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -938,7 +1049,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -949,7 +1061,8 @@ "format": "uri-template" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -957,7 +1070,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -965,7 +1079,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -973,7 +1088,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -981,7 +1097,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -989,7 +1106,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -997,7 +1115,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/if-then-else.json b/encoding/jsonschema/testdata/external/tests/draft7/if-then-else.json index 054c15f2952..3b5819ffa01 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/if-then-else.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/if-then-else.json @@ -7,7 +7,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\"" + "v2": "extract error: unsupported constraint \"if\"", + "v3": "extract error: unsupported constraint \"if\"" }, "tests": [ { @@ -15,7 +16,8 @@ "data": 0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -23,7 +25,8 @@ "data": "hello", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -36,7 +39,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"then\"" + "v2": "extract error: unsupported constraint \"then\"", + "v3": "extract error: unsupported constraint \"then\"" }, "tests": [ { @@ -44,7 +48,8 @@ "data": 0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -52,7 +57,8 @@ "data": "hello", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -65,7 +71,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"else\"" + "v2": "extract error: unsupported constraint \"else\"", + "v3": "extract error: unsupported constraint \"else\"" }, "tests": [ { @@ -73,7 +80,8 @@ "data": 0, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -81,7 +89,8 @@ "data": "hello", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -97,7 +106,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -105,7 +115,8 @@ "data": -1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -113,7 +124,8 @@ "data": -100, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -121,7 +133,8 @@ "data": 3, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -137,7 +150,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 1 more errors)" }, "tests": [ { @@ -145,7 +159,8 @@ "data": -1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -153,7 +168,8 @@ "data": 4, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -161,7 +177,8 @@ "data": 3, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -180,7 +197,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -188,7 +206,8 @@ "data": -1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -196,7 +215,8 @@ "data": -100, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -204,7 +224,8 @@ "data": 4, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -212,7 +233,8 @@ "data": 3, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -239,7 +261,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -247,7 +270,8 @@ "data": -100, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -255,7 +279,8 @@ "data": 3, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -272,7 +297,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -280,7 +306,8 @@ "data": "then", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -288,7 +315,8 @@ "data": "else", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -305,7 +333,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -313,7 +342,8 @@ "data": "then", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -321,7 +351,8 @@ "data": "else", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -340,7 +371,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"then\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"then\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"then\" (and 2 more errors)" }, "tests": [ { @@ -348,7 +380,8 @@ "data": "yes", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -356,7 +389,8 @@ "data": "other", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -364,7 +398,8 @@ "data": "no", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -372,7 +407,8 @@ "data": "invalid", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/items.json b/encoding/jsonschema/testdata/external/tests/draft7/items.json index 2da560dac25..7604aaa9b27 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/items.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/items.json @@ -77,7 +77,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } }, { @@ -89,7 +90,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1,\"foo\",true] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [1,\"foo\",true] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1,\"foo\",true] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1,\"foo\",true] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1,\"foo\",true] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 3):\n instance.json:1:1\n" } }, { @@ -97,7 +99,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:49\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (0 and 2):\n instance.json:1:1\n" } }, { @@ -117,7 +120,8 @@ "items": true }, "skip": { - "v2": "extract error: value of \"items\" must be an object or array" + "v2": "extract error: value of \"items\" must be an object or array", + "v3": "extract error: value of \"items\" must be an object or array" }, "tests": [ { @@ -129,7 +133,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -137,7 +142,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -148,7 +154,8 @@ "items": false }, "skip": { - "v2": "extract error: value of \"items\" must be an object or array" + "v2": "extract error: value of \"items\" must be an object or array", + "v3": "extract error: value of \"items\" must be an object or array" }, "tests": [ { @@ -160,7 +167,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -168,7 +176,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -189,7 +198,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [1] and {...} (mismatched types list and struct):\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [1] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [1] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [1] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [1] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:37\nincompatible list lengths (1 and 2):\n instance.json:1:1\n" } }, { @@ -205,7 +215,8 @@ "data": [], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [] and {...} (mismatched types list and struct):\n generated.cue:2:44\n instance.json:1:1\nconflicting values bool and [] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:2:37\nincompatible list lengths (0 and 2):\n instance.json:1:1\n" } } ] @@ -402,7 +413,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -421,7 +433,8 @@ ], "valid": true, "skip": { - "v2": "incompatible list lengths (2 and 3)\n" + "v2": "incompatible list lengths (2 and 3)\n", + "v3": "incompatible list lengths (2 and 3):\n generated.cue:2:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/maxItems.json b/encoding/jsonschema/testdata/external/tests/draft7/maxItems.json index 68542167397..37f7889f85b 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/maxItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/maxItems.json @@ -42,7 +42,8 @@ "maxItems": 2.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -52,7 +53,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -64,7 +66,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/maxLength.json b/encoding/jsonschema/testdata/external/tests/draft7/maxLength.json index 713503d30e9..3f9b9978123 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/maxLength.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/maxLength.json @@ -43,7 +43,8 @@ "data": "f", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:3:41\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:3:41\n", + "v3": "conflicting values \"f\" and [...] (mismatched types string and list):\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"f\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"f\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"f\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"f\" and {...} (mismatched types string and struct):\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MaxRunes:\n generated.cue:3:41\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/maxProperties.json b/encoding/jsonschema/testdata/external/tests/draft7/maxProperties.json index 92ff969c65c..261461ee6c0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/maxProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/maxProperties.json @@ -56,7 +56,8 @@ "maxProperties": 2.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -66,7 +67,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -78,7 +80,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/minItems.json b/encoding/jsonschema/testdata/external/tests/draft7/minItems.json index df455ceec14..1e7bbed8936 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/minItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/minItems.json @@ -38,7 +38,8 @@ "minItems": 1.0 }, "skip": { - "v2": "extract error: invalid uint" + "v2": "extract error: invalid uint", + "v3": "extract error: invalid uint" }, "tests": [ { @@ -49,7 +50,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -57,7 +59,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/minLength.json b/encoding/jsonschema/testdata/external/tests/draft7/minLength.json index 161ca95893b..e9b59177848 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/minLength.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/minLength.json @@ -43,7 +43,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "6 errors in empty disjunction:\nconflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:3:41\n" + "v2": "6 errors in empty disjunction:\nconflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:3:1\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:3:1\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:3:1\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:3:1\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:3:41\n", + "v3": "conflicting values \"foo\" and [...] (mismatched types string and list):\n generated.cue:3:48\n instance.json:1:1\nconflicting values \"foo\" and bool (mismatched types string and bool):\n generated.cue:3:8\n instance.json:1:1\nconflicting values \"foo\" and null (mismatched types string and null):\n generated.cue:3:1\n instance.json:1:1\nconflicting values \"foo\" and number (mismatched types string and number):\n generated.cue:3:15\n instance.json:1:1\nconflicting values \"foo\" and {...} (mismatched types string and struct):\n generated.cue:3:56\n instance.json:1:1\ncannot use 2.0 (type float) as int in argument 2 to strings.MinRunes:\n generated.cue:3:41\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/minProperties.json b/encoding/jsonschema/testdata/external/tests/draft7/minProperties.json index 35c7e2b330c..6812a39410c 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/minProperties.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/minProperties.json @@ -5,7 +5,8 @@ "minProperties": 1 }, "skip": { - "v2": "extract error: unsupported constraint \"minProperties\"" + "v2": "extract error: unsupported constraint \"minProperties\"", + "v3": "extract error: unsupported constraint \"minProperties\"" }, "tests": [ { @@ -16,7 +17,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -26,7 +28,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -34,7 +37,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -42,7 +46,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -50,7 +55,8 @@ "data": "", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -58,7 +64,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -69,7 +76,8 @@ "minProperties": 1.0 }, "skip": { - "v2": "extract error: unsupported constraint \"minProperties\"" + "v2": "extract error: unsupported constraint \"minProperties\"", + "v3": "extract error: unsupported constraint \"minProperties\"" }, "tests": [ { @@ -80,7 +88,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -88,7 +97,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/not.json b/encoding/jsonschema/testdata/external/tests/draft7/not.json index 62c0ae8c573..5ec504d1d8d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/not.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/not.json @@ -7,7 +7,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -15,7 +16,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -23,7 +25,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -39,7 +42,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -47,7 +51,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -55,7 +60,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -63,7 +69,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -81,7 +88,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -89,7 +97,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -99,7 +108,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +119,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -124,7 +135,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -135,7 +147,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -146,7 +159,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -157,7 +171,8 @@ "not": {} }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -165,7 +180,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +189,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +198,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +207,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +216,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -207,7 +227,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -215,7 +236,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -225,7 +247,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -233,7 +256,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -244,7 +268,8 @@ "not": true }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -252,7 +277,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -260,7 +286,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -268,7 +295,8 @@ "data": true, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -276,7 +304,8 @@ "data": false, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -284,7 +313,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -294,7 +324,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -302,7 +333,8 @@ "data": {}, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -312,7 +344,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -320,7 +353,8 @@ "data": [], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -331,7 +365,8 @@ "not": false }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -339,7 +374,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -347,7 +383,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -355,7 +392,8 @@ "data": true, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -363,7 +401,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -371,7 +410,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -381,7 +421,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -389,7 +430,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -399,7 +441,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -407,7 +450,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -420,7 +464,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -428,7 +473,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/oneOf.json b/encoding/jsonschema/testdata/external/tests/draft7/oneOf.json index 808bcb75ad2..cd5e22cf057 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/oneOf.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/oneOf.json @@ -27,7 +27,8 @@ "data": 3, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -66,7 +67,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -86,7 +88,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -123,7 +126,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -143,7 +147,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -197,7 +202,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -231,7 +237,8 @@ "data": 123, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -263,7 +270,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -291,7 +299,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -342,7 +351,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -352,7 +362,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/content.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/content.json index 20858df52af..f3cbfd4d8b5 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/content.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/content.json @@ -15,7 +15,8 @@ "data": "{:}", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -41,7 +42,8 @@ "data": "eyJmb28iOi%iYmFyIn0K", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -68,7 +70,8 @@ "data": "ezp9Cg==", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -76,7 +79,8 @@ "data": "{}", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/cross-draft.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/cross-draft.json index c6e5153d8c1..9b7c2ed3f3d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/cross-draft.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/cross-draft.json @@ -15,7 +15,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/dependentRequired.json:dependentRequired\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/dependentRequired.json:dependentRequired\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/dependentRequired.json:dependentRequired\":\n generated.cue:1:8\n" }, "tests": [ { @@ -26,7 +27,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +39,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/ecmascript-regex.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/ecmascript-regex.json index 23b1178e7db..58a19c8b6b0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/ecmascript-regex.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/ecmascript-regex.json @@ -44,7 +44,8 @@ "pattern": "^\\cC$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" }, "tests": [ { @@ -52,7 +53,8 @@ "data": "\\cC", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -60,7 +62,8 @@ "data": "\u0003", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -72,7 +75,8 @@ "pattern": "^\\cc$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid escape sequence: `\\c`" }, "tests": [ { @@ -80,7 +84,8 @@ "data": "\\cc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -88,7 +93,8 @@ "data": "\u0003", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -201,7 +207,8 @@ "data": "\u000b", "valid": true, "skip": { - "v2": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\v\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -214,7 +221,8 @@ "data": " ", "valid": true, "skip": { - "v2": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u00a0\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -222,7 +230,8 @@ "data": "\ufeff", "valid": true, "skip": { - "v2": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\ufeff\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -235,7 +244,8 @@ "data": "\u2029", "valid": true, "skip": { - "v2": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u2029\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -243,7 +253,8 @@ "data": " ", "valid": true, "skip": { - "v2": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "invalid value \"\\u2003\" (out of bound =~\"^\\\\s$\"):\n generated.cue:2:1\n instance.json:1:1\n" } }, { @@ -280,7 +291,8 @@ "data": "\u000b", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -293,7 +305,8 @@ "data": " ", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -301,7 +314,8 @@ "data": "\ufeff", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -314,7 +328,8 @@ "data": "\u2029", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -322,7 +337,8 @@ "data": " ", "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -343,7 +359,8 @@ "pattern": "\\p{Letter}cole" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{Letter}`" }, "tests": [ { @@ -351,7 +368,8 @@ "data": "Les hivers de mon enfance etaient des saisons longues, longues. Nous vivions en trois lieux: l'ecole, l'eglise et la patinoire; mais la vraie vie etait sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -359,7 +377,8 @@ "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -367,7 +386,8 @@ "data": "Les hivers de mon enfance étaient des saisons longues, longues. Nous vivions en trois lieux: l'école, l'église et la patinoire; mais la vraie vie était sur la patinoire.", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -375,7 +395,8 @@ "data": "LES HIVERS DE MON ENFANCE ÉTAIENT DES SAISONS LONGUES, LONGUES. NOUS VIVIONS EN TROIS LIEUX: L'ÉCOLE, L'ÉGLISE ET LA PATINOIRE; MAIS LA VRAIE VIE ÉTAIT SUR LA PATINOIRE.", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -460,7 +481,8 @@ "pattern": "^\\p{digit}+$" }, "skip": { - "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`" + "v2": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`", + "v3": "extract error: unsupported regexp: error parsing regexp: invalid character class range: `\\p{digit}`" }, "tests": [ { @@ -468,7 +490,8 @@ "data": "42", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -476,7 +499,8 @@ "data": "-%#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -484,7 +508,8 @@ "data": "৪২", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -504,7 +529,10 @@ "data": { "l'ecole": "pas de vraie vie" }, - "valid": true + "valid": true, + "skip": { + "v3": "invalid regexp: error parsing regexp: invalid character class range: `\\p{Letter}`:\n generated.cue:2:36\n" + } }, { "description": "literal unicode character in json string", @@ -527,7 +555,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -556,7 +585,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -566,7 +596,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -576,7 +607,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -598,7 +630,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -608,7 +641,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -644,7 +678,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -654,7 +689,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -674,7 +710,10 @@ "data": { "42": "life, the universe, and everything" }, - "valid": true + "valid": true, + "skip": { + "v3": "invalid regexp: error parsing regexp: invalid character class range: `\\p{digit}`:\n generated.cue:2:34\n" + } }, { "description": "ascii non-digits", @@ -683,7 +722,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/float-overflow.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/float-overflow.json index dc94bfd2c57..6d9da903fb5 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/float-overflow.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/float-overflow.json @@ -11,7 +11,8 @@ "data": 1E+308, "valid": true, "skip": { - "v2": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:3:1\n instance.json:1:1\n" + "v2": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:3:1\n instance.json:1:1\n", + "v3": "conflicting values 1E+308 and int (mismatched types float and int):\n generated.cue:3:1\n instance.json:1:1\n" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date-time.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date-time.json index 09e03859f36..7a3439278e3 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date-time.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date-time.json @@ -5,7 +5,8 @@ "format": "date-time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "1963-06-19T08:30:06.283185Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "1963-06-19T08:30:06Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "1937-01-01T12:00:27.87+00:20", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "1990-12-31T15:59:50.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "1998-12-31T23:59:60Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "1998-12-31T15:59:60.123-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "1998-12-31T23:59:61Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "1998-12-31T23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "1998-12-31T22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "1990-02-31T15:59:59.123-08:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "1990-12-31T15:59:59-24:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "1963-06-19T08:30:06.28123+01:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "06/19/1963 08:30:06 PST", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "1963-06-19t08:30:06.283185z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "2013-350T01:01:01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "1963-6-19T08:30:06.283185Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "1963-06-1T08:30:06.283185Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "1963-06-1৪T00:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": "1963-06-11T0৪:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date.json index 6a52bb8e75d..d7fee965a90 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/date.json @@ -5,7 +5,8 @@ "format": "date" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "1963-06-19", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "2020-01-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "2020-01-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "2021-02-28", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "2021-02-29", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "2020-02-29", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "2020-02-30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "2020-03-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "2020-03-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "2020-04-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "2020-04-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "2020-05-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "2020-05-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "2020-06-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "2020-06-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "2020-07-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "2020-07-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "2020-08-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": "2020-08-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -213,7 +239,8 @@ "data": "2020-09-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -221,7 +248,8 @@ "data": "2020-09-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -229,7 +257,8 @@ "data": "2020-10-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -237,7 +266,8 @@ "data": "2020-10-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -245,7 +275,8 @@ "data": "2020-11-30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -253,7 +284,8 @@ "data": "2020-11-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -261,7 +293,8 @@ "data": "2020-12-31", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -269,7 +302,8 @@ "data": "2020-12-32", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -277,7 +311,8 @@ "data": "2020-13-01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -285,7 +320,8 @@ "data": "06/19/1963", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -293,7 +329,8 @@ "data": "2013-350", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -301,7 +338,8 @@ "data": "1998-1-20", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -309,7 +347,8 @@ "data": "1998-01-1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -317,7 +356,8 @@ "data": "1998-13-01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -325,7 +365,8 @@ "data": "1998-04-31", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -333,7 +374,8 @@ "data": "2021-02-29", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -341,7 +383,8 @@ "data": "2020-02-29", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -349,7 +392,8 @@ "data": "1963-06-1৪", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -357,7 +401,8 @@ "data": "20230328", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -365,7 +410,8 @@ "data": "2023-W01", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -373,7 +419,8 @@ "data": "2023-W13-2", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -381,7 +428,8 @@ "data": "2022W527", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/email.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/email.json index e791b93a8a7..3126f798d81 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/email.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/email.json @@ -5,7 +5,8 @@ "format": "email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "joe.bloggs@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "te~st@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "~test@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "test~@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": ".test@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "test.@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "te.s.t@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "te..st@example.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/hostname.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/hostname.json index d982f483380..6cb65820ed8 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/hostname.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/hostname.json @@ -5,7 +5,8 @@ "format": "hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "www.example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "xn--4gbwdl.xn--wgbh1c", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "-a-host-name-that-starts-with--", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "not_a_valid_host_name", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "a-vvvvvvvvvvvvvvvveeeeeeeeeeeeeeeerrrrrrrrrrrrrrrryyyyyyyyyyyyyyyy-long-host-name-component", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "-hostname", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "hostname-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "_hostname", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "hostname_", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "host_name", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijk.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "hostname", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "host-name", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "h0stn4me", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "hostnam3", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/idn-email.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/idn-email.json index ce695a9dcdc..4aa42eb7c10 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/idn-email.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/idn-email.json @@ -5,7 +5,8 @@ "format": "idn-email" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "실례@실례.테스트", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "joe.bloggs@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "2962", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/idn-hostname.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/idn-hostname.json index 05fb61cd193..c8b679d75a4 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/idn-hostname.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/idn-hostname.json @@ -5,7 +5,8 @@ "format": "idn-hostname" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "실례.테스트", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "〮실례.테스트", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "실〮례.테스트", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실실례례테스트례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례례례례례례례례테스트례례례례례례례례례례례례테스트례례실례.테스트", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -94,7 +105,8 @@ "data": "-\u003e $1.00 \u003c--", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -103,7 +115,8 @@ "data": "xn--ihqwcrb4cv8a8dqg056pqjye", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -112,7 +125,8 @@ "data": "xn--X", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -121,7 +135,8 @@ "data": "XN--aa---o47jg78q", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -130,7 +145,8 @@ "data": "-hello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -139,7 +155,8 @@ "data": "hello-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -148,7 +165,8 @@ "data": "-hello-", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +175,8 @@ "data": "ःhello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +185,8 @@ "data": "̀hello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -175,7 +195,8 @@ "data": "҈hello", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -184,7 +205,8 @@ "data": "ßς་〇", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -193,7 +215,8 @@ "data": "۽۾", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -202,7 +225,8 @@ "data": "ـߺ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -211,7 +235,8 @@ "data": "〱〲〳〴〵〮〯〻", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -220,7 +245,8 @@ "data": "a·l", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -229,7 +255,8 @@ "data": "·l", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -238,7 +265,8 @@ "data": "l·a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -247,7 +275,8 @@ "data": "l·", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -256,7 +285,8 @@ "data": "l·l", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -265,7 +295,8 @@ "data": "α͵S", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -274,7 +305,8 @@ "data": "α͵", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -283,7 +315,8 @@ "data": "α͵β", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -292,7 +325,8 @@ "data": "A׳ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -301,7 +335,8 @@ "data": "׳ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -310,7 +345,8 @@ "data": "א׳ב", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -319,7 +355,8 @@ "data": "A״ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -328,7 +365,8 @@ "data": "״ב", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -337,7 +375,8 @@ "data": "א״ב", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -346,7 +385,8 @@ "data": "def・abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -355,7 +395,8 @@ "data": "・", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -364,7 +405,8 @@ "data": "・ぁ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -373,7 +415,8 @@ "data": "・ァ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -382,7 +425,8 @@ "data": "・丈", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -391,7 +435,8 @@ "data": "ب٠۰", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -400,7 +445,8 @@ "data": "ب٠ب", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -409,7 +455,8 @@ "data": "۰0", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -418,7 +465,8 @@ "data": "क‍ष", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -427,7 +475,8 @@ "data": "‍ष", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -436,7 +485,8 @@ "data": "क्‍ष", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -445,7 +495,8 @@ "data": "क्‌ष", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -454,7 +505,8 @@ "data": "بي‌بي", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -462,7 +514,8 @@ "data": "hostname", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -470,7 +523,8 @@ "data": "host-name", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -478,7 +532,8 @@ "data": "h0stn4me", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -486,7 +541,8 @@ "data": "hostnam3", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/ipv4.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/ipv4.json index 4dce8dd0475..c86761d6230 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/ipv4.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/ipv4.json @@ -5,7 +5,8 @@ "format": "ipv4" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "127.0.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "256.256.256.256", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "127.0", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "0x7f000001", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "2130706433", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -110,7 +123,8 @@ "data": "087.10.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -118,7 +132,8 @@ "data": "87.10.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -126,7 +141,8 @@ "data": "1২7.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -134,7 +150,8 @@ "data": "192.168.1.0/24", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/ipv6.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/ipv6.json index 4e3387563b2..e182ce25c5d 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/ipv6.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/ipv6.json @@ -5,7 +5,8 @@ "format": "ipv6" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "::1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "12345::", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "::abef", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "::abcef", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "1:1:1:1:1:1:1:1:1:1:1:1:1:1:1:1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "::laptop", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "::42:ff:1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "d6::", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": ":2:3:4:5:6:7:8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "1:2:3:4:5:6:7:", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": ":2:3:4::8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "1:d6::42", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "1::d6::42", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "1::d6:192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "1:2::192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "1::2:192.168.256.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "1::2:192.168.ff.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": "::ffff:192.168.0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -213,7 +239,8 @@ "data": "1:2:3:4:5:::8", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -221,7 +248,8 @@ "data": "1:2:3:4:5:6:7:8", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -229,7 +257,8 @@ "data": "1:2:3:4:5:6:7", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -237,7 +266,8 @@ "data": "1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -245,7 +275,8 @@ "data": "127.0.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -253,7 +284,8 @@ "data": "1:2:3:4:1.2.3", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -261,7 +293,8 @@ "data": " ::1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -269,7 +302,8 @@ "data": "::1 ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -277,7 +311,8 @@ "data": "fe80::/64", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -285,7 +320,8 @@ "data": "fe80::a%eth1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -293,7 +329,8 @@ "data": "1000:1000:1000:1000:1000:1000:255.255.255.255", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -301,7 +338,8 @@ "data": "100:100:100:100:100:100:255.255.255.255.255", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -309,7 +347,8 @@ "data": "100:100:100:100:100:100:100:255.255.255.255", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -317,7 +356,8 @@ "data": "1:2:3:4:5:6:7:৪", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -325,7 +365,8 @@ "data": "1:2::192.16৪.0.1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/iri-reference.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/iri-reference.json index 597138ef4dc..37729197ef2 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/iri-reference.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/iri-reference.json @@ -5,7 +5,8 @@ "format": "iri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "//ƒøø.ßår/?∂éœ=πîx#πîüx", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "/âππ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "\\\\WINDOWS\\filëßåré", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "âππ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "#ƒrägmênt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "#ƒräg\\mênt", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/iri.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/iri.json index 47f5dc403cc..f5588428cab 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/iri.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/iri.json @@ -5,7 +5,8 @@ "format": "iri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "http://ƒøø.ßår/?∂éœ=πîx#πîüx", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "http://ƒøø.com/blah_(wîkïpédiå)_blah#ßité-1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "http://ƒøø.ßår/?q=Test%20URL-encoded%20stuff", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "http://-.~_!$\u0026'()*+,;=:%40:80%2f::::::@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "http://[2001:0db8:85a3:0000:0000:8a2e:0370:7334]", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "http://2001:0db8:85a3:0000:0000:8a2e:0370:7334", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "/abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "\\\\WINDOWS\\filëßåré", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "âππ", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/json-pointer.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/json-pointer.json index 8091767c1cb..6473b0ea8fc 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/json-pointer.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/json-pointer.json @@ -5,7 +5,8 @@ "format": "json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "/foo/bar~0/baz~1/%a", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "/foo/bar~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "/foo//bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "/foo/bar/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "/foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "/foo/0", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "/a~1b", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "/c%d", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "/e^f", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "/g|h", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "/i\\j", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "/k\"l", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "/ ", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "/m~0n", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "/foo/-", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "/foo/-/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": "/~1~0~0~1~1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -213,7 +239,8 @@ "data": "/~1.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -221,7 +248,8 @@ "data": "/~0.1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -229,7 +257,8 @@ "data": "#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -237,7 +266,8 @@ "data": "#/", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -245,7 +275,8 @@ "data": "#a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -253,7 +284,8 @@ "data": "/~0~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -261,7 +293,8 @@ "data": "/~0/~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -269,7 +302,8 @@ "data": "/~2", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -277,7 +311,8 @@ "data": "/~-1", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -285,7 +320,8 @@ "data": "/~~", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -293,7 +329,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -301,7 +338,8 @@ "data": "0", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -309,7 +347,8 @@ "data": "a/a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/regex.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/regex.json index a239ba2bf22..8b46b732161 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/regex.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/regex.json @@ -5,7 +5,8 @@ "format": "regex" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "([abc])+\\s+$", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "^(abc]", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/relative-json-pointer.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/relative-json-pointer.json index c51c558c417..7790c461bd6 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/relative-json-pointer.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/relative-json-pointer.json @@ -5,7 +5,8 @@ "format": "relative-json-pointer" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "0/foo/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "2/0/baz/1/zip", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "0#", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "/foo/bar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "-1/foo/bar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "+1/foo/bar", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "0##", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "01/a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "01#", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "120/foo/bar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/time.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/time.json index 3d9739431ba..9fd6defff02 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/time.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/time.json @@ -5,7 +5,8 @@ "format": "time" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "08:30:06Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "008:030:006Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "8:3:6Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "8:0030:6Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "23:59:60Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "23:59:60+00:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "22:59:60+00:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "23:58:60+00:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "01:29:60+01:30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "23:29:60+23:30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "23:59:60+01:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "23:59:60+00:30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "15:59:60-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "00:29:60-23:30", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "23:59:60-01:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "23:59:60-00:30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": "23:20:50.52Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -213,7 +239,8 @@ "data": "08:30:06.283185Z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -221,7 +248,8 @@ "data": "08:30:06+00:20", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -229,7 +257,8 @@ "data": "08:30:06-08:00", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -237,7 +266,8 @@ "data": "08:30:06-8:000", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -245,7 +275,8 @@ "data": "08:30:06z", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -253,7 +284,8 @@ "data": "24:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -261,7 +293,8 @@ "data": "00:60:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -269,7 +302,8 @@ "data": "00:00:61Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -277,7 +311,8 @@ "data": "22:59:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -285,7 +320,8 @@ "data": "23:58:60Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -293,7 +329,8 @@ "data": "01:02:03+24:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -301,7 +338,8 @@ "data": "01:02:03+00:60", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -309,7 +347,8 @@ "data": "01:02:03Z+00:30", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -317,7 +356,8 @@ "data": "08:30:06 PST", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -325,7 +365,8 @@ "data": "01:01:01,1111", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -333,7 +374,8 @@ "data": "12:00:00", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -341,7 +383,8 @@ "data": "12:00:00.52", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -349,7 +392,8 @@ "data": "1২:00:00Z", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -357,7 +401,8 @@ "data": "08:30:06#00:20", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -365,7 +410,8 @@ "data": "ab:cd:ef", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/unknown.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/unknown.json index 7efc1f15fdd..31243e23adc 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/unknown.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/unknown.json @@ -5,7 +5,8 @@ "format": "unknown" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri-reference.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri-reference.json index 48e4a95c754..ed2c1384b9c 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri-reference.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri-reference.json @@ -5,7 +5,8 @@ "format": "uri-reference" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "http://foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "/abc", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "\\\\WINDOWS\\fileshare", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "abc", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "#fragment", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "#frag\\ment", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri-template.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri-template.json index 3ec13f98c73..9010266869a 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri-template.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri-template.json @@ -5,7 +5,8 @@ "format": "uri-template" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "http://example.com/dictionary/{term:1}/{term}", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "http://example.com/dictionary/{term:1}/{term", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "http://example.com/dictionary", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "dictionary/{term:1}/{term}", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri.json index a687a994a24..317953f4d7e 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/format/uri.json @@ -5,7 +5,8 @@ "format": "uri" }, "skip": { - "v2": "extract error: unsupported constraint \"format\"" + "v2": "extract error: unsupported constraint \"format\"", + "v3": "extract error: unsupported constraint \"format\"" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": 13.7, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +32,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +41,8 @@ "data": [], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -45,7 +50,8 @@ "data": false, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -53,7 +59,8 @@ "data": null, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -61,7 +68,8 @@ "data": "http://foo.bar/?baz=qux#quux", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -69,7 +77,8 @@ "data": "http://foo.com/blah_(wikipedia)_blah#cite-1", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -77,7 +86,8 @@ "data": "http://foo.bar/?q=Test%20URL-encoded%20stuff", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -85,7 +95,8 @@ "data": "http://xn--nw2a.xn--j6w193g/", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -93,7 +104,8 @@ "data": "http://-.~_!$\u0026'()*+,;=:%40:80%2f::::::@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -101,7 +113,8 @@ "data": "http://223.255.255.254", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -109,7 +122,8 @@ "data": "ftp://ftp.is.co.za/rfc/rfc1808.txt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -117,7 +131,8 @@ "data": "http://www.ietf.org/rfc/rfc2396.txt", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -125,7 +140,8 @@ "data": "ldap://[2001:db8::7]/c=GB?objectClass?one", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -133,7 +149,8 @@ "data": "mailto:John.Doe@example.com", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -141,7 +158,8 @@ "data": "news:comp.infosystems.www.servers.unix", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -149,7 +167,8 @@ "data": "tel:+1-816-555-1212", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -157,7 +176,8 @@ "data": "urn:oasis:names:specification:docbook:dtd:xml:4.1.2", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -165,7 +185,8 @@ "data": "//foo.bar/?baz=qux#quux", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -173,7 +194,8 @@ "data": "/abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -181,7 +203,8 @@ "data": "\\\\WINDOWS\\fileshare", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -189,7 +212,8 @@ "data": "abc", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -197,7 +221,8 @@ "data": "http:// shouldfail.com", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -205,7 +230,8 @@ "data": ":// should fail", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -213,7 +239,8 @@ "data": "bar,baz:foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/id.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/id.json index f026d942908..debdf57a771 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/id.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/id.json @@ -33,7 +33,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/id/my_identifier.json:my_identifier\":\n generated.cue:1:8\n" }, "tests": [ { @@ -44,7 +45,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -52,7 +54,8 @@ "data": "a string to match #/definitions/id_in_enum", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -60,7 +63,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -84,7 +88,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -92,7 +97,8 @@ "data": "skip not_a_real_anchor", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -100,7 +106,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -124,7 +131,8 @@ } }, "skip": { - "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)" + "v2": "extract error: unsupported constraint \"if\" (and 2 more errors)", + "v3": "extract error: unsupported constraint \"if\" (and 2 more errors)" }, "tests": [ { @@ -132,7 +140,8 @@ "data": "skip not_a_real_id", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -140,7 +149,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/unknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/unknownKeyword.json index 095e398d4ce..509e4141700 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/optional/unknownKeyword.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/optional/unknownKeyword.json @@ -42,7 +42,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)" + "v2": "extract error: unsupported constraint \"not\" (and 1 more errors)", + "v3": "extract error: unsupported constraint \"not\" (and 1 more errors)" }, "tests": [ { @@ -50,7 +51,8 @@ "data": "a string", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -58,7 +60,8 @@ "data": null, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -66,7 +69,8 @@ "data": 1, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/properties.json b/encoding/jsonschema/testdata/external/tests/draft7/properties.json index a34885b6362..1f493c24357 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/properties.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/properties.json @@ -106,7 +106,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/propertyNames.json b/encoding/jsonschema/testdata/external/tests/draft7/propertyNames.json index 18c84592655..4cafe38f8b0 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/propertyNames.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/propertyNames.json @@ -7,7 +7,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:4:3\n" + "v2": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:4:3\n", + "v3": "extract error: cannot compile resulting schema: reference \"strings\" in label expression refers to field against which it would be matched:\n generated.cue:4:3\n" }, "tests": [ { @@ -18,7 +19,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -29,7 +31,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -37,7 +40,8 @@ "data": {}, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -50,7 +54,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -58,7 +63,8 @@ "data": "foobar", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -66,7 +72,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -95,7 +102,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -136,12 +144,18 @@ "data": { "foo": 1 }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "empty object is valid", "data": {}, - "valid": true + "valid": true, + "skip": { + "v3": "conflicting values [...] and {} (mismatched types list and struct):\n generated.cue:2:33\n instance.json:1:1\nconflicting values bool and {} (mismatched types bool and struct):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and {} (mismatched types null and struct):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and {} (mismatched types number and struct):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and {} (mismatched types string and struct):\n generated.cue:2:24\n instance.json:1:1\nexplicit error (_|_ literal) in source:\n generated.cue:3:3\n" + } } ] } diff --git a/encoding/jsonschema/testdata/external/tests/draft7/ref.json b/encoding/jsonschema/testdata/external/tests/draft7/ref.json index cab8b661ad0..cebd1a68420 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/ref.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/ref.json @@ -33,7 +33,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -45,7 +46,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -63,7 +65,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n" + "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n", + "v3": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n" }, "tests": [ { @@ -73,7 +76,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -83,7 +87,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -101,7 +106,8 @@ ] }, "skip": { - "v2": "extract error: referring to field \"items\" not yet supported" + "v2": "extract error: referring to field \"items\" not yet supported", + "v3": "extract error: referring to field \"items\" not yet supported" }, "tests": [ { @@ -112,7 +118,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -123,7 +130,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -160,21 +168,30 @@ "data": { "slash": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "tilde invalid", "data": { "tilde": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "percent invalid", "data": { "percent": "aoeu" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } }, { "description": "slash valid", @@ -275,7 +292,8 @@ }, "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [...] and {foo:[1,2,3]} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {foo:[1,2,3]} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {foo:[1,2,3]} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {foo:[1,2,3]} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {foo:[1,2,3]} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [...] and {foo:[1,2,3]} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {foo:[1,2,3]} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {foo:[1,2,3]} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {foo:[1,2,3]} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {foo:[1,2,3]} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\n", + "v3": "cannot combine regular field \"foo\" with [[1,2,3],[]]:\n generated.cue:1:1\n instance.json:1:1\ncannot combine regular field \"foo\" with null:\n generated.cue:3:1\ncannot combine regular field \"foo\" with {foo:[1,2,3],#reffed:[]}:\n generated.cue:1:1\n instance.json:1:1\nconflicting values [...] and {foo:[1,2,3]} (mismatched types list and struct):\n generated.cue:3:33\n instance.json:1:1\nconflicting values bool and {foo:[1,2,3]} (mismatched types bool and struct):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and {foo:[1,2,3]} (mismatched types null and struct):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and {foo:[1,2,3]} (mismatched types number and struct):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and {foo:[1,2,3]} (mismatched types string and struct):\n generated.cue:3:24\n instance.json:1:1\nfoo: conflicting values [1,2,3] and bool (mismatched types list and bool):\n generated.cue:4:26\n instance.json:1:8\nfoo: conflicting values [1,2,3] and null (mismatched types list and null):\n generated.cue:4:19\n instance.json:1:8\nfoo: conflicting values [1,2,3] and number (mismatched types list and number):\n generated.cue:4:33\n instance.json:1:8\nfoo: conflicting values [1,2,3] and string (mismatched types list and string):\n generated.cue:4:42\n instance.json:1:8\nfoo: conflicting values [1,2,3] and {...} (mismatched types list and struct):\n generated.cue:4:70\n instance.json:1:8\nfoo: invalid value [1,2,3] (does not satisfy list.MaxItems(2)): len(list) \u003e MaxItems(2) (3 \u003e 2):\n generated.cue:4:51\n generated.cue:4:65\n instance.json:1:8\n" } }, { @@ -311,7 +329,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/sibling_id/foo.json:foo\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/sibling_id/foo.json:foo\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/sibling_id/foo.json:foo\":\n generated.cue:1:8\n" }, "tests": [ { @@ -319,7 +338,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -327,7 +347,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -338,7 +359,8 @@ "$ref": "http://json-schema.org/draft-07/schema#" }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-07/schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-07/schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"json-schema.org/draft-07/schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -348,7 +370,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -358,7 +381,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -453,7 +477,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n" + "v2": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n", + "v3": "extract error: cannot compile resulting schema: explicit error (_|_ literal) in source:\n generated.cue:4:8\n" }, "tests": [ { @@ -461,7 +486,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -507,7 +533,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:8:14\n" + "v2": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:8:14\n", + "v3": "extract error: cannot compile resulting schema: builtin package \"localhost:1234/node\" undefined:\n generated.cue:1:8\n_schema.nodes: reference \"node\" not found:\n generated.cue:8:14\n" }, "tests": [ { @@ -547,7 +574,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -587,7 +615,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -622,7 +651,10 @@ "data": { "foo\"bar": "1" }, - "valid": false + "valid": false, + "skip": { + "v3": "unexpected success" + } } ] }, @@ -642,7 +674,8 @@ } }, "skip": { - "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)" + "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)", + "v3": "extract error: $id URI may not contain a fragment (and 1 more errors)" }, "tests": [ { @@ -650,7 +683,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -658,7 +692,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -680,7 +715,8 @@ } }, "skip": { - "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)" + "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)", + "v3": "extract error: $id URI may not contain a fragment (and 1 more errors)" }, "tests": [ { @@ -688,7 +724,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -696,7 +733,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -723,7 +761,8 @@ } }, "skip": { - "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)" + "v2": "extract error: $id URI may not contain a fragment (and 1 more errors)", + "v3": "extract error: $id URI may not contain a fragment (and 1 more errors)" }, "tests": [ { @@ -731,7 +770,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -739,7 +779,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -771,7 +812,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -813,7 +855,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/schema-relative-uri-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -826,7 +869,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -839,7 +883,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -852,7 +897,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -887,7 +933,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/schema-refs-absolute-uris-defs2.json:schema\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -900,7 +947,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -913,7 +961,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -926,7 +975,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -955,7 +1005,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"not\"" + "v2": "extract error: unsupported constraint \"not\"", + "v3": "extract error: unsupported constraint \"not\"" }, "tests": [ { @@ -963,7 +1014,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -971,7 +1023,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1186,7 +1239,8 @@ } }, "skip": { - "v2": "extract error: anchors (something) not supported (and 1 more errors)" + "v2": "extract error: anchors (something) not supported (and 1 more errors)", + "v3": "extract error: anchors (something) not supported (and 1 more errors)" }, "tests": [ { @@ -1196,7 +1250,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1206,7 +1261,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1227,7 +1283,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"if\"" + "v2": "extract error: unsupported constraint \"if\"", + "v3": "extract error: unsupported constraint \"if\"" }, "tests": [ { @@ -1235,7 +1292,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1243,7 +1301,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1264,7 +1323,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"then\"" + "v2": "extract error: unsupported constraint \"then\"", + "v3": "extract error: unsupported constraint \"then\"" }, "tests": [ { @@ -1272,7 +1332,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1280,7 +1341,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1301,7 +1363,8 @@ ] }, "skip": { - "v2": "extract error: unsupported constraint \"else\"" + "v2": "extract error: unsupported constraint \"else\"", + "v3": "extract error: unsupported constraint \"else\"" }, "tests": [ { @@ -1309,7 +1372,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1317,7 +1381,8 @@ "data": 12, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1343,7 +1408,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: package \"example.com/absref/foobar.json:foobar\" imported but not defined in :\n generated.cue:1:8\n" }, "tests": [ { @@ -1351,7 +1417,8 @@ "data": "foo", "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1359,7 +1426,8 @@ "data": 12, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -1439,7 +1507,8 @@ ] }, "skip": { - "v2": "extract error: cannot refer to definitions section: must refer to one of its elements" + "v2": "extract error: cannot refer to definitions section: must refer to one of its elements", + "v3": "extract error: cannot refer to definitions section: must refer to one of its elements" }, "tests": [ { @@ -1447,7 +1516,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -1455,7 +1525,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/refRemote.json b/encoding/jsonschema/testdata/external/tests/draft7/refRemote.json index 6df734477ca..78bb8c92d44 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/refRemote.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/refRemote.json @@ -5,7 +5,8 @@ "$ref": "http://localhost:1234/integer.json" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/integer.json:integer\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/integer.json:integer\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/integer.json:integer\":\n generated.cue:1:8\n" }, "tests": [ { @@ -13,7 +14,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -21,7 +23,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -32,7 +35,8 @@ "$ref": "http://localhost:1234/subSchemas.json#/definitions/integer" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" }, "tests": [ { @@ -40,7 +44,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -48,7 +53,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -59,7 +65,8 @@ "$ref": "http://localhost:1234/subSchemas.json#/definitions/refToInteger" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/subSchemas.json:subSchemas\":\n generated.cue:1:8\n" }, "tests": [ { @@ -67,7 +74,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -75,7 +83,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -92,7 +101,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChange/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -104,7 +114,8 @@ ], "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -116,7 +127,8 @@ ], "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -142,7 +154,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolder/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolder/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolder/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -154,7 +167,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -166,7 +180,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -196,7 +211,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolderInSubschema/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolderInSubschema/folderInteger.json:folderInteger\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/baseUriChangeFolderInSubschema/folderInteger.json:folderInteger\":\n generated.cue:1:8\n" }, "tests": [ { @@ -208,7 +224,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -220,7 +237,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -237,7 +255,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/name.json:name\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/name.json:name\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/name.json:name\":\n generated.cue:1:8\n" }, "tests": [ { @@ -247,7 +266,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -257,7 +277,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -269,7 +290,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -285,7 +307,8 @@ ] }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/ref-and-definitions.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/ref-and-definitions.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/ref-and-definitions.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -295,7 +318,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -305,7 +329,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -316,7 +341,8 @@ "$ref": "http://localhost:1234/locationIndependentIdentifierPre2019.json#/definitions/refToInteger" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/locationIndependentIdentifierPre2019.json:locationIndependentIdentifierPre2019\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/locationIndependentIdentifierPre2019.json:locationIndependentIdentifierPre2019\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/locationIndependentIdentifierPre2019.json:locationIndependentIdentifierPre2019\":\n generated.cue:1:8\n" }, "tests": [ { @@ -324,7 +350,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -332,7 +359,8 @@ "data": "foo", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -348,7 +376,8 @@ } }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/nested/foo-ref-string.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -360,7 +389,8 @@ }, "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -372,7 +402,8 @@ }, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] @@ -383,7 +414,8 @@ "$ref": "http://localhost:1234/draft7/detached-ref.json#/definitions/foo" }, "skip": { - "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft7/detached-ref.json:schema\":\n generated.cue:1:8\n" + "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft7/detached-ref.json:schema\":\n generated.cue:1:8\n", + "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft7/detached-ref.json:schema\":\n generated.cue:1:8\n" }, "tests": [ { @@ -391,7 +423,8 @@ "data": 1, "valid": true, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } }, { @@ -399,7 +432,8 @@ "data": "a", "valid": false, "skip": { - "v2": "could not compile schema" + "v2": "could not compile schema", + "v3": "could not compile schema" } } ] diff --git a/encoding/jsonschema/testdata/external/tests/draft7/required.json b/encoding/jsonschema/testdata/external/tests/draft7/required.json index 2fa196e6af9..b9311493cc6 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/required.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/required.json @@ -25,7 +25,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -109,7 +110,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } } ] @@ -140,7 +142,8 @@ "data": {}, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -150,7 +153,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -162,7 +166,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -174,7 +179,8 @@ }, "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/type.json b/encoding/jsonschema/testdata/external/tests/draft7/type.json index 9399419c766..af59bc1f9ab 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/type.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/type.json @@ -15,7 +15,8 @@ "data": 1.0, "valid": true, "skip": { - "v2": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" + "v2": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n", + "v3": "conflicting values 1.0 and int (mismatched types float and int):\n generated.cue:2:1\n instance.json:1:1\n" } }, { diff --git a/encoding/jsonschema/testdata/external/tests/draft7/uniqueItems.json b/encoding/jsonschema/testdata/external/tests/draft7/uniqueItems.json index 41ece6051e1..e184cffa329 100644 --- a/encoding/jsonschema/testdata/external/tests/draft7/uniqueItems.json +++ b/encoding/jsonschema/testdata/external/tests/draft7/uniqueItems.json @@ -39,7 +39,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -114,7 +115,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -328,7 +330,8 @@ ], "valid": false, "skip": { - "v2": "unexpected success" + "v2": "unexpected success", + "v3": "unexpected success" } }, { @@ -413,7 +416,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -426,7 +430,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:1\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:3:69\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:3:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:3:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:3:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:3:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -745,7 +750,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -758,7 +764,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"bar\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"bar\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"bar\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"bar\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"bar\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -771,7 +778,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [false,true,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [false,true,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [false,true,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [false,true,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [false,true,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } }, { @@ -784,7 +792,8 @@ ], "valid": true, "skip": { - "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n" + "v2": "5 errors in empty disjunction:\nconflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:1\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\n", + "v3": "conflicting values [true,false,\"foo\",\"foo\"] and {...} (mismatched types list and struct):\n generated.cue:2:48\n instance.json:1:1\nconflicting values bool and [true,false,\"foo\",\"foo\"] (mismatched types bool and list):\n generated.cue:2:8\n instance.json:1:1\nconflicting values null and [true,false,\"foo\",\"foo\"] (mismatched types null and list):\n generated.cue:2:1\n instance.json:1:1\nconflicting values number and [true,false,\"foo\",\"foo\"] (mismatched types number and list):\n generated.cue:2:15\n instance.json:1:1\nconflicting values string and [true,false,\"foo\",\"foo\"] (mismatched types string and list):\n generated.cue:2:24\n instance.json:1:1\nincompatible list lengths (2 and 4):\n instance.json:1:1\n" } } ]