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
commit7b74ec8aa8f2b3414cb70ffa0e5a8fe3d1e24bcd (patch)
treec46bcbd6222b041b385c3149211e77ceb700916f
parent0a93c5da6f8db71ded773af1d5609c5f2e6ba241 (diff)
downloadjsonschema-7b74ec8aa8f2b3414cb70ffa0e5a8fe3d1e24bcd.tar.gz
Squashed 'json/' changes from 9dc2c40..b6f129e
b6f129e patternProperties are not additionalProperties in draft3 either. 20fe647 Merge remote-tracking branch 'tolsen/patternProperties-are-not-additionalProperties' into develop 1fefae5 add test to draft4 that checks that patternProperties are not counted as additionalProperties 013a878 Merge pull request #44 from patefacio/develop 61705ec added entry for Dart 91febf4 Merge pull request #43 from zaggino/develop 0cf679f Added z-schema to the list f5f3d58 Merge pull request #42 from sigu-399/develop c029bbc Update README.md git-subtree-dir: json git-subtree-split: b6f129ea97c216490a7363843ee1946c9a3f2354
-rw-r--r--README.md3
-rw-r--r--tests/draft3/additionalProperties.json6
-rw-r--r--tests/draft4/additionalProperties.json6
3 files changed, 15 insertions, 0 deletions
diff --git a/README.md b/README.md
index 03a2c56..4320685 100644
--- a/README.md
+++ b/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/tests/draft3/additionalProperties.json b/tests/draft3/additionalProperties.json
index c997f75..eb334c9 100644
--- a/tests/draft3/additionalProperties.json
+++ b/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/tests/draft4/additionalProperties.json b/tests/draft4/additionalProperties.json
index c997f75..eb334c9 100644
--- a/tests/draft4/additionalProperties.json
+++ b/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
}
]
},