summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Berman <Julian@GrayVines.com>2015-03-22 13:31:49 -0400
committerJulian Berman <Julian@GrayVines.com>2015-03-22 13:31:49 -0400
commite886fd27a6a276c784f4e8af99412950208f3f7b (patch)
tree1435f82f187acfdc6a1cb9a681cb38cb73388026
parent45cf1fb8a6a0b7ea1ab8de8ea9fc7addb0ffd149 (diff)
downloadjsonschema-e886fd27a6a276c784f4e8af99412950208f3f7b.tar.gz
Squashed 'json/' changes from 9208016..0b657e8
0b657e8 Merge pull request #86 from kylef/patch-1 1bd4151 [README] JSONSchema.swift uses these tests too 8f86716 Revert "Add jon, JSON parser for the fishshell." db9c629 Merge pull request #82 from bucaran/patch-1 875fa42 Add jon, JSON parser for the fishshell. 64c556c Merge pull request #81 from s-panferov/patch-1 43105d4 Add new Rust library to the list aa4d927 Merge pull request #80 from seagreen/implementations 20ef067 Add new haskell implementation. 1274070 Merge pull request #79 from Muscula/json-schema-benchmark 6d8cf45 Merge pull request #78 from JamesNK/patch-1 55c4992 Add json-schema-benchmark to list of users of this test suite 645623d Added Newtonsoft.Json.Schema implementation a7944d1 Merge pull request #76 from Prestaul/patch-1 5729cdf Added skeemas to list of suite users 4600fe3 Make the implementation list a bit less unwieldy now that it's so long (hooray!) 11d6905 Merge remote-tracking branch 'mafintosh/patch-1' into develop 689b80f Merge pull request #74 from bugventure/develop c36f888 Add request-validator as a user of the test suite 41876b1 Update README.md aabcb34 Merge pull request #71 from seagreen/additionalproperties b3d160b Add tests for additionalProperties by itself. git-subtree-dir: json git-subtree-split: 0b657e8b0d21a4099d3ce378ba7208073a9295e6
-rw-r--r--README.md80
-rw-r--r--tests/draft3/additionalProperties.json19
-rw-r--r--tests/draft4/additionalProperties.json19
3 files changed, 101 insertions, 17 deletions
diff --git a/README.md b/README.md
index 7c4cfbf..aa63a6c 100644
--- a/README.md
+++ b/README.md
@@ -60,23 +60,69 @@ Who Uses the Test Suite
This suite is being used by:
- * [jsck (a fast JSON validator in CoffeeScript)](https://github.com/pandastrike/jsck)
- * [json-schema-validator (Java)](https://github.com/fge/json-schema-validator)
- * [jsonschema (python)](https://github.com/Julian/jsonschema)
- * [aeson-schema (haskell)](https://github.com/timjb/aeson-schema)
- * [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)
- * [jassi (javascript)](https://github.com/iclanzan/jassi)
- * [json-schema-valid (javascript)](https://github.com/ericgj/json-schema-valid)
- * [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)
- * [tv4 (JavaScript)](https://github.com/geraintluff/tv4)
- * [Jsonary (JavaScript)](https://github.com/jsonary-js/jsonary)
- * [json-schema (Ruby)](https://github.com/hoxworth/json-schema)
+### Coffeescript ###
+
+* [jsck](https://github.com/pandastrike/jsck)
+
+### Dart ###
+
+* [json_schema](https://github.com/patefacio/json_schema)
+
+### Erlang ###
+
+* [jesse](https://github.com/klarna/jesse)
+
+### Go ###
+
+* [gojsonschema](https://github.com/sigu-399/gojsonschema)
+
+### Haskell ###
+
+* [aeson-schema](https://github.com/timjb/aeson-schema)
+* [hjsonschema](https://github.com/seagreen/hjsonschema)
+
+### Java ###
+
+* [json-schema-validator](https://github.com/fge/json-schema-validator)
+
+### Javascript ###
+
+* [json-schema-benchmark](https://github.com/Muscula/json-schema-benchmark)
+* [direct-schema](https://github.com/IreneKnapp/direct-schema)
+* [is-my-json-valid](https://github.com/mafintosh/is-my-json-valid)
+* [jassi](https://github.com/iclanzan/jassi)
+* [JaySchema](https://github.com/natesilva/jayschema)
+* [json-schema-valid](https://github.com/ericgj/json-schema-valid)
+* [Jsonary](https://github.com/jsonary-js/jsonary)
+* [jsonschema](https://github.com/tdegrunt/jsonschema)
+* [request-validator](https://github.com/bugventure/request-validator)
+* [skeemas](https://github.com/Prestaul/skeemas)
+* [tv4](https://github.com/geraintluff/tv4)
+* [z-schema](https://github.com/zaggino/z-schema)
+
+### .NET ###
+
+* [Newtonsoft.Json.Schema](https://github.com/JamesNK/Newtonsoft.Json.Schema)
+
+### PHP ###
+
+* [json-schema](https://github.com/justinrainbow/json-schema)
+
+### Python ###
+
+* [jsonschema](https://github.com/Julian/jsonschema)
+
+### Ruby ###
+
+* [json-schema](https://github.com/hoxworth/json-schema)
+
+### Rust ###
+
+* [valico](https://github.com/rustless/valico)
+
+### Swift ###
+
+* [JSONSchema](https://github.com/kylef/JSONSchema.swift)
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 eb334c9..40831f9 100644
--- a/tests/draft3/additionalProperties.json
+++ b/tests/draft3/additionalProperties.json
@@ -56,6 +56,25 @@
]
},
{
+ "description":
+ "additionalProperties can exist by itself",
+ "schema": {
+ "additionalProperties": {"type": "boolean"}
+ },
+ "tests": [
+ {
+ "description": "an additional valid property is valid",
+ "data": {"foo" : true},
+ "valid": true
+ },
+ {
+ "description": "an additional invalid property is invalid",
+ "data": {"foo" : 1},
+ "valid": false
+ }
+ ]
+ },
+ {
"description": "additionalProperties are allowed by default",
"schema": {"properties": {"foo": {}, "bar": {}}},
"tests": [
diff --git a/tests/draft4/additionalProperties.json b/tests/draft4/additionalProperties.json
index eb334c9..40831f9 100644
--- a/tests/draft4/additionalProperties.json
+++ b/tests/draft4/additionalProperties.json
@@ -56,6 +56,25 @@
]
},
{
+ "description":
+ "additionalProperties can exist by itself",
+ "schema": {
+ "additionalProperties": {"type": "boolean"}
+ },
+ "tests": [
+ {
+ "description": "an additional valid property is valid",
+ "data": {"foo" : true},
+ "valid": true
+ },
+ {
+ "description": "an additional invalid property is invalid",
+ "data": {"foo" : 1},
+ "valid": false
+ }
+ ]
+ },
+ {
"description": "additionalProperties are allowed by default",
"schema": {"properties": {"foo": {}, "bar": {}}},
"tests": [