Squashed 'json/' changes from 20c1bb1d9..54440eab4

54440eab4 Merge pull request #516 from ChALkeR/chalker/ipv6
e7b22e1c6 Fix the sanity check by pinning.
8891d8107 Merge pull request #519 from json-schema-org/ether/custom-dialect
5f5fccda3 test the format-assertion vocabulary with a custom metaschema
3fcee3868 Merge pull request #512 from json-schema-org/ether/formats-and-non-strings
b349b8797 test that format-assertions are valid with non-string types
8e5b2f10d fix needless inconsistencies in format tests between drafts
02d7cb59a Correct "ref with sibling id" tests
1649470ba More ipv6 tests to increase coverage
7334b4c7e Merge pull request #505 from ChALkeR/chalker/fix-unicode
0fb2d2787 Consolidate optional/unicode into optional/ecmascript-regex
4f8c6d7bf unevaluatedProperties: deep dynamic + refs
9103f3b6f $ref wit id does not test what it is indented to do
f300dd15f Add test "same $anchor with different base uri"
d128f9d7f Add test to check that $id resolved against nearest parent, not just immediate parent
72e31dd20 Merge pull request #515 from json-schema-org/ether/fix-mandatory-format-tests
0173a0835 Revert "by default, "format" only annotates, not validates"
66e813a90 Merge pull request #506 from json-schema-org/ether/formats-non-ascii
9430972bc fix unicode tests in accordance to pattern/patternProperties spec

git-subtree-dir: json
git-subtree-split: 54440eab4d50b80a62cc9f9c561e306cdbb19591

11 files changed, 18 insertions, 18 deletions

diff --git a/tests/draft3/optional/format/color.json b/tests/draft3/optional/format/color.json
index e80cb69..0c0b534 100644
--- a/tests/draft3/optional/format/color.json
+++ b/tests/draft3/optional/format/color.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "validation of CSS colors",
-        "schema": {"format": "color"},
+        "schema": { "format": "color" },
         "tests": [
             {
                 "description": "a valid CSS color name",
diff --git a/tests/draft3/optional/format/date-time.json b/tests/draft3/optional/format/date-time.json
index 58261fa..1f1e6fb 100644
--- a/tests/draft3/optional/format/date-time.json
+++ b/tests/draft3/optional/format/date-time.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "validation of date-time strings",
-        "schema": {"format": "date-time"},
+        "schema": { "format": "date-time" },
         "tests": [
             {
                 "description": "a valid date-time string",
diff --git a/tests/draft3/optional/format/date.json b/tests/draft3/optional/format/date.json
index 554fe54..796bc46 100644
--- a/tests/draft3/optional/format/date.json
+++ b/tests/draft3/optional/format/date.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "validation of date strings",
-        "schema": {"format": "date"},
+        "schema": { "format": "date" },
         "tests": [
             {
                 "description": "a valid date string",
diff --git a/tests/draft3/optional/format/email.json b/tests/draft3/optional/format/email.json
index 02396d2..059615a 100644
--- a/tests/draft3/optional/format/email.json
+++ b/tests/draft3/optional/format/email.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "validation of e-mail addresses",
-        "schema": {"format": "email"},
+        "schema": { "format": "email" },
         "tests": [
             {
                 "description": "a valid e-mail address",
diff --git a/tests/draft3/optional/format/host-name.json b/tests/draft3/optional/format/host-name.json
index 8f6e28a..d418f37 100644
--- a/tests/draft3/optional/format/host-name.json
+++ b/tests/draft3/optional/format/host-name.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "validation of host names",
-        "schema": {"format": "host-name"},
+        "schema": { "format": "host-name" },
         "tests": [
             {
                 "description": "a valid host name",
diff --git a/tests/draft3/optional/format/ip-address.json b/tests/draft3/optional/format/ip-address.json
index c868bfb..91cac9f 100644
--- a/tests/draft3/optional/format/ip-address.json
+++ b/tests/draft3/optional/format/ip-address.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "validation of IP addresses",
-        "schema": {"format": "ip-address"},
+        "schema": { "format": "ip-address" },
         "tests": [
             {
                 "description": "a valid IP address",
diff --git a/tests/draft3/optional/format/ipv6.json b/tests/draft3/optional/format/ipv6.json
index 131edb8..c3ef379 100644
--- a/tests/draft3/optional/format/ipv6.json
+++ b/tests/draft3/optional/format/ipv6.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "validation of IPv6 addresses",
-        "schema": {"format": "ipv6"},
+        "schema": { "format": "ipv6" },
         "tests": [
             {
                 "description": "a valid IPv6 address",
diff --git a/tests/draft3/optional/format/regex.json b/tests/draft3/optional/format/regex.json
index d99d021..8a37763 100644
--- a/tests/draft3/optional/format/regex.json
+++ b/tests/draft3/optional/format/regex.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "validation of regular expressions",
-        "schema": {"format": "regex"},
+        "schema": { "format": "regex" },
         "tests": [
             {
                 "description": "a valid regular expression",
diff --git a/tests/draft3/optional/format/time.json b/tests/draft3/optional/format/time.json
index e97160d..36c823e 100644
--- a/tests/draft3/optional/format/time.json
+++ b/tests/draft3/optional/format/time.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "validation of time strings",
-        "schema": {"format": "time"},
+        "schema": { "format": "time" },
         "tests": [
             {
                 "description": "a valid time string",
diff --git a/tests/draft3/optional/format/uri.json b/tests/draft3/optional/format/uri.json
index 9c4de35..f024b62 100644
--- a/tests/draft3/optional/format/uri.json
+++ b/tests/draft3/optional/format/uri.json
@@ -1,7 +1,7 @@
 [
     {
         "description": "validation of URIs",
-        "schema": {"format": "uri"},
+        "schema": { "format": "uri" },
         "tests": [
             {
                 "description": "a valid URI",
diff --git a/tests/draft3/ref.json b/tests/draft3/ref.json
index 46dd82d..924db76 100644
--- a/tests/draft3/ref.json
+++ b/tests/draft3/ref.json
@@ -207,17 +207,17 @@
             "definitions": {
                 "foo": {
                     "id": "http://localhost:1234/sibling_id/foo.json",
-                    "minimum": 2
+                    "type": "string"
                 },
                 "base_foo": {
                     "$comment": "this canonical uri is http://localhost:1234/sibling_id/base/foo.json",
                     "id": "foo.json",
-                    "minimum": 5
+                    "type": "number"
                 }
             },
             "allOf": [
                 {
-                    "$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not ttp://localhost:1234/sibling_id/foo.json",
+                    "$comment": "$ref resolves to http://localhost:1234/sibling_id/base/foo.json, not http://localhost:1234/sibling_id/foo.json",
                     "id": "http://localhost:1234/sibling_id/",
                     "$ref": "foo.json"
                 }
@@ -225,14 +225,14 @@
         },
         "tests": [
             {
-                "description": "$ref resolves to /definitions/foo, data validates",
-                "data": 10,
-                "valid": true
+                "description": "$ref resolves to /definitions/base_foo, data does not validate",
+                "data": "a",
+                "valid": false
             },
             {
-                "description": "$ref resolves to /definitions/foo, data does not validate",
+                "description": "$ref resolves to /definitions/base_foo, data validates",
                 "data": 1,
-                "valid": false
+                "valid": true
             }
         ]
     },