summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Berman <Julian@GrayVines.com>2013-09-22 11:06:50 -0400
committerJulian Berman <Julian@GrayVines.com>2013-09-22 11:06:50 -0400
commit1b3cbc4556645258bd511f8970aea1dd945c59a5 (patch)
tree91b9e93e334b320fdf26da20aa4f420073d91b35
parent292a256b918af1e567982bb801c427cf4ca5b9fe (diff)
parent7b74ec8aa8f2b3414cb70ffa0e5a8fe3d1e24bcd (diff)
downloadjsonschema-1b3cbc4556645258bd511f8970aea1dd945c59a5.tar.gz
Merge commit '7b74ec8aa8f2b3414cb70ffa0e5a8fe3d1e24bcd'
* commit '7b74ec8aa8f2b3414cb70ffa0e5a8fe3d1e24bcd': Squashed 'json/' changes from 9dc2c40..b6f129e
-rw-r--r--json/README.md3
-rw-r--r--json/tests/draft3/additionalProperties.json6
-rw-r--r--json/tests/draft4/additionalProperties.json6
3 files changed, 15 insertions, 0 deletions
diff --git a/json/README.md b/json/README.md
index 03a2c56..4320685 100644
--- a/json/README.md
+++ b/json/README.md
@@ -66,8 +66,11 @@ This suite is being used by:
* [direct-schema (javascript)](https://github.com/IreneKnapp/direct-schema)
* [jsonschema (javascript)](https://github.com/tdegrunt/jsonschema)
* [JaySchema (javascript)](https://github.com/natesilva/jayschema)
+ * [z-schema (javascript)](https://github.com/zaggino/z-schema)
* [jesse (Erlang)](https://github.com/klarna/jesse)
* [json-schema (PHP)](https://github.com/justinrainbow/json-schema)
+ * [gojsonschema (Go)](https://github.com/sigu-399/gojsonschema)
+ * [json_schema (Dart)](https://github.com/patefacio/json_schema)
If you use it as well, please fork and send a pull request adding yourself to
the list :).
diff --git a/json/tests/draft3/additionalProperties.json b/json/tests/draft3/additionalProperties.json
index c997f75..eb334c9 100644
--- a/json/tests/draft3/additionalProperties.json
+++ b/json/tests/draft3/additionalProperties.json
@@ -4,6 +4,7 @@
"additionalProperties being false does not allow other properties",
"schema": {
"properties": {"foo": {}, "bar": {}},
+ "patternProperties": { "^v": {} },
"additionalProperties": false
},
"tests": [
@@ -21,6 +22,11 @@
"description": "ignores non-objects",
"data": [1, 2, 3],
"valid": true
+ },
+ {
+ "description": "patternProperties are not additional properties",
+ "data": {"foo":1, "vroom": 2},
+ "valid": true
}
]
},
diff --git a/json/tests/draft4/additionalProperties.json b/json/tests/draft4/additionalProperties.json
index c997f75..eb334c9 100644
--- a/json/tests/draft4/additionalProperties.json
+++ b/json/tests/draft4/additionalProperties.json
@@ -4,6 +4,7 @@
"additionalProperties being false does not allow other properties",
"schema": {
"properties": {"foo": {}, "bar": {}},
+ "patternProperties": { "^v": {} },
"additionalProperties": false
},
"tests": [
@@ -21,6 +22,11 @@
"description": "ignores non-objects",
"data": [1, 2, 3],
"valid": true
+ },
+ {
+ "description": "patternProperties are not additional properties",
+ "data": {"foo":1, "vroom": 2},
+ "valid": true
}
]
},