squash: use a unique $id to prevent namespace collisions across tests

Author: karenetheridge

tests/draft2019-09/ref.json

@@ -580,17 +580,17 @@
         "description": "order of evaluation: $id and $ref",
         "schema": {
             "$comment": "$id must be evaluated before $ref to get the proper $ref destination",
-            "$id": "/base/base.json",
+            "$id": "/ref-and-id1/base.json",
             "$ref": "int.json",
             "$defs": {
                 "bigint": {
-                    "$comment": "canonical uri: /base/int.json",
+                    "$comment": "canonical uri: /ref-and-id1/int.json",
                     "$id": "int.json",
                     "maximum": 10
                 },
                 "smallint": {
-                    "$comment": "canonical uri: /int.json",
-                    "$id": "/int.json",
+                    "$comment": "canonical uri: /ref-and-id1-int.json",
+                    "$id": "/ref-and-id1-int.json",
                     "maximum": 2
                 }
             }
@@ -612,17 +612,17 @@
         "description": "order of evaluation: $id and $anchor and $ref",
         "schema": {
             "$comment": "$id must be evaluated before $ref to get the proper $ref destination",
-            "$id": "/base.json",
+            "$id": "/ref-and-id2/base.json",
             "$ref": "#bigint",
             "$defs": {
                 "bigint": {
-                    "$comment": "canonical uri: /base.json#/$defs/bigint; another valid uri for this location: /base.json#bigint",
+                    "$comment": "canonical uri: /ref-and-id2/base.json/$defs/bigint; another valid uri for this location: /ref-and-id2/base.json#bigint",
                     "$anchor": "bigint",
                     "maximum": 10
                 },
                 "smallint": {
-                    "$comment": "canonical uri: /#/$defs/smallint; another valid uri for this location: /#bigint",
-                    "$id": "/",
+                    "$comment": "canonical uri: /ref-and-id2#/$defs/smallint; another valid uri for this location: /ref-and-id2/#bigint",
+                    "$id": "/ref-and-id2/",
                     "$anchor": "bigint",
                     "maximum": 2
                 }

tests/draft7/ref.json

@@ -649,17 +649,17 @@
         "description": "order of evaluation: $id and $ref",
         "schema": {
             "$comment": "$id must be evaluated before $ref to get the proper $ref destination",
-            "$id": "/base/base.json",
+            "$id": "/ref-and-id1/base.json",
             "$ref": "int.json",
             "$defs": {
                 "bigint": {
-                    "$comment": "canonical uri: /base/int.json",
+                    "$comment": "canonical uri: /ref-and-id1/int.json",
                     "$id": "int.json",
                     "maximum": 10
                 },
                 "smallint": {
-                    "$comment": "canonical uri: /int.json",
-                    "$id": "/int.json",
+                    "$comment": "canonical uri: /ref-and-id1-int.json",
+                    "$id": "/ref-and-id1-int.json",
                     "maximum": 2
                 }
             }
@@ -678,19 +678,19 @@
         ]
     },
     {
-        "description": "order of evaluation: plain-name $id and $ref",
+        "description": "order of evaluation: $id and $anchor and $ref",
         "schema": {
             "$comment": "$id must be evaluated before $ref to get the proper $ref destination",
-            "$id": "/base.json",
+            "$id": "/ref-and-id2/base.json",
             "$ref": "#bigint",
             "$defs": {
                 "bigint": {
-                    "$comment": "canonical uri: /base.json#/$defs/bigint; another valid uri for this location: /base.json#bigint",
+                    "$comment": "canonical uri: /ref-and-id2/base.json/$defs/bigint; another valid uri for this location: /ref-and-id2/base.json#bigint",
                     "$id": "#bigint",
                     "maximum": 10
                 },
                 "smallint": {
-                    "$comment": "canonical uri: /#/$defs/smallint; another valid uri for this location: /#bigint",
+                    "$comment": "canonical uri: /ref-and-id2#/$defs/smallint; another valid uri for this location: /ref-and-id2/#bigint",
                     "$id": "/#bigint",
                     "maximum": 2
                 }