encoding/jsonschema: use StrictFeatures in external tests

rogpeppe · rogpeppe · commit bef55cb1eddb · 2024-09-12T17:01:47.000Z
The spec specifically says that unknown keywords should be ignored, so use `StrictFeatures` in the external tests so they correspond better to the spec. Also, use `StrictFeatures` rather than `Strict` in one of the constraints, as we should never be using `Strict` as a condition. Signed-off-by: Roger Peppe <rogpeppe@gmail.com> Change-Id: If4d66285b6a9f77bb6ae4915a4818967290578f2 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1201117 Reviewed-by: Daniel Martí <mvdan@mvdan.cc> Unity-Result: CUE porcuepine <cue.porcuepine@gmail.com> TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
diff --git a/encoding/jsonschema/constraints_meta.go b/encoding/jsonschema/constraints_meta.go
@@ -34,11 +34,11 @@ func constraintID(key string, n cue.Value, s *state) {
 	}
 
 	if u.Fragment != "" {
-		// TODO do not use Strict for this. The specification is clear:
+		// TODO do not use StrictFeatures for this. The specification is clear:
 		// before 2019-09, IDs could contain plain-name fragments;
 		// (see https://json-schema.org/draft-07/draft-handrews-json-schema-01#rfc.section.5)
 		// afterwards, $anchor was reserved for that purpose.
-		if s.cfg.Strict {
+		if s.cfg.StrictFeatures {
 			s.errf(n, "$id URI may not contain a fragment")
 		}
 		return
diff --git a/encoding/jsonschema/external_test.go b/encoding/jsonschema/external_test.go
@@ -92,7 +92,7 @@ func runExternalSchemaTests(t *testing.T, m *cuetdtest.M, filename string, s *ex
 		t.Skipf("skipping test for unknown schema version %v", versStr)
 	}
 	schemaAST, extractErr := jsonschema.Extract(jsonValue, &jsonschema.Config{
-		Strict:         true,
+		StrictFeatures: true,
 		DefaultVersion: vers,
 	})
 	var schemaValue cue.Value
diff --git a/encoding/jsonschema/external_teststats.txt b/encoding/jsonschema/external_teststats.txt
@@ -1,10 +1,10 @@
 # Generated by teststats. DO NOT EDIT
 v2:
-	schema extract (pass / total): 1072 / 1637 = 65.5%
-	tests (pass / total): 3457 / 7175 = 48.2%
-	tests on extracted schemas (pass / total): 3457 / 3874 = 89.2%
+	schema extract (pass / total): 1077 / 1637 = 65.8%
+	tests (pass / total): 3467 / 7175 = 48.3%
+	tests on extracted schemas (pass / total): 3467 / 3884 = 89.3%
 
 v3:
-	schema extract (pass / total): 1060 / 1637 = 64.8%
-	tests (pass / total): 3408 / 7175 = 47.5%
-	tests on extracted schemas (pass / total): 3408 / 3830 = 89.0%
+	schema extract (pass / total): 1065 / 1637 = 65.1%
+	tests (pass / total): 3418 / 7175 = 47.6%
+	tests on extracted schemas (pass / total): 3418 / 3840 = 89.0%
diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/refOfUnknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/refOfUnknownKeyword.json
@@ -13,8 +13,8 @@
 			}
 		},
 		"skip": {
-			"v2": "extract error: unknown keyword \"unknown-keyword\"",
-			"v3": "extract error: unknown keyword \"unknown-keyword\""
+			"v2": "extract error: cannot compile resulting schema: bar: reference \"_X0\" not found:\n    generated.cue:3:8\n",
+			"v3": "extract error: cannot compile resulting schema: bar: reference \"_X0\" not found:\n    generated.cue:3:8\n"
 		},
 		"tests": [
 			{
@@ -57,8 +57,8 @@
 			}
 		},
 		"skip": {
-			"v2": "extract error: unknown keyword \"unknown-keyword\"",
-			"v3": "extract error: unknown keyword \"unknown-keyword\""
+			"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": [
 			{
diff --git a/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/unknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft2019-09/optional/unknownKeyword.json
@@ -43,8 +43,8 @@
 			]
 		},
 		"skip": {
-			"v2": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)",
-			"v3": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)"
+			"v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/unknownKeyword/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/unknownKeyword/my_identifier.json:my_identifier\":\n    generated.cue:1:8\n"
 		},
 		"tests": [
 			{
diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/refOfUnknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/refOfUnknownKeyword.json
@@ -13,8 +13,8 @@
 			}
 		},
 		"skip": {
-			"v2": "extract error: unknown keyword \"unknown-keyword\"",
-			"v3": "extract error: unknown keyword \"unknown-keyword\""
+			"v2": "extract error: cannot compile resulting schema: bar: reference \"_X0\" not found:\n    generated.cue:3:8\n",
+			"v3": "extract error: cannot compile resulting schema: bar: reference \"_X0\" not found:\n    generated.cue:3:8\n"
 		},
 		"tests": [
 			{
@@ -57,8 +57,8 @@
 			}
 		},
 		"skip": {
-			"v2": "extract error: unknown keyword \"unknown-keyword\"",
-			"v3": "extract error: unknown keyword \"unknown-keyword\""
+			"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": [
 			{
diff --git a/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/unknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft2020-12/optional/unknownKeyword.json
@@ -43,8 +43,8 @@
 			]
 		},
 		"skip": {
-			"v2": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)",
-			"v3": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)"
+			"v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2020-12/unknownKeyword/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/unknownKeyword/my_identifier.json:my_identifier\":\n    generated.cue:1:8\n"
 		},
 		"tests": [
 			{
diff --git a/encoding/jsonschema/testdata/external/tests/draft4/optional/id.json b/encoding/jsonschema/testdata/external/tests/draft4/optional/id.json
@@ -33,8 +33,8 @@
 			]
 		},
 		"skip": {
-			"v2": "extract error: keyword \"const\" is not supported in JSON schema version http://json-schema.org/draft-04/schema#",
-			"v3": "extract error: keyword \"const\" is not supported in JSON schema version http://json-schema.org/draft-04/schema#"
+			"v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/my_identifier.json:my_identifier\":\n    generated.cue:1:8\n",
+			"v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/my_identifier.json:my_identifier\":\n    generated.cue:1:8\n"
 		},
 		"tests": [
 			{
diff --git a/encoding/jsonschema/testdata/external/tests/draft4/ref.json b/encoding/jsonschema/testdata/external/tests/draft4/ref.json
@@ -329,8 +329,8 @@
 			]
 		},
 		"skip": {
-			"v2": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-04/schema# (and 1 more errors)",
-			"v3": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-04/schema# (and 1 more errors)"
+			"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": [
 			{
diff --git a/encoding/jsonschema/testdata/external/tests/draft6/optional/unknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft6/optional/unknownKeyword.json
@@ -42,8 +42,8 @@
 			]
 		},
 		"skip": {
-			"v2": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)",
-			"v3": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)"
+			"v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/unknownKeyword/my_identifier.json:my_identifier\":\n    generated.cue:1:8\n",
+			"v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/unknownKeyword/my_identifier.json:my_identifier\":\n    generated.cue:1:8\n"
 		},
 		"tests": [
 			{
diff --git a/encoding/jsonschema/testdata/external/tests/draft6/ref.json b/encoding/jsonschema/testdata/external/tests/draft6/ref.json
@@ -329,8 +329,8 @@
 			]
 		},
 		"skip": {
-			"v2": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema# (and 1 more errors)",
-			"v3": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema# (and 1 more errors)"
+			"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": [
 			{
@@ -993,32 +993,20 @@
 				}
 			}
 		},
-		"skip": {
-			"v2": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#",
-			"v3": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#"
-		},
 		"tests": [
 			{
 				"description": "valid under the URN IDed schema",
 				"data": {
 					"foo": 37
 				},
-				"valid": true,
-				"skip": {
-					"v2": "could not compile schema",
-					"v3": "could not compile schema"
-				}
+				"valid": true
 			},
 			{
 				"description": "invalid under the URN IDed schema",
 				"data": {
 					"foo": 12
 				},
-				"valid": false,
-				"skip": {
-					"v2": "could not compile schema",
-					"v3": "could not compile schema"
-				}
+				"valid": false
 			}
 		]
 	},
@@ -1038,32 +1026,20 @@
 				}
 			}
 		},
-		"skip": {
-			"v2": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#",
-			"v3": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#"
-		},
 		"tests": [
 			{
 				"description": "a string is valid",
 				"data": {
 					"foo": "bar"
 				},
-				"valid": true,
-				"skip": {
-					"v2": "could not compile schema",
-					"v3": "could not compile schema"
-				}
+				"valid": true
 			},
 			{
 				"description": "a non-string is invalid",
 				"data": {
 					"foo": 12
 				},
-				"valid": false,
-				"skip": {
-					"v2": "could not compile schema",
-					"v3": "could not compile schema"
-				}
+				"valid": false
 			}
 		]
 	},
@@ -1083,32 +1059,20 @@
 				}
 			}
 		},
-		"skip": {
-			"v2": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#",
-			"v3": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#"
-		},
 		"tests": [
 			{
 				"description": "a string is valid",
 				"data": {
 					"foo": "bar"
 				},
-				"valid": true,
-				"skip": {
-					"v2": "could not compile schema",
-					"v3": "could not compile schema"
-				}
+				"valid": true
 			},
 			{
 				"description": "a non-string is invalid",
 				"data": {
 					"foo": 12
 				},
-				"valid": false,
-				"skip": {
-					"v2": "could not compile schema",
-					"v3": "could not compile schema"
-				}
+				"valid": false
 			}
 		]
 	},
@@ -1128,32 +1092,20 @@
 				}
 			}
 		},
-		"skip": {
-			"v2": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#",
-			"v3": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#"
-		},
 		"tests": [
 			{
 				"description": "a string is valid",
 				"data": {
 					"foo": "bar"
 				},
-				"valid": true,
-				"skip": {
-					"v2": "could not compile schema",
-					"v3": "could not compile schema"
-				}
+				"valid": true
 			},
 			{
 				"description": "a non-string is invalid",
 				"data": {
 					"foo": 12
 				},
-				"valid": false,
-				"skip": {
-					"v2": "could not compile schema",
-					"v3": "could not compile schema"
-				}
+				"valid": false
 			}
 		]
 	},
@@ -1173,32 +1125,20 @@
 				}
 			}
 		},
-		"skip": {
-			"v2": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#",
-			"v3": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-06/schema#"
-		},
 		"tests": [
 			{
 				"description": "a string is valid",
 				"data": {
 					"foo": "bar"
 				},
-				"valid": true,
-				"skip": {
-					"v2": "could not compile schema",
-					"v3": "could not compile schema"
-				}
+				"valid": true
 			},
 			{
 				"description": "a non-string is invalid",
 				"data": {
 					"foo": 12
 				},
-				"valid": false,
-				"skip": {
-					"v2": "could not compile schema",
-					"v3": "could not compile schema"
-				}
+				"valid": false
 			}
 		]
 	},
diff --git a/encoding/jsonschema/testdata/external/tests/draft7/optional/unknownKeyword.json b/encoding/jsonschema/testdata/external/tests/draft7/optional/unknownKeyword.json
@@ -42,8 +42,8 @@
 			]
 		},
 		"skip": {
-			"v2": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)",
-			"v3": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)"
+			"v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/unknownKeyword/my_identifier.json:my_identifier\":\n    generated.cue:1:8\n",
+			"v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/unknownKeyword/my_identifier.json:my_identifier\":\n    generated.cue:1:8\n"
 		},
 		"tests": [
 			{

Original file line number	Diff line number	Diff line change
`@@ -34,11 +34,11 @@ func constraintID(key string, n cue.Value, s *state) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`if u.Fragment != "" {`
`37`		`- // TODO do not use Strict for this. The specification is clear:`
	`37`	`+ // TODO do not use StrictFeatures for this. The specification is clear:`
`38`	`38`	`// before 2019-09, IDs could contain plain-name fragments;`
`39`	`39`	`// (see https://json-schema.org/draft-07/draft-handrews-json-schema-01#rfc.section.5)`
`40`	`40`	`// afterwards, $anchor was reserved for that purpose.`
`41`		`- if s.cfg.Strict {`
	`41`	`+ if s.cfg.StrictFeatures {`
`42`	`42`	`s.errf(n, "$id URI may not contain a fragment")`
`43`	`43`	`}`
`44`	`44`	`return`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func runExternalSchemaTests(t testing.T, m cuetdtest.M, filename string, s *ex`
`92`	`92`	`t.Skipf("skipping test for unknown schema version %v", versStr)`
`93`	`93`	`}`
`94`	`94`	`schemaAST, extractErr := jsonschema.Extract(jsonValue, &jsonschema.Config{`
`95`		`- Strict: true,`
	`95`	`+ StrictFeatures: true,`
`96`	`96`	`DefaultVersion: vers,`
`97`	`97`	`})`
`98`	`98`	`var schemaValue cue.Value`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@`
`13`	`13`	`}`
`14`	`14`	`},`
`15`	`15`	`"skip": {`
`16`		`- "v2": "extract error: unknown keyword \"unknown-keyword\"",`
`17`		`- "v3": "extract error: unknown keyword \"unknown-keyword\""`
	`16`	`+ "v2": "extract error: cannot compile resulting schema: bar: reference \"_X0\" not found:\n generated.cue:3:8\n",`
	`17`	`+ "v3": "extract error: cannot compile resulting schema: bar: reference \"_X0\" not found:\n generated.cue:3:8\n"`
`18`	`18`	`},`
`19`	`19`	`"tests": [`
`20`	`20`	`{`
`@@ -57,8 +57,8 @@`
`57`	`57`	`}`
`58`	`58`	`},`
`59`	`59`	`"skip": {`
`60`		`- "v2": "extract error: unknown keyword \"unknown-keyword\"",`
`61`		`- "v3": "extract error: unknown keyword \"unknown-keyword\""`
	`60`	`+ "v2": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n",`
	`61`	`+ "v3": "extract error: cannot compile resulting schema: bar: reference \"foo\" not found:\n generated.cue:4:10\n"`
`62`	`62`	`},`
`63`	`63`	`"tests": [`
`64`	`64`	`{`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,8 @@`
`43`	`43`	`]`
`44`	`44`	`},`
`45`	`45`	`"skip": {`
`46`		`- "v2": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)",`
`47`		`- "v3": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)"`
	`46`	`+ "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/unknownKeyword/my_identifier.json:my_identifier\":\n generated.cue:1:8\n",`
	`47`	`+ "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/draft2019-09/unknownKeyword/my_identifier.json:my_identifier\":\n generated.cue:1:8\n"`
`48`	`48`	`},`
`49`	`49`	`"tests": [`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,8 @@`
`33`	`33`	`]`
`34`	`34`	`},`
`35`	`35`	`"skip": {`
`36`		`- "v2": "extract error: keyword \"const\" is not supported in JSON schema version http://json-schema.org/draft-04/schema#",`
`37`		`- "v3": "extract error: keyword \"const\" is not supported in JSON schema version http://json-schema.org/draft-04/schema#"`
	`36`	`+ "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/my_identifier.json:my_identifier\":\n generated.cue:1:8\n",`
	`37`	`+ "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/my_identifier.json:my_identifier\":\n generated.cue:1:8\n"`
`38`	`38`	`},`
`39`	`39`	`"tests": [`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -329,8 +329,8 @@`
`329`	`329`	`]`
`330`	`330`	`},`
`331`	`331`	`"skip": {`
`332`		`- "v2": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-04/schema# (and 1 more errors)",`
`333`		`- "v3": "extract error: keyword \"$comment\" is not supported in JSON schema version http://json-schema.org/draft-04/schema# (and 1 more errors)"`
	`332`	`+ "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/sibling_id/foo.json:foo\":\n generated.cue:1:8\n",`
	`333`	`+ "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/sibling_id/foo.json:foo\":\n generated.cue:1:8\n"`
`334`	`334`	`},`
`335`	`335`	`"tests": [`
`336`	`336`	`{`
Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,8 @@`
`42`	`42`	`]`
`43`	`43`	`},`
`44`	`44`	`"skip": {`
`45`		`- "v2": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)",`
`46`		`- "v3": "extract error: unknown keyword \"array_of_schemas\" (and 1 more errors)"`
	`45`	`+ "v2": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/unknownKeyword/my_identifier.json:my_identifier\":\n generated.cue:1:8\n",`
	`46`	`+ "v3": "extract error: cannot compile resulting schema: invalid import path: \"localhost:1234/unknownKeyword/my_identifier.json:my_identifier\":\n generated.cue:1:8\n"`
`47`	`47`	`},`
`48`	`48`	`"tests": [`
`49`	`49`	`{`