Fix calculation of evaluated properties

json/README.md

@@ -109,7 +109,7 @@ To test a specific version:
 
 * For 2019-09 and later published drafts, implementations that are able to detect the draft of each schema via `$schema` SHOULD be configured to do so
 * For draft-07 and earlier, draft-next, and implementations unable to detect via `$schema`, implementations MUST be configured to expect the draft matching the test directory name
-* Load any remote references [described below](#additional-assumptions) and configure your implementation to retrieve them via their URIs
+* Load any remote references [described below](additional-assumptions) and configure your implementation to retrieve them via their URIs
 * Walk the filesystem tree for that version's subdirectory and for each `.json` file found:
 
     * if the file is located in the root of the version directory:
@@ -159,7 +159,7 @@ If your implementation supports multiple versions, run the above procedure for e
     ```
 
 2. Test cases found within [special subdirectories](#subdirectories-within-each-draft) may require additional configuration to run.
-   In particular, when running tests within the `optional/format` subdirectory, test runners should configure implementations to enable format validation, where the implementation supports it.
+   In particular, tests within the `optional/format` subdirectory may require implementations to change the way they treat the `"format"`keyword (particularly on older drafts which did not have a notion of vocabularies).
 
 ### Invariants & Guarantees
 
@@ -254,14 +254,12 @@ This suite is being used by:
 
 ### Java
 
-* [json-schema-validation-comparison](https://www.creekservice.org/json-schema-validation-comparison/functional) (Comparison site for JVM-based validator implementations)
 * [json-schema-validator](https://github.com/daveclayton/json-schema-validator)
 * [everit-org/json-schema](https://github.com/everit-org/json-schema)
 * [networknt/json-schema-validator](https://github.com/networknt/json-schema-validator)
 * [Justify](https://github.com/leadpony/justify)
 * [Snow](https://github.com/ssilverman/snowy-json)
 * [jsonschemafriend](https://github.com/jimblackler/jsonschemafriend)
-* [OpenAPI JSON Schema Generator](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator)
 
 ### JavaScript
 
@@ -281,10 +279,6 @@ This suite is being used by:
 * [ajv](https://github.com/epoberezkin/ajv)
 * [djv](https://github.com/korzio/djv)
 
-### Kotlin
-
-* [json-schema-validation-comparison](https://www.creekservice.org/json-schema-validation-comparison/functional) (Comparison site for JVM-based validator implementations)
-
 ### Node.js
 
 For node.js developers, the suite is also available as an [npm](https://www.npmjs.com/package/@json-schema-org/tests) package.
@@ -293,7 +287,7 @@ Node-specific support is maintained in a [separate repository](https://github.co
 
 ### .NET
 
-* [JsonSchema.Net](https://github.com/json-everything/json-everything)
+* [JsonSchema.Net](https://github.com/gregsdennis/json-everything)
 * [Newtonsoft.Json.Schema](https://github.com/JamesNK/Newtonsoft.Json.Schema)
 
 ### Perl
@@ -319,7 +313,7 @@ Node-specific support is maintained in a [separate repository](https://github.co
 * [fastjsonschema](https://github.com/seznam/python-fastjsonschema)
 * [hypothesis-jsonschema](https://github.com/Zac-HD/hypothesis-jsonschema)
 * [jschon](https://github.com/marksparkza/jschon)
-* [OpenAPI JSON Schema Generator](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator)
+* [python-experimental, OpenAPI Generator](https://github.com/OpenAPITools/openapi-generator/blob/master/docs/generators/python-experimental.md)
 
 ### Ruby
 
@@ -333,13 +327,11 @@ Node-specific support is maintained in a [separate repository](https://github.co
 
 ### Scala
 
-* [json-schema-validation-comparison](https://www.creekservice.org/json-schema-validation-comparison/functional) (Comparison site for JVM-based validator implementations)
 * [typed-json](https://github.com/frawa/typed-json)
 
 ### Swift
 
 * [JSONSchema](https://github.com/kylef/JSONSchema.swift)
-* [swift-json-schema](https://github.com/ajevans99/swift-json-schema)
 
 If you use it as well, please fork and send a pull request adding yourself to
 the list :).

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

@@ -31,6 +31,32 @@
                         "required": ["errors"]
                     }
                 }
+            },
+            {
+                "description": "correct type yields an output unit",
+                "data": "a string",
+                "output": {
+                    "basic": {
+                        "$id": "https://json-schema.org/tests/content/draft2019-09/type/0/tests/1/basic",
+                        "$ref": "/draft/2019-09/output/schema",
+                        "properties": {
+                            "annotations": {
+                                "contains": {
+                                    "properties": {
+                                        "valid": {"const": true},
+                                        "keywordLocation": {"const": "/type"},
+                                        "absoluteKeywordLocation": {"const": "https://json-schema.org/tests/content/draft2019-09/type/0#/type"},
+                                        "instanceLocation": {"const": ""},
+                                        "annotation": false,
+                                        "error": false
+                                    },
+                                    "required": ["keywordLocation", "instanceLocation"]
+                                }
+                            }
+                        },
+                        "required": ["annotations"]
+                    }
+                }
             }
         ]
     }

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

@@ -31,6 +31,32 @@
                         "required": ["errors"]
                     }
                 }
+            },
+            {
+                "description": "correct type yields an output unit",
+                "data": "a string",
+                "output": {
+                    "basic": {
+                        "$id": "https://json-schema.org/tests/content/draft2020-12/type/0/tests/1/basic",
+                        "$ref": "/draft/2020-12/output/schema",
+                        "properties": {
+                            "annotations": {
+                                "contains": {
+                                    "properties": {
+                                        "valid": {"const": true},
+                                        "keywordLocation": {"const": "/type"},
+                                        "absoluteKeywordLocation": {"const": "https://json-schema.org/tests/content/draft2020-12/type/0#/type"},
+                                        "instanceLocation": {"const": ""},
+                                        "annotation": false,
+                                        "error": false
+                                    },
+                                    "required": ["keywordLocation", "instanceLocation"]
+                                }
+                            }
+                        },
+                        "required": ["annotations"]
+                    }
+                }
             }
         ]
     }

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

@@ -5,7 +5,6 @@
         "https://json-schema.org/draft/next/vocab/core": true,
         "https://json-schema.org/draft/next/vocab/format-assertion": false
     },
-    "$dynamicAnchor": "meta",
     "allOf": [
         { "$ref": "https://json-schema.org/draft/next/meta/core" },
         { "$ref": "https://json-schema.org/draft/next/meta/format-assertion" }

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

@@ -5,7 +5,6 @@
         "https://json-schema.org/draft/next/vocab/core": true,
         "https://json-schema.org/draft/next/vocab/format-assertion": true
     },
-    "$dynamicAnchor": "meta",
     "allOf": [
         { "$ref": "https://json-schema.org/draft/next/meta/core" },
         { "$ref": "https://json-schema.org/draft/next/meta/format-assertion" }

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

@@ -5,7 +5,6 @@
         "https://json-schema.org/draft/next/vocab/applicator": true,
         "https://json-schema.org/draft/next/vocab/core": true
     },
-    "$dynamicAnchor": "meta",
     "allOf": [
         { "$ref": "https://json-schema.org/draft/next/meta/applicator" },
         { "$ref": "https://json-schema.org/draft/next/meta/core" }

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

@@ -6,7 +6,6 @@
         "https://json-schema.org/draft/next/vocab/core": true,
         "http://localhost:1234/draft/next/vocab/custom": false
     },
-    "$dynamicAnchor": "meta",
     "allOf": [
         { "$ref": "https://json-schema.org/draft/next/meta/validation" },
         { "$ref": "https://json-schema.org/draft/next/meta/core" }

json/remotes/draft-next/subSchemas-defs.json

@@ -0,0 +1,11 @@
+{
+    "$schema": "https://json-schema.org/draft/next/schema",
+    "$defs": {
+        "integer": {
+            "type": "integer"
+        },
+        "refToInteger": {
+            "$ref": "#/$defs/integer"
+        }
+    }
+}