rj_schema 0.2.5 → 1.0.2

data/ext/rj_schema/rapidjson/test/unittest/cursorstreamwrappertest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 //
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/documenttest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at
@@ -325,6 +325,8 @@ TEST(Document, Swap) {
     EXPECT_TRUE(d1.IsNull());
 
     // reset document, including allocator
+    // so clear o before so that it doesnt contain dangling elements
+    o.Clear();
     Document().Swap(d2);
     EXPECT_TRUE(d2.IsNull());
     EXPECT_NE(&d2.GetAllocator(), &a);

data/ext/rj_schema/rapidjson/test/unittest/dtoatest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/encodedstreamtest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/encodingstest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/filestreamtest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/fwdtest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/istreamwrappertest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/itoatest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 //
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/jsoncheckertest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/namespacetest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/ostreamwrappertest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/platformtest.cpp

@@ -0,0 +1,40 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2021 THL A29 Limited, a Tencent company, and Milo Yip.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#include "unittest.h"
+
+// see https://github.com/Tencent/rapidjson/issues/1448
+// including windows.h on purpose to provoke a compile time problem as GetObject is a 
+// macro that gets defined when windows.h is included
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+#include "rapidjson/document.h"
+#undef GetObject
+
+using namespace rapidjson;
+
+TEST(Platform, GetObject) {
+    Document doc;
+    doc.Parse(" { \"object\" : { \"pi\": 3.1416} } ");
+    EXPECT_TRUE(doc.IsObject());
+    EXPECT_TRUE(doc.HasMember("object"));
+    const Document::ValueType& o = doc["object"];
+    EXPECT_TRUE(o.IsObject());
+    Value::ConstObject sub = o.GetObject();
+    EXPECT_TRUE(sub.HasMember("pi"));
+    Value::ConstObject sub2 = o.GetObj();
+    EXPECT_TRUE(sub2.HasMember("pi"));
+}

data/ext/rj_schema/rapidjson/test/unittest/pointertest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at
@@ -475,7 +475,9 @@ TEST(Pointer, CopyConstructor) {
         EXPECT_EQ(1u, q.GetTokens()[1].length);
         EXPECT_STREQ("0", q.GetTokens()[1].name);
         EXPECT_EQ(0u, q.GetTokens()[1].index);
-        EXPECT_EQ(&p.GetAllocator(), &q.GetAllocator());
+        
+        // Copied pointer needs to have its own allocator
+        EXPECT_NE(&p.GetAllocator(), &q.GetAllocator());
     }
 
     // Static tokens
@@ -648,6 +650,52 @@ TEST(Pointer, Create) {
     }
 }
 
+static const char kJsonIds[] = "{\n"
+   "    \"id\": \"/root/\","
+   "    \"foo\":[\"bar\", \"baz\", {\"id\": \"inarray\", \"child\": 1}],\n"
+   "    \"int\" : 2,\n"
+   "    \"str\" : \"val\",\n"
+   "    \"obj\": {\"id\": \"inobj\", \"child\": 3},\n"
+   "    \"jbo\": {\"id\": true, \"child\": 4}\n"
+   "}";
+
+
+TEST(Pointer, GetUri) {
+    CrtAllocator allocator;
+    Document d;
+    d.Parse(kJsonIds);
+    Pointer::UriType doc("http://doc");
+    Pointer::UriType root("http://doc/root/");
+    Pointer::UriType empty = Pointer::UriType();
+
+    EXPECT_TRUE(Pointer("").GetUri(d, doc) == doc);
+    EXPECT_TRUE(Pointer("/foo").GetUri(d, doc) == root);
+    EXPECT_TRUE(Pointer("/foo/0").GetUri(d, doc) == root);
+    EXPECT_TRUE(Pointer("/foo/2").GetUri(d, doc) == root);
+    EXPECT_TRUE(Pointer("/foo/2/child").GetUri(d, doc) == Pointer::UriType("http://doc/root/inarray"));
+    EXPECT_TRUE(Pointer("/int").GetUri(d, doc) == root);
+    EXPECT_TRUE(Pointer("/str").GetUri(d, doc) == root);
+    EXPECT_TRUE(Pointer("/obj").GetUri(d, doc) == root);
+    EXPECT_TRUE(Pointer("/obj/child").GetUri(d, doc) == Pointer::UriType("http://doc/root/inobj"));
+    EXPECT_TRUE(Pointer("/jbo").GetUri(d, doc) == root);
+    EXPECT_TRUE(Pointer("/jbo/child").GetUri(d, doc) == root); // id not string
+
+    size_t unresolvedTokenIndex;
+    EXPECT_TRUE(Pointer("/abc").GetUri(d, doc, &unresolvedTokenIndex, &allocator) == empty); // Out of boundary
+    EXPECT_EQ(0u, unresolvedTokenIndex);
+    EXPECT_TRUE(Pointer("/foo/3").GetUri(d, doc, &unresolvedTokenIndex, &allocator) == empty); // Out of boundary
+    EXPECT_EQ(1u, unresolvedTokenIndex);
+    EXPECT_TRUE(Pointer("/foo/a").GetUri(d, doc, &unresolvedTokenIndex, &allocator) == empty); // "/foo" is an array, cannot query by "a"
+    EXPECT_EQ(1u, unresolvedTokenIndex);
+    EXPECT_TRUE(Pointer("/foo/0/0").GetUri(d, doc, &unresolvedTokenIndex, &allocator) == empty); // "/foo/0" is an string, cannot further query
+    EXPECT_EQ(2u, unresolvedTokenIndex);
+    EXPECT_TRUE(Pointer("/foo/0/a").GetUri(d, doc, &unresolvedTokenIndex, &allocator) == empty); // "/foo/0" is an string, cannot further query
+    EXPECT_EQ(2u, unresolvedTokenIndex);
+
+    Pointer::Token tokens[] = { { "foo ...", 3, kPointerInvalidIndex } };
+    EXPECT_TRUE(Pointer(tokens, 1).GetUri(d, doc) == root);
+}
+
 TEST(Pointer, Get) {
     Document d;
     d.Parse(kJson);
@@ -664,7 +712,8 @@ TEST(Pointer, Get) {
     EXPECT_EQ(&d["k\"l"], Pointer("/k\"l").Get(d));
     EXPECT_EQ(&d[" "], Pointer("/ ").Get(d));
     EXPECT_EQ(&d["m~n"], Pointer("/m~0n").Get(d));
-    EXPECT_TRUE(Pointer("/abc").Get(d) == 0);
+
+    EXPECT_TRUE(Pointer("/abc").Get(d) == 0);  // Out of boundary
     size_t unresolvedTokenIndex;
     EXPECT_TRUE(Pointer("/foo/2").Get(d, &unresolvedTokenIndex) == 0); // Out of boundary
     EXPECT_EQ(1u, unresolvedTokenIndex);
@@ -1529,6 +1578,38 @@ TEST(Pointer, Ambiguity) {
     }
 }
 
+TEST(Pointer, ResolveOnObject) {
+    Document d;
+    EXPECT_FALSE(d.Parse("{\"a\": 123}").HasParseError());
+
+    {
+        Value::ConstObject o = static_cast<const Document&>(d).GetObject();
+        EXPECT_EQ(123, Pointer("/a").Get(o)->GetInt());
+    }
+
+    {
+        Value::Object o = d.GetObject();
+        Pointer("/a").Set(o, 456, d.GetAllocator());
+        EXPECT_EQ(456, Pointer("/a").Get(o)->GetInt());
+    }
+}
+
+TEST(Pointer, ResolveOnArray) {
+    Document d;
+    EXPECT_FALSE(d.Parse("[1, 2, 3]").HasParseError());
+
+    {
+        Value::ConstArray a = static_cast<const Document&>(d).GetArray();
+        EXPECT_EQ(2, Pointer("/1").Get(a)->GetInt());
+    }
+
+    {
+        Value::Array a = d.GetArray();
+        Pointer("/1").Set(a, 123, d.GetAllocator());
+        EXPECT_EQ(123, Pointer("/1").Get(a)->GetInt());
+    }
+}
+
 TEST(Pointer, LessThan) {
     static const struct {
         const char *str;
@@ -1636,3 +1717,14 @@ TEST(Pointer, Issue483) {
     value.SetString(mystr.c_str(), static_cast<SizeType>(mystr.length()), document.GetAllocator());
     myjson::Pointer(path.c_str()).Set(document, value, document.GetAllocator());
 }
+
+TEST(Pointer, Issue1899) {
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    PointerType p;
+    PointerType q = p.Append("foo");
+    EXPECT_TRUE(PointerType("/foo") == q);
+    q = q.Append(1234);
+    EXPECT_TRUE(PointerType("/foo/1234") == q);
+    q = q.Append("");
+    EXPECT_TRUE(PointerType("/foo/1234/") == q);
+}

data/ext/rj_schema/rapidjson/test/unittest/prettywritertest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/readertest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 //
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at
@@ -944,6 +944,9 @@ TEST(Reader, ParseString_Error) {
     TEST_STRING_ERROR(kParseErrorStringUnicodeSurrogateInvalid, "[\"\\uD800X\"]", 2u, 8u);
     TEST_STRING_ERROR(kParseErrorStringUnicodeSurrogateInvalid, "[\"\\uD800\\uFFFF\"]", 2u, 14u);
 
+    // Single low surrogate pair in string is invalid.
+    TEST_STRING_ERROR(kParseErrorStringUnicodeSurrogateInvalid, "[\"\\udc4d\"]", 2u, 8u);
+
     // Missing a closing quotation mark in string.
     TEST_STRING_ERROR(kParseErrorStringMissQuotationMark, "[\"Test]", 7u, 7u);
 

data/ext/rj_schema/rapidjson/test/unittest/regextest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at

data/ext/rj_schema/rapidjson/test/unittest/schematest.cpp

@@ -1,6 +1,6 @@
 // Tencent is pleased to support the open source community by making RapidJSON available.
 // 
-// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip.
 //
 // Licensed under the MIT License (the "License"); you may not use this file except
 // in compliance with the License. You may obtain a copy of the License at
@@ -12,10 +12,15 @@
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the 
 // specific language governing permissions and limitations under the License.
 
+#define RAPIDJSON_SCHEMA_VERBOSE 0
+#define RAPIDJSON_HAS_STDSTRING 1
+
 #include "unittest.h"
 #include "rapidjson/schema.h"
 #include "rapidjson/stringbuffer.h"
 #include "rapidjson/writer.h"
+#include "rapidjson/error/error.h"
+#include "rapidjson/error/en.h"
 
 #ifdef __clang__
 RAPIDJSON_DIAG_PUSH
@@ -114,11 +119,18 @@ TEST(SchemaValidator, Hasher) {
     EXPECT_FALSE(d.HasParseError());\
     EXPECT_TRUE(expected == d.Accept(validator));\
     EXPECT_TRUE(expected == validator.IsValid());\
+    ValidateErrorCode code = validator.GetInvalidSchemaCode();\
+    if (expected) {\
+      EXPECT_TRUE(code == kValidateErrorNone);\
+      EXPECT_TRUE(validator.GetInvalidSchemaKeyword() == 0);\
+    }\
     if ((expected) && !validator.IsValid()) {\
         StringBuffer sb;\
         validator.GetInvalidSchemaPointer().StringifyUriFragment(sb);\
         printf("Invalid schema: %s\n", sb.GetString());\
         printf("Invalid keyword: %s\n", validator.GetInvalidSchemaKeyword());\
+        printf("Invalid code: %d\n", code);\
+        printf("Invalid message: %s\n", GetValidateError_En(code));\
         sb.Clear();\
         validator.GetInvalidDocumentPointer().StringifyUriFragment(sb);\
         printf("Invalid document: %s\n", sb.GetString());\
@@ -131,19 +143,23 @@ TEST(SchemaValidator, Hasher) {
 
 #define INVALIDATE(schema, json, invalidSchemaPointer, invalidSchemaKeyword, invalidDocumentPointer, error) \
 {\
-    INVALIDATE_(schema, json, invalidSchemaPointer, invalidSchemaKeyword, invalidDocumentPointer, error, SchemaValidator, Pointer) \
+    INVALIDATE_(schema, json, invalidSchemaPointer, invalidSchemaKeyword, invalidDocumentPointer, error, kValidateDefaultFlags, SchemaValidator, Pointer) \
 }
 
 #define INVALIDATE_(schema, json, invalidSchemaPointer, invalidSchemaKeyword, invalidDocumentPointer, error, \
-    SchemaValidatorType, PointerType) \
+    flags, SchemaValidatorType, PointerType) \
 {\
     SchemaValidatorType validator(schema);\
+    validator.SetValidateFlags(flags);\
     Document d;\
     /*printf("\n%s\n", json);*/\
     d.Parse(json);\
     EXPECT_FALSE(d.HasParseError());\
-    EXPECT_FALSE(d.Accept(validator));\
+    d.Accept(validator);\
     EXPECT_FALSE(validator.IsValid());\
+    ValidateErrorCode code = validator.GetInvalidSchemaCode();\
+    ASSERT_TRUE(code != kValidateErrorNone);\
+    ASSERT_TRUE(strcmp(GetValidateError_En(code), "Unknown error.") != 0);\
     if (validator.GetInvalidSchemaPointer() != PointerType(invalidSchemaPointer)) {\
         StringBuffer sb;\
         validator.GetInvalidSchemaPointer().Stringify(sb);\
@@ -191,6 +207,7 @@ TEST(SchemaValidator, MultiType) {
     VALIDATE(s, "\"Life, the universe, and everything\"", true);
     INVALIDATE(s, "[\"Life\", \"the universe\", \"and everything\"]", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"string\", \"number\"], \"actual\": \"array\""
         "}}");
@@ -203,7 +220,7 @@ TEST(SchemaValidator, Enum_Typed) {
 
     VALIDATE(s, "\"red\"", true);
     INVALIDATE(s, "\"blue\"", "", "enum", "",
-        "{ \"enum\": { \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
+        "{ \"enum\": { \"errorCode\": 19, \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
 }
 
 TEST(SchemaValidator, Enum_Typless) {
@@ -215,7 +232,7 @@ TEST(SchemaValidator, Enum_Typless) {
     VALIDATE(s, "null", true);
     VALIDATE(s, "42", true);
     INVALIDATE(s, "0", "", "enum", "",
-        "{ \"enum\": { \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
+        "{ \"enum\": { \"errorCode\": 19, \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
 }
 
 TEST(SchemaValidator, Enum_InvalidType) {
@@ -226,6 +243,7 @@ TEST(SchemaValidator, Enum_InvalidType) {
     VALIDATE(s, "\"red\"", true);
     INVALIDATE(s, "null", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"string\"], \"actual\": \"null\""
         "}}");
@@ -239,9 +257,12 @@ TEST(SchemaValidator, AllOf) {
 
         VALIDATE(s, "\"ok\"", true);
         INVALIDATE(s, "\"too long\"", "", "allOf", "",
-            "{ \"maxLength\": { "
-            "    \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/1\", "
-            "    \"expected\": 5, \"actual\": \"too long\""
+            "{ \"allOf\": {"
+            "    \"errors\": ["
+            "      {},"
+            "      {\"maxLength\": {\"errorCode\": 6, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/1\", \"expected\": 5, \"actual\": \"too long\"}}"
+            "    ],"
+            "    \"errorCode\": 23, \"instanceRef\": \"#\", \"schemaRef\": \"#\""
             "}}");
     }
     {
@@ -251,8 +272,12 @@ TEST(SchemaValidator, AllOf) {
 
         VALIDATE(s, "\"No way\"", false);
         INVALIDATE(s, "-1", "", "allOf", "",
-            "{ \"type\": { \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\","
-            "    \"expected\": [\"string\"], \"actual\": \"integer\""
+            "{ \"allOf\": {"
+            "    \"errors\": ["
+            "      {\"type\": { \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\", \"errorCode\": 20, \"expected\": [\"string\"], \"actual\": \"integer\"}},"
+            "      {}"
+            "    ],"
+            "    \"errorCode\": 23, \"instanceRef\": \"#\", \"schemaRef\": \"#\""
             "}}");
     }
 }
@@ -266,13 +291,16 @@ TEST(SchemaValidator, AnyOf) {
     VALIDATE(s, "42", true);
     INVALIDATE(s, "{ \"Not a\": \"string or number\" }", "", "anyOf", "",
         "{ \"anyOf\": {"
+        "    \"errorCode\": 24,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\", "
         "    \"errors\": ["
         "      { \"type\": {"
+        "          \"errorCode\": 20,"
         "          \"instanceRef\": \"#\", \"schemaRef\": \"#/anyOf/0\","
         "          \"expected\": [\"string\"], \"actual\": \"object\""
         "      }},"
         "      { \"type\": {"
+        "          \"errorCode\": 20,"
         "          \"instanceRef\": \"#\", \"schemaRef\": \"#/anyOf/1\","
         "          \"expected\": [\"number\"], \"actual\": \"object\""
         "      }}"
@@ -289,20 +317,23 @@ TEST(SchemaValidator, OneOf) {
     VALIDATE(s, "9", true);
     INVALIDATE(s, "2", "", "oneOf", "",
         "{ \"oneOf\": {"
+        "    \"errorCode\": 21,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"errors\": ["
         "      { \"multipleOf\": {"
+        "          \"errorCode\": 1,"
         "          \"instanceRef\": \"#\", \"schemaRef\": \"#/oneOf/0\","
         "          \"expected\": 5, \"actual\": 2"
         "      }},"
         "      { \"multipleOf\": {"
+        "          \"errorCode\": 1,"
         "          \"instanceRef\": \"#\", \"schemaRef\": \"#/oneOf/1\","
         "          \"expected\": 3, \"actual\": 2"
         "      }}"
         "    ]"
         "}}");
     INVALIDATE(s, "15", "", "oneOf", "",
-        "{ \"oneOf\": { \"instanceRef\": \"#\", \"schemaRef\": \"#\", \"errors\": [{}, {}]}}");
+        "{ \"oneOf\": { \"errorCode\": 22, \"instanceRef\": \"#\", \"schemaRef\": \"#\", \"errors\": [{}, {}]}}");
 }
 
 TEST(SchemaValidator, Not) {
@@ -313,7 +344,7 @@ TEST(SchemaValidator, Not) {
     VALIDATE(s, "42", true);
     VALIDATE(s, "{ \"key\": \"value\" }", true);
     INVALIDATE(s, "\"I am a string\"", "", "not", "",
-        "{ \"not\": { \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
+        "{ \"not\": { \"errorCode\": 25, \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
 }
 
 TEST(SchemaValidator, Ref) {
@@ -378,10 +409,12 @@ TEST(SchemaValidator, Ref_AllOf) {
     SchemaDocument s(sd);
 
     INVALIDATE(s, "{\"shipping_address\": {\"street_address\": \"1600 Pennsylvania Avenue NW\", \"city\": \"Washington\", \"state\": \"DC\"} }", "/properties/shipping_address", "allOf", "/shipping_address",
-        "{ \"required\": {"
-        "    \"instanceRef\": \"#/shipping_address\","
-        "    \"schemaRef\": \"#/properties/shipping_address/allOf/1\","
-        "    \"missing\": [\"type\"]"
+        "{ \"allOf\": {"
+        "    \"errors\": ["
+        "      {},"
+        "      {\"required\": {\"errorCode\": 15, \"instanceRef\": \"#/shipping_address\", \"schemaRef\": \"#/properties/shipping_address/allOf/1\", \"missing\": [\"type\"]}}"
+        "    ],"
+        "    \"errorCode\":23,\"instanceRef\":\"#/shipping_address\",\"schemaRef\":\"#/properties/shipping_address\""
         "}}");
     VALIDATE(s, "{\"shipping_address\": {\"street_address\": \"1600 Pennsylvania Avenue NW\", \"city\": \"Washington\", \"state\": \"DC\", \"type\": \"business\"} }", true);
 }
@@ -394,26 +427,31 @@ TEST(SchemaValidator, String) {
     VALIDATE(s, "\"I'm a string\"", true);
     INVALIDATE(s, "42", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"string\"], \"actual\": \"integer\""
         "}}");
     INVALIDATE(s, "2147483648", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"string\"], \"actual\": \"integer\""
         "}}"); // 2^31 can only be fit in unsigned
     INVALIDATE(s, "-2147483649", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"string\"], \"actual\": \"integer\""
         "}}"); // -2^31 - 1 can only be fit in int64_t
     INVALIDATE(s, "4294967296", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"string\"], \"actual\": \"integer\""
         "}}"); // 2^32 can only be fit in int64_t
     INVALIDATE(s, "3.1415926", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"string\"], \"actual\": \"number\""
         "}}");
@@ -426,6 +464,7 @@ TEST(SchemaValidator, String_LengthRange) {
 
     INVALIDATE(s, "\"A\"", "", "minLength", "",
         "{ \"minLength\": {"
+        "    \"errorCode\": 7,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 2, \"actual\": \"A\""
         "}}");
@@ -433,6 +472,7 @@ TEST(SchemaValidator, String_LengthRange) {
     VALIDATE(s, "\"ABC\"", true);
     INVALIDATE(s, "\"ABCD\"", "", "maxLength", "",
         "{ \"maxLength\": {"
+        "    \"errorCode\": 6,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 3, \"actual\": \"ABCD\""
         "}}");
@@ -448,11 +488,13 @@ TEST(SchemaValidator, String_Pattern) {
     VALIDATE(s, "\"(888)555-1212\"", true);
     INVALIDATE(s, "\"(888)555-1212 ext. 532\"", "", "pattern", "",
         "{ \"pattern\": {"
+        "    \"errorCode\": 8,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"actual\": \"(888)555-1212 ext. 532\""
         "}}");
     INVALIDATE(s, "\"(800)FLOWERS\"", "", "pattern", "",
         "{ \"pattern\": {"
+        "    \"errorCode\": 8,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"actual\": \"(800)FLOWERS\""
         "}}");
@@ -482,11 +524,13 @@ TEST(SchemaValidator, Integer) {
     VALIDATE(s, "4294967296", true); // 2^32 can only be fit in int64_t
     INVALIDATE(s, "3.1415926", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"integer\"], \"actual\": \"number\""
         "}}");
     INVALIDATE(s, "\"42\"", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"integer\"], \"actual\": \"string\""
         "}}");
@@ -499,6 +543,7 @@ TEST(SchemaValidator, Integer_Range) {
 
     INVALIDATE(s, "-1", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 0, \"actual\": -1"
         "}}");
@@ -507,11 +552,13 @@ TEST(SchemaValidator, Integer_Range) {
     VALIDATE(s, "99", true);
     INVALIDATE(s, "100", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100, \"exclusiveMaximum\": true, \"actual\": 100"
         "}}");
     INVALIDATE(s, "101", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100, \"exclusiveMaximum\": true, \"actual\": 101"
         "}}");
@@ -524,6 +571,7 @@ TEST(SchemaValidator, Integer_Range64Boundary) {
 
     INVALIDATE(s, "-9223372036854775808", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -9223372036854775807, \"actual\": -9223372036854775808"
         "}}");
@@ -536,11 +584,13 @@ TEST(SchemaValidator, Integer_Range64Boundary) {
     VALIDATE(s, "9223372036854775806", true);
     INVALIDATE(s, "9223372036854775807", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 2,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775806, \"actual\": 9223372036854775807"
         "}}");
     INVALIDATE(s, "18446744073709551615", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 2,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775806, \"actual\": 18446744073709551615"
         "}}");   // uint64_t max
@@ -553,36 +603,43 @@ TEST(SchemaValidator, Integer_RangeU64Boundary) {
 
     INVALIDATE(s, "-9223372036854775808", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808, \"actual\": -9223372036854775808"
         "}}");
     INVALIDATE(s, "9223372036854775807", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808, \"actual\": 9223372036854775807"
         "}}");
     INVALIDATE(s, "-2147483648", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808, \"actual\": -2147483648"
         "}}"); // int min
     INVALIDATE(s, "0", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808, \"actual\": 0"
         "}}");
     INVALIDATE(s, "2147483647", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808, \"actual\": 2147483647"
         "}}");  // int max
     INVALIDATE(s, "2147483648", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808, \"actual\": 2147483648"
         "}}");  // unsigned first
     INVALIDATE(s, "4294967295", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808, \"actual\": 4294967295"
         "}}");  // unsigned max
@@ -590,6 +647,7 @@ TEST(SchemaValidator, Integer_RangeU64Boundary) {
     VALIDATE(s, "18446744073709551614", true);
     INVALIDATE(s, "18446744073709551615", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 2,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 18446744073709551614, \"actual\": 18446744073709551615"
         "}}");
@@ -602,6 +660,7 @@ TEST(SchemaValidator, Integer_Range64BoundaryExclusive) {
 
     INVALIDATE(s, "-9223372036854775808", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 5,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -9223372036854775808, \"exclusiveMinimum\": true, "
         "    \"actual\": -9223372036854775808"
@@ -610,6 +669,7 @@ TEST(SchemaValidator, Integer_Range64BoundaryExclusive) {
     VALIDATE(s, "18446744073709551614", true);
     INVALIDATE(s, "18446744073709551615", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 18446744073709551615, \"exclusiveMaximum\": true, "
         "    \"actual\": 18446744073709551615"
@@ -627,11 +687,13 @@ TEST(SchemaValidator, Integer_MultipleOf) {
     VALIDATE(s, "20", true);
     INVALIDATE(s, "23", "", "multipleOf", "",
         "{ \"multipleOf\": {"
+        "    \"errorCode\": 1,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 10, \"actual\": 23"
         "}}");
     INVALIDATE(s, "-23", "", "multipleOf", "",
         "{ \"multipleOf\": {"
+        "    \"errorCode\": 1,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 10, \"actual\": -23"
         "}}");
@@ -646,6 +708,7 @@ TEST(SchemaValidator, Integer_MultipleOf64Boundary) {
     VALIDATE(s, "18446744073709551615", true);
     INVALIDATE(s, "18446744073709551614", "", "multipleOf", "",
         "{ \"multipleOf\": {"
+        "    \"errorCode\": 1,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 18446744073709551615, \"actual\": 18446744073709551614"
         "}}");
@@ -658,6 +721,7 @@ TEST(SchemaValidator, Number_Range) {
 
     INVALIDATE(s, "-1", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 0, \"actual\": -1"
         "}}");
@@ -668,16 +732,19 @@ TEST(SchemaValidator, Number_Range) {
     VALIDATE(s, "99.9", true);
     INVALIDATE(s, "100", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100, \"exclusiveMaximum\": true, \"actual\": 100"
         "}}");
     INVALIDATE(s, "100.0", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100, \"exclusiveMaximum\": true, \"actual\": 100.0"
         "}}");
     INVALIDATE(s, "101.5", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100, \"exclusiveMaximum\": true, \"actual\": 101.5"
         "}}");
@@ -690,11 +757,13 @@ TEST(SchemaValidator, Number_RangeInt) {
 
     INVALIDATE(s, "-101", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -100, \"actual\": -101"
         "}}");
     INVALIDATE(s, "-100.1", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -100, \"actual\": -100.1"
         "}}");
@@ -702,46 +771,55 @@ TEST(SchemaValidator, Number_RangeInt) {
     VALIDATE(s, "-2", true);
     INVALIDATE(s, "-1", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": -1"
         "}}");
     INVALIDATE(s, "-0.9", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": -0.9"
         "}}");
     INVALIDATE(s, "0", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 0"
         "}}");
     INVALIDATE(s, "2147483647", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 2147483647"
         "}}");  // int max
     INVALIDATE(s, "2147483648", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 2147483648"
         "}}");  // unsigned first
     INVALIDATE(s, "4294967295", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 4294967295"
         "}}");  // unsigned max
     INVALIDATE(s, "9223372036854775808", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 9223372036854775808"
         "}}");
     INVALIDATE(s, "18446744073709551614", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551614"
         "}}");
     INVALIDATE(s, "18446744073709551615", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": -1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551615"
         "}}");
@@ -754,16 +832,19 @@ TEST(SchemaValidator, Number_RangeDouble) {
 
     INVALIDATE(s, "-9223372036854775808", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 0.1, \"actual\": -9223372036854775808"
         "}}");
     INVALIDATE(s, "-2147483648", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 0.1, \"actual\": -2147483648"
         "}}"); // int min
     INVALIDATE(s, "-1", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 0.1, \"actual\": -1"
         "}}");
@@ -773,51 +854,61 @@ TEST(SchemaValidator, Number_RangeDouble) {
     VALIDATE(s, "100", true);
     INVALIDATE(s, "101", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 101"
         "}}");
     INVALIDATE(s, "101.5", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 101.5"
         "}}");
     INVALIDATE(s, "18446744073709551614", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551614"
         "}}");
     INVALIDATE(s, "18446744073709551615", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551615"
         "}}");
     INVALIDATE(s, "2147483647", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 2147483647"
         "}}");  // int max
     INVALIDATE(s, "2147483648", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 2147483648"
         "}}");  // unsigned first
     INVALIDATE(s, "4294967295", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 4294967295"
         "}}");  // unsigned max
     INVALIDATE(s, "9223372036854775808", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 9223372036854775808"
         "}}");
     INVALIDATE(s, "18446744073709551614", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551614"
         "}}");
     INVALIDATE(s, "18446744073709551615", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 3,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 100.1, \"exclusiveMaximum\": true, \"actual\": 18446744073709551615"
         "}}");
@@ -830,31 +921,37 @@ TEST(SchemaValidator, Number_RangeDoubleU64Boundary) {
 
     INVALIDATE(s, "-9223372036854775808", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808.0, \"actual\": -9223372036854775808"
         "}}");
     INVALIDATE(s, "-2147483648", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808.0, \"actual\": -2147483648"
         "}}"); // int min
     INVALIDATE(s, "0", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808.0, \"actual\": 0"
         "}}");
     INVALIDATE(s, "2147483647", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808.0, \"actual\": 2147483647"
         "}}");  // int max
     INVALIDATE(s, "2147483648", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808.0, \"actual\": 2147483648"
         "}}");  // unsigned first
     INVALIDATE(s, "4294967295", "", "minimum", "",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 9223372036854775808.0, \"actual\": 4294967295"
         "}}");  // unsigned max
@@ -862,6 +959,7 @@ TEST(SchemaValidator, Number_RangeDoubleU64Boundary) {
     VALIDATE(s, "18446744073709540000", true);
     INVALIDATE(s, "18446744073709551615", "", "maximum", "",
         "{ \"maximum\": {"
+        "    \"errorCode\": 2,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 18446744073709550000.0, \"actual\": 18446744073709551615"
         "}}");
@@ -878,28 +976,33 @@ TEST(SchemaValidator, Number_MultipleOf) {
     VALIDATE(s, "20", true);
     INVALIDATE(s, "23", "", "multipleOf", "",
         "{ \"multipleOf\": {"
+        "    \"errorCode\": 1,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 10.0, \"actual\": 23"
         "}}");
     INVALIDATE(s, "-2147483648", "", "multipleOf", "",
         "{ \"multipleOf\": {"
+        "    \"errorCode\": 1,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 10.0, \"actual\": -2147483648"
         "}}");  // int min
     VALIDATE(s, "-2147483640", true);
     INVALIDATE(s, "2147483647", "", "multipleOf", "",
         "{ \"multipleOf\": {"
+        "    \"errorCode\": 1,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 10.0, \"actual\": 2147483647"
         "}}");  // int max
     INVALIDATE(s, "2147483648", "", "multipleOf", "",
         "{ \"multipleOf\": {"
+        "    \"errorCode\": 1,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 10.0, \"actual\": 2147483648"
         "}}");  // unsigned first
     VALIDATE(s, "2147483650", true);
     INVALIDATE(s, "4294967295", "", "multipleOf", "",
         "{ \"multipleOf\": {"
+        "    \"errorCode\": 1,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 10.0, \"actual\": 4294967295"
         "}}");  // unsigned max
@@ -915,6 +1018,7 @@ TEST(SchemaValidator, Number_MultipleOfOne) {
     VALIDATE(s, "42.0", true);
     INVALIDATE(s, "3.1415926", "", "multipleOf", "",
         "{ \"multipleOf\": {"
+        "    \"errorCode\": 1,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 1, \"actual\": 3.1415926"
         "}}");
@@ -929,11 +1033,13 @@ TEST(SchemaValidator, Object) {
     VALIDATE(s, "{\"Sun\":1.9891e30,\"Jupiter\":1.8986e27,\"Saturn\":5.6846e26,\"Neptune\":10.243e25,\"Uranus\":8.6810e25,\"Earth\":5.9736e24,\"Venus\":4.8685e24,\"Mars\":6.4185e23,\"Mercury\":3.3022e23,\"Moon\":7.349e22,\"Pluto\":1.25e22}", true);    
     INVALIDATE(s, "[\"An\", \"array\", \"not\", \"an\", \"object\"]", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"object\"], \"actual\": \"array\""
         "}}");
     INVALIDATE(s, "\"Not an object\"", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"object\"], \"actual\": \"string\""
         "}}");
@@ -956,12 +1062,14 @@ TEST(SchemaValidator, Object_Properties) {
     VALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\" }", true);
     INVALIDATE(s, "{ \"number\": \"1600\", \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\" }", "/properties/number", "type", "/number",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/number\", \"schemaRef\": \"#/properties/number\","
         "    \"expected\": [\"number\"], \"actual\": \"string\""
         "}}");
     INVALIDATE(s, "{ \"number\": \"One\", \"street_name\": \"Microsoft\", \"street_type\": \"Way\" }",
         "/properties/number", "type", "/number",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/number\", \"schemaRef\": \"#/properties/number\","
         "    \"expected\": [\"number\"], \"actual\": \"string\""
         "}}"); // fail fast
@@ -990,6 +1098,7 @@ TEST(SchemaValidator, Object_AdditionalPropertiesBoolean) {
     VALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\" }", true);
     INVALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\", \"direction\": \"NW\" }", "", "additionalProperties", "/direction",
         "{ \"additionalProperties\": {"
+        "    \"errorCode\": 16,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"disallowed\": \"direction\""
         "}}");
@@ -1015,6 +1124,7 @@ TEST(SchemaValidator, Object_AdditionalPropertiesObject) {
     VALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\", \"direction\": \"NW\" }", true);
     INVALIDATE(s, "{ \"number\": 1600, \"street_name\": \"Pennsylvania\", \"street_type\": \"Avenue\", \"office_number\": 201 }", "/additionalProperties", "type", "/office_number",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/office_number\", \"schemaRef\": \"#/additionalProperties\","
         "    \"expected\": [\"string\"], \"actual\": \"integer\""
         "}}");
@@ -1039,11 +1149,13 @@ TEST(SchemaValidator, Object_Required) {
     VALIDATE(s, "{ \"name\": \"William Shakespeare\", \"email\" : \"bill@stratford-upon-avon.co.uk\", \"address\" : \"Henley Street, Stratford-upon-Avon, Warwickshire, England\", \"authorship\" : \"in question\"}", true);
     INVALIDATE(s, "{ \"name\": \"William Shakespeare\", \"address\" : \"Henley Street, Stratford-upon-Avon, Warwickshire, England\" }", "", "required", "",
         "{ \"required\": {"
+        "    \"errorCode\": 15,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"missing\": [\"email\"]"
         "}}");
     INVALIDATE(s, "{}", "", "required", "",
         "{ \"required\": {"
+        "    \"errorCode\": 15,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"missing\": [\"name\", \"email\"]"
         "}}");
@@ -1067,11 +1179,13 @@ TEST(SchemaValidator, Object_Required_PassWithDefault) {
     VALIDATE(s, "{ \"email\" : \"bill@stratford-upon-avon.co.uk\", \"address\" : \"Henley Street, Stratford-upon-Avon, Warwickshire, England\", \"authorship\" : \"in question\"}", true);
     INVALIDATE(s, "{ \"name\": \"William Shakespeare\", \"address\" : \"Henley Street, Stratford-upon-Avon, Warwickshire, England\" }", "", "required", "",
         "{ \"required\": {"
+        "    \"errorCode\": 15,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"missing\": [\"email\"]"
         "}}");
     INVALIDATE(s, "{}", "", "required", "",
         "{ \"required\": {"
+        "    \"errorCode\": 15,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"missing\": [\"email\"]"
         "}}");
@@ -1084,11 +1198,13 @@ TEST(SchemaValidator, Object_PropertiesRange) {
 
     INVALIDATE(s, "{}", "", "minProperties", "",
         "{ \"minProperties\": {"
+        "    \"errorCode\": 14,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 2, \"actual\": 0"
         "}}");
     INVALIDATE(s, "{\"a\":0}", "", "minProperties", "",
         "{ \"minProperties\": {"
+        "    \"errorCode\": 14,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 2, \"actual\": 1"
         "}}");
@@ -1096,6 +1212,7 @@ TEST(SchemaValidator, Object_PropertiesRange) {
     VALIDATE(s, "{\"a\":0,\"b\":1,\"c\":2}", true);
     INVALIDATE(s, "{\"a\":0,\"b\":1,\"c\":2,\"d\":3}", "", "maxProperties", "",
         "{ \"maxProperties\": {"
+        "    \"errorCode\": 13,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\", "
         "    \"expected\": 3, \"actual\": 4"
         "}}");
@@ -1123,8 +1240,15 @@ TEST(SchemaValidator, Object_PropertyDependencies) {
         "\"billing_address\": \"555 Debtor's Lane\" }", true);
     INVALIDATE(s, "{ \"name\": \"John Doe\", \"credit_card\": 5555555555555555 }", "", "dependencies", "",
         "{ \"dependencies\": {"
+        "    \"errorCode\": 18,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
-        "    \"errors\": {\"credit_card\": [\"cvv_code\", \"billing_address\"]}"
+        "    \"errors\": {"
+        "       \"credit_card\": {"
+        "        \"required\": {"
+        "          \"errorCode\": 15,"
+        "          \"instanceRef\": \"#\", \"schemaRef\": \"#/dependencies/credit_card\","
+        "          \"missing\": [\"cvv_code\", \"billing_address\"]"
+        "    } } }"
         "}}");
     VALIDATE(s, "{ \"name\": \"John Doe\"}", true);
     VALIDATE(s, "{ \"name\": \"John Doe\", \"cvv_code\": 777, \"billing_address\": \"555 Debtor's Lane\" }", true);
@@ -1154,10 +1278,12 @@ TEST(SchemaValidator, Object_SchemaDependencies) {
     VALIDATE(s, "{\"name\": \"John Doe\", \"credit_card\" : 5555555555555555,\"billing_address\" : \"555 Debtor's Lane\"}", true);
     INVALIDATE(s, "{\"name\": \"John Doe\", \"credit_card\" : 5555555555555555 }", "", "dependencies", "",
         "{ \"dependencies\": {"
+        "    \"errorCode\": 18,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"errors\": {"
         "      \"credit_card\": {"
         "        \"required\": {"
+        "          \"errorCode\": 15,"
         "          \"instanceRef\": \"#\", \"schemaRef\": \"#/dependencies/credit_card\","
         "          \"missing\": [\"billing_address\"]"
         "    } } }"
@@ -1182,18 +1308,20 @@ TEST(SchemaValidator, Object_PatternProperties) {
     VALIDATE(s, "{ \"I_0\": 42 }", true);
     INVALIDATE(s, "{ \"S_0\": 42 }", "", "patternProperties", "/S_0",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/S_0\", \"schemaRef\": \"#/patternProperties/%5ES_\","
         "    \"expected\": [\"string\"], \"actual\": \"integer\""
         "}}");
     INVALIDATE(s, "{ \"I_42\": \"This is a string\" }", "", "patternProperties", "/I_42",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/I_42\", \"schemaRef\": \"#/patternProperties/%5EI_\","
         "    \"expected\": [\"integer\"], \"actual\": \"string\""
         "}}");
     VALIDATE(s, "{ \"keyword\": \"value\" }", true);
 }
 
-TEST(SchemaValidator, Object_PattternProperties_ErrorConflict) {
+TEST(SchemaValidator, Object_PatternProperties_ErrorConflict) {
     Document sd;
     sd.Parse(
         "{"
@@ -1209,9 +1337,11 @@ TEST(SchemaValidator, Object_PattternProperties_ErrorConflict) {
     INVALIDATE(s, "{ \"I_30\": 7 }", "", "patternProperties", "/I_30",
         "{ \"multipleOf\": ["
         "    {"
+        "      \"errorCode\": 1,"
         "      \"instanceRef\": \"#/I_30\", \"schemaRef\": \"#/patternProperties/%5EI_\","
         "      \"expected\": 5, \"actual\": 7"
         "    }, {"
+        "      \"errorCode\": 1,"
         "      \"instanceRef\": \"#/I_30\", \"schemaRef\": \"#/patternProperties/30%24\","
         "      \"expected\": 6, \"actual\": 7"
         "    }"
@@ -1236,22 +1366,25 @@ TEST(SchemaValidator, Object_Properties_PatternProperties) {
     VALIDATE(s, "{ \"I_42\": 78 }", true);
     INVALIDATE(s, "{ \"I_42\": 42 }", "", "patternProperties", "/I_42",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#/I_42\", \"schemaRef\": \"#/properties/I_42\","
         "    \"expected\": 73, \"actual\": 42"
         "}}");
     INVALIDATE(s, "{ \"I_42\": 7 }", "", "patternProperties", "/I_42",
         "{ \"minimum\": {"
+        "    \"errorCode\": 4,"
         "    \"instanceRef\": \"#/I_42\", \"schemaRef\": \"#/properties/I_42\","
         "    \"expected\": 73, \"actual\": 7"
         "  },"
         "  \"multipleOf\": {"
+        "    \"errorCode\": 1,"
         "    \"instanceRef\": \"#/I_42\", \"schemaRef\": \"#/patternProperties/%5EI_\","
         "    \"expected\": 6, \"actual\": 7"
         "  }"
         "}");
 }
 
-TEST(SchemaValidator, Object_PatternProperties_AdditionalProperties) {
+TEST(SchemaValidator, Object_PatternProperties_AdditionalPropertiesObject) {
     Document sd;
     sd.Parse(
         "{"
@@ -1271,10 +1404,35 @@ TEST(SchemaValidator, Object_PatternProperties_AdditionalProperties) {
     VALIDATE(s, "{ \"keyword\": \"value\" }", true);
     INVALIDATE(s, "{ \"keyword\": 42 }", "/additionalProperties", "type", "/keyword",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/keyword\", \"schemaRef\": \"#/additionalProperties\","
         "    \"expected\": [\"string\"], \"actual\": \"integer\""
         "}}");
 }
+
+// Replaces test Issue285 and tests failure as well as success
+TEST(SchemaValidator, Object_PatternProperties_AdditionalPropertiesBoolean) {
+    Document sd;
+    sd.Parse(
+        "{"
+        "  \"type\": \"object\","
+        "  \"patternProperties\": {"
+        "    \"^S_\": { \"type\": \"string\" },"
+        "    \"^I_\": { \"type\": \"integer\" }"
+        "  },"
+        "  \"additionalProperties\": false"
+        "}");
+    SchemaDocument s(sd);
+
+    VALIDATE(s, "{ \"S_25\": \"This is a string\" }", true);
+    VALIDATE(s, "{ \"I_0\": 42 }", true);
+    INVALIDATE(s, "{ \"keyword\": \"value\" }", "", "additionalProperties", "/keyword",
+        "{ \"additionalProperties\": {"
+        "    \"errorCode\": 16,"
+        "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+        "    \"disallowed\": \"keyword\""
+        "}}");
+}
 #endif
 
 TEST(SchemaValidator, Array) {
@@ -1286,6 +1444,7 @@ TEST(SchemaValidator, Array) {
     VALIDATE(s, "[3, \"different\", { \"types\" : \"of values\" }]", true);
     INVALIDATE(s, "{\"Not\": \"an array\"}", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"array\"], \"actual\": \"object\""
         "}}");
@@ -1305,6 +1464,7 @@ TEST(SchemaValidator, Array_ItemsList) {
     VALIDATE(s, "[1, 2, 3, 4, 5]", true);
     INVALIDATE(s, "[1, 2, \"3\", 4, 5]", "/items", "type", "/2",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/2\", \"schemaRef\": \"#/items\","
         "    \"expected\": [\"number\"], \"actual\": \"string\""
         "}}");
@@ -1337,14 +1497,16 @@ TEST(SchemaValidator, Array_ItemsTuple) {
 
     VALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\", \"NW\"]", true);
     INVALIDATE(s, "[24, \"Sussex\", \"Drive\"]", "/items/2", "enum", "/2",
-        "{ \"enum\": { \"instanceRef\": \"#/2\", \"schemaRef\": \"#/items/2\" }}");
+        "{ \"enum\": { \"errorCode\": 19, \"instanceRef\": \"#/2\", \"schemaRef\": \"#/items/2\" }}");
     INVALIDATE(s, "[\"Palais de l'Elysee\"]", "/items/0", "type", "/0",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/0\", \"schemaRef\": \"#/items/0\","
         "    \"expected\": [\"number\"], \"actual\": \"string\""
         "}}");
     INVALIDATE(s, "[\"Twenty-four\", \"Sussex\", \"Drive\"]", "/items/0", "type", "/0",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/0\", \"schemaRef\": \"#/items/0\","
         "    \"expected\": [\"number\"], \"actual\": \"string\""
         "}}"); // fail fast
@@ -1352,7 +1514,7 @@ TEST(SchemaValidator, Array_ItemsTuple) {
     VALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\", \"NW\", \"Washington\"]", true);
 }
 
-TEST(SchemaValidator, Array_AdditionalItmes) {
+TEST(SchemaValidator, Array_AdditionalItems) {
     Document sd;
     sd.Parse(
         "{"
@@ -1379,8 +1541,9 @@ TEST(SchemaValidator, Array_AdditionalItmes) {
 
     VALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\", \"NW\"]", true);
     VALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\"]", true);
-    INVALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\", \"NW\", \"Washington\"]", "", "items", "/4",
+    INVALIDATE(s, "[1600, \"Pennsylvania\", \"Avenue\", \"NW\", \"Washington\"]", "", "additionalItems", "/4",
         "{ \"additionalItems\": {"
+        "    \"errorCode\": 12,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"disallowed\": 4"
         "}}");
@@ -1393,11 +1556,13 @@ TEST(SchemaValidator, Array_ItemsRange) {
 
     INVALIDATE(s, "[]", "", "minItems", "",
         "{ \"minItems\": {"
+        "    \"errorCode\": 10,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 2, \"actual\": 0"
         "}}");
     INVALIDATE(s, "[1]", "", "minItems", "",
         "{ \"minItems\": {"
+        "    \"errorCode\": 10,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 2, \"actual\": 1"
         "}}");
@@ -1405,6 +1570,7 @@ TEST(SchemaValidator, Array_ItemsRange) {
     VALIDATE(s, "[1, 2, 3]", true);
     INVALIDATE(s, "[1, 2, 3, 4]", "", "maxItems", "",
         "{ \"maxItems\": {"
+        "    \"errorCode\": 9,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 3, \"actual\": 4"
         "}}");
@@ -1418,11 +1584,13 @@ TEST(SchemaValidator, Array_UniqueItems) {
     VALIDATE(s, "[1, 2, 3, 4, 5]", true);
     INVALIDATE(s, "[1, 2, 3, 3, 4]", "", "uniqueItems", "/3",
         "{ \"uniqueItems\": {"
+        "    \"errorCode\": 11,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"duplicates\": [2, 3]"
         "}}");
     INVALIDATE(s, "[1, 2, 3, 3, 3]", "", "uniqueItems", "/3",
         "{ \"uniqueItems\": {"
+        "    \"errorCode\": 11,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"duplicates\": [2, 3]"
         "}}"); // fail fast
@@ -1438,11 +1606,13 @@ TEST(SchemaValidator, Boolean) {
     VALIDATE(s, "false", true);
     INVALIDATE(s, "\"true\"", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"boolean\"], \"actual\": \"string\""
         "}}");
     INVALIDATE(s, "0", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"boolean\"], \"actual\": \"integer\""
         "}}");
@@ -1456,16 +1626,19 @@ TEST(SchemaValidator, Null) {
     VALIDATE(s, "null", true);
     INVALIDATE(s, "false", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"null\"], \"actual\": \"boolean\""
         "}}");
     INVALIDATE(s, "0", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"null\"], \"actual\": \"integer\""
         "}}");
     INVALIDATE(s, "\"\"", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"null\"], \"actual\": \"string\""
         "}}");
@@ -1481,11 +1654,13 @@ TEST(SchemaValidator, ObjectInArray) {
     VALIDATE(s, "[\"a\"]", true);
     INVALIDATE(s, "[1]", "/items", "type", "/0",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/0\", \"schemaRef\": \"#/items\","
         "    \"expected\": [\"string\"], \"actual\": \"integer\""
         "}}");
     INVALIDATE(s, "[{}]", "/items", "type", "/0",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/0\", \"schemaRef\": \"#/items\","
         "    \"expected\": [\"string\"], \"actual\": \"object\""
         "}}");
@@ -1508,6 +1683,7 @@ TEST(SchemaValidator, MultiTypeInObject) {
     VALIDATE(s, "{ \"tel\": \"123-456\" }", true);
     INVALIDATE(s, "{ \"tel\": true }", "/properties/tel", "type", "/tel",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/tel\", \"schemaRef\": \"#/properties/tel\","
         "    \"expected\": [\"string\", \"integer\"], \"actual\": \"boolean\""
         "}}");
@@ -1530,6 +1706,7 @@ TEST(SchemaValidator, MultiTypeWithObject) {
     VALIDATE(s, "{ \"tel\": 999 }", true);
     INVALIDATE(s, "{ \"tel\": \"fail\" }", "/properties/tel", "type", "/tel",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/tel\", \"schemaRef\": \"#/properties/tel\","
         "    \"expected\": [\"integer\"], \"actual\": \"string\""
         "}}");
@@ -1550,48 +1727,71 @@ TEST(SchemaValidator, AllOf_Nested) {
     VALIDATE(s, "\"ok\"", true);
     VALIDATE(s, "\"OK\"", true);
     INVALIDATE(s, "\"okay\"", "", "allOf", "",
-        "{ \"enum\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\""
+        "{ \"allOf\": {"
+        "    \"errors\": ["
+        "    {},{},"
+        "    { \"allOf\": {"
+        "      \"errors\": ["
+        "        {},"
+        "        { \"enum\": {\"errorCode\": 19, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\" }}"
+        "      ],"
+        "      \"errorCode\": 23, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2\""
+        "    }}],"
+        "    \"errorCode\": 23, \"instanceRef\": \"#\", \"schemaRef\": \"#\""
         "}}");
     INVALIDATE(s, "\"o\"", "", "allOf", "",
-        "{ \"minLength\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\","
-        "    \"expected\": 2, \"actual\": \"o\""
+        "{ \"allOf\": {"
+        "  \"errors\": ["
+        "    { \"minLength\": {\"actual\": \"o\", \"expected\": 2, \"errorCode\": 7, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\" }},"
+        "    {},{}"
+        "  ],"
+        "  \"errorCode\": 23, \"instanceRef\": \"#\", \"schemaRef\": \"#\""
         "}}");
     INVALIDATE(s, "\"n\"", "", "allOf", "",
-        "{ \"minLength\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\","
-        "    \"expected\": 2, \"actual\": \"n\""
-        "  },"
-        "  \"enum\": ["
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/0\"},"
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\"}"
-        "  ]"
-        "}")
+        "{ \"allOf\": {"
+        "    \"errors\": ["
+        "      { \"minLength\": {\"actual\": \"n\", \"expected\": 2, \"errorCode\": 7, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\" }},"
+        "      {},"
+        "      { \"allOf\": {"
+        "          \"errors\": ["
+        "            { \"enum\": {\"errorCode\": 19 ,\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/0\"}},"
+        "            { \"enum\": {\"errorCode\": 19, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\"}}"
+        "          ],"
+        "          \"errorCode\": 23, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2\""
+        "      }}"
+        "    ],"
+        "    \"errorCode\":23,\"instanceRef\":\"#\",\"schemaRef\":\"#\""
+        "}}");
     INVALIDATE(s, "\"too long\"", "", "allOf", "",
-        "{ \"maxLength\": {"
-        "    \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/1\","
-        "    \"expected\": 5, \"actual\": \"too long\""
-        "  },"
-        "  \"enum\": ["
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/0\"},"
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\"}"
-        "  ]"
-        "}");
+        "{ \"allOf\": {"
+        "    \"errors\": ["
+        "      {},"
+        "      { \"maxLength\": {\"actual\": \"too long\", \"expected\": 5, \"errorCode\": 6, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/1\" }},"
+        "      { \"allOf\": {"
+        "          \"errors\": ["
+        "            { \"enum\": {\"errorCode\": 19 ,\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/0\"}},"
+        "            { \"enum\": {\"errorCode\": 19, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\"}}"
+        "          ],"
+        "          \"errorCode\": 23, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2\""
+        "      }}"
+        "    ],"
+        "    \"errorCode\":23,\"instanceRef\":\"#\",\"schemaRef\":\"#\""
+        "}}");
     INVALIDATE(s, "123", "", "allOf", "",
-        "{ \"type\": ["
-        "    { \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\","
-        "      \"expected\": [\"string\"], \"actual\": \"integer\""
-        "    },"
-        "    { \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/1\","
-        "      \"expected\": [\"string\"], \"actual\": \"integer\""
-        "    }"
-        "  ],"
-        "  \"enum\": ["
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/0\"},"
-        "    {\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\"}"
-        "  ]"
-        "}");
+        "{ \"allOf\": {"
+        "    \"errors\": ["
+        "      {\"type\": {\"expected\": [\"string\"], \"actual\": \"integer\", \"errorCode\": 20, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/0\"}},"
+        "      {\"type\": {\"expected\": [\"string\"], \"actual\": \"integer\", \"errorCode\": 20, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/1\"}},"
+        "      { \"allOf\": {"
+        "          \"errors\": ["
+        "            { \"enum\": {\"errorCode\": 19 ,\"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/0\"}},"
+        "            { \"enum\": {\"errorCode\": 19, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2/allOf/1\"}}"
+        "          ],"
+        "          \"errorCode\": 23, \"instanceRef\": \"#\", \"schemaRef\": \"#/allOf/2\""
+        "      }}"
+        "    ],"
+        "    \"errorCode\":23,\"instanceRef\":\"#\",\"schemaRef\":\"#\""
+        "}}");
 }
 
 TEST(SchemaValidator, EscapedPointer) {
@@ -1606,11 +1806,195 @@ TEST(SchemaValidator, EscapedPointer) {
     SchemaDocument s(sd);
     INVALIDATE(s, "{\"~/\":true}", "/properties/~0~1", "type", "/~0~1",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#/~0~1\", \"schemaRef\": \"#/properties/~0~1\","
         "    \"expected\": [\"number\"], \"actual\": \"boolean\""
         "}}");
 }
 
+TEST(SchemaValidator, SchemaPointer) {
+    Document sd;
+    sd.Parse(
+        "{"
+        "  \"swagger\": \"2.0\","
+        "  \"paths\": {"
+        "    \"/some/path\": {"
+        "      \"post\": {"
+        "        \"parameters\": ["
+        "          {"
+        "            \"in\": \"body\","
+        "            \"name\": \"body\","
+        "            \"schema\": {"
+        "              \"properties\": {"
+        "                \"a\": {"
+        "                  \"$ref\": \"#/definitions/Prop_a\""
+        "                },"
+        "                \"b\": {"
+        "                  \"type\": \"integer\""
+        "                }"
+        "              },"
+        "              \"type\": \"object\""
+        "            }"
+        "          }"
+        "        ],"
+        "        \"responses\": {"
+        "          \"200\": {"
+        "            \"schema\": {"
+        "              \"$ref\": \"#/definitions/Resp_200\""
+        "            }"
+        "          }"
+        "        }"
+        "      }"
+        "    }"
+        "  },"
+        "  \"definitions\": {"
+        "    \"Prop_a\": {"
+        "      \"properties\": {"
+        "        \"c\": {"
+        "          \"enum\": ["
+        "            \"C1\","
+        "            \"C2\","
+        "            \"C3\""
+        "          ],"
+        "          \"type\": \"string\""
+        "        },"
+        "        \"d\": {"
+        "          \"$ref\": \"#/definitions/Prop_d\""
+        "        },"
+        "        \"s\": {"
+        "          \"type\": \"string\""
+        "        }"
+        "      },"
+        "      \"required\": [\"c\"],"
+        "      \"type\": \"object\""
+        "    },"
+        "    \"Prop_d\": {"
+        "      \"properties\": {"
+        "        \"a\": {"
+        "          \"$ref\": \"#/definitions/Prop_a\""
+        "        },"
+        "        \"c\": {"
+        "          \"$ref\": \"#/definitions/Prop_a/properties/c\""
+        "        }"
+        "      },"
+        "      \"type\": \"object\""
+        "    },"
+        "    \"Resp_200\": {"
+        "      \"properties\": {"
+        "        \"e\": {"
+        "          \"type\": \"string\""
+        "        },"
+        "        \"f\": {"
+        "          \"type\": \"boolean\""
+        "        },"
+        "        \"cyclic_source\": {"
+        "          \"$ref\": \"#/definitions/Resp_200/properties/cyclic_target\""
+        "        },"
+        "        \"cyclic_target\": {"
+        "          \"$ref\": \"#/definitions/Resp_200/properties/cyclic_source\""
+        "        }"
+        "      },"
+        "      \"type\": \"object\""
+        "    }"
+        "  }"
+        "}");
+    SchemaDocument s1(sd, NULL, 0, NULL, NULL, Pointer("#/paths/~1some~1path/post/parameters/0/schema"));
+    VALIDATE(s1,
+        "{"
+        "  \"a\": {"
+        "    \"c\": \"C1\","
+        "    \"d\": {"
+        "      \"a\": {"
+        "        \"c\": \"C2\""
+        "      },"
+        "      \"c\": \"C3\""
+        "    }"
+        "  },"
+        "  \"b\": 123"
+        "}",
+         true);
+    INVALIDATE(s1,
+        "{"
+        "  \"a\": {"
+        "    \"c\": \"C1\","
+        "    \"d\": {"
+        "      \"a\": {"
+        "        \"c\": \"C2\""
+        "      },"
+        "      \"c\": \"C3\""
+        "    }"
+        "  },"
+        "  \"b\": \"should be an int\""
+        "}",
+        "#/paths/~1some~1path/post/parameters/0/schema/properties/b", "type", "#/b",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\":\"#/b\","
+        "    \"schemaRef\":\"#/paths/~1some~1path/post/parameters/0/schema/properties/b\","
+        "    \"expected\": [\"integer\"], \"actual\":\"string\""
+        "}}");
+    INVALIDATE(s1,
+        "{"
+        "  \"a\": {"
+        "    \"c\": \"C1\","
+        "    \"d\": {"
+        "      \"a\": {"
+        "        \"c\": \"should be within enum\""
+        "      },"
+        "      \"c\": \"C3\""
+        "    }"
+        "  },"
+        "  \"b\": 123"
+        "}",
+        "#/definitions/Prop_a/properties/c", "enum", "#/a/d/a/c",
+        "{ \"enum\": {"
+        "    \"errorCode\": 19,"
+        "    \"instanceRef\":\"#/a/d/a/c\","
+        "    \"schemaRef\":\"#/definitions/Prop_a/properties/c\""
+        "}}");
+    INVALIDATE(s1,
+        "{"
+        "  \"a\": {"
+        "    \"c\": \"C1\","
+        "    \"d\": {"
+        "      \"a\": {"
+        "        \"s\": \"required 'c' is missing\""
+        "      }"
+        "    }"
+        "  },"
+        "  \"b\": 123"
+        "}",
+        "#/definitions/Prop_a", "required", "#/a/d/a",
+        "{ \"required\": {"
+        "    \"errorCode\": 15,"
+        "    \"missing\":[\"c\"],"
+        "    \"instanceRef\":\"#/a/d/a\","
+        "    \"schemaRef\":\"#/definitions/Prop_a\""
+        "}}");
+    SchemaDocument s2(sd, NULL, 0, NULL, NULL, Pointer("#/paths/~1some~1path/post/responses/200/schema"));
+    VALIDATE(s2,
+        "{ \"e\": \"some string\", \"f\": false }",
+        true);
+    INVALIDATE(s2,
+        "{ \"e\": true, \"f\": false }",
+        "#/definitions/Resp_200/properties/e", "type", "#/e",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\":\"#/e\","
+        "    \"schemaRef\":\"#/definitions/Resp_200/properties/e\","
+        "    \"expected\": [\"string\"], \"actual\":\"boolean\""
+        "}}");
+    INVALIDATE(s2,
+        "{ \"e\": \"some string\", \"f\": 123 }",
+        "#/definitions/Resp_200/properties/f", "type", "#/f",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\":\"#/f\","
+        "    \"schemaRef\":\"#/definitions/Resp_200/properties/f\","
+        "    \"expected\": [\"boolean\"], \"actual\":\"integer\""
+        "}}");
+}
+
 template <typename Allocator>
 static char* ReadFile(const char* filename, Allocator& allocator) {
     const char *paths[] = {
@@ -1650,11 +2034,14 @@ TEST(SchemaValidator, ValidateMetaSchema) {
     ASSERT_FALSE(d.HasParseError());
     SchemaDocument sd(d);
     SchemaValidator validator(sd);
-    if (!d.Accept(validator)) {
+    d.Accept(validator);
+    if (!validator.IsValid()) {
         StringBuffer sb;
         validator.GetInvalidSchemaPointer().StringifyUriFragment(sb);
         printf("Invalid schema: %s\n", sb.GetString());
         printf("Invalid keyword: %s\n", validator.GetInvalidSchemaKeyword());
+        printf("Invalid code: %d\n", validator.GetInvalidSchemaCode());
+        printf("Invalid message: %s\n", GetValidateError_En(validator.GetInvalidSchemaCode()));
         sb.Clear();
         validator.GetInvalidDocumentPointer().StringifyUriFragment(sb);
         printf("Invalid document: %s\n", sb.GetString());
@@ -1681,7 +2068,8 @@ TEST(SchemaValidator, ValidateMetaSchema_UTF16) {
     ASSERT_FALSE(d.HasParseError());
     SD sd(d);
     SV validator(sd);
-    if (!d.Accept(validator)) {
+    d.Accept(validator);
+    if (!validator.IsValid()) {
         GenericStringBuffer<UTF16<> > sb;
         validator.GetInvalidSchemaPointer().StringifyUriFragment(sb);
         wprintf(L"Invalid schema: %ls\n", sb.GetString());
@@ -1709,13 +2097,15 @@ public:
             "jsonschema/remotes/integer.json",
             "jsonschema/remotes/subSchemas.json",
             "jsonschema/remotes/folder/folderInteger.json",
-            "draft-04/schema"
+            "draft-04/schema",
+            "unittestschema/address.json"
         };
         const char* uris[kCount] = {
             "http://localhost:1234/integer.json",
             "http://localhost:1234/subSchemas.json",
             "http://localhost:1234/folder/folderInteger.json",
-            "http://json-schema.org/draft-04/schema"
+            "http://json-schema.org/draft-04/schema",
+            "http://localhost:1234/address.json"
         };
 
         for (size_t i = 0; i < kCount; i++) {
@@ -1746,7 +2136,7 @@ public:
 
     virtual const SchemaDocumentType* GetRemoteDocument(const char* uri, SizeType length) {
         for (size_t i = 0; i < kCount; i++)
-            if (typename SchemaDocumentType::URIType(uri, length) == sd_[i]->GetURI())
+            if (typename SchemaDocumentType::SValue(uri, length) == sd_[i]->GetURI())
                 return sd_[i];
         return 0;
     }
@@ -1757,7 +2147,7 @@ private:
     RemoteSchemaDocumentProvider(const RemoteSchemaDocumentProvider&);
     RemoteSchemaDocumentProvider& operator=(const RemoteSchemaDocumentProvider&);
 
-    static const size_t kCount = 4;
+    static const size_t kCount = 5;
     SchemaDocumentType* sd_[kCount];
     typename DocumentType::AllocatorType documentAllocator_;
     typename SchemaDocumentType::AllocatorType schemaAllocator_;
@@ -1826,6 +2216,7 @@ TEST(SchemaValidator, TestSuite) {
             ADD_FAILURE();
         }
         else {
+            //printf("\njson test suite file %s parsed ok\n", filename);
             GenericDocument<UTF8<>, MemoryPoolAllocator<>, MemoryPoolAllocator<> > d(&documentAllocator, 1024, &documentStackAllocator);
             d.Parse(json);
             if (d.HasParseError()) {
@@ -1835,22 +2226,27 @@ TEST(SchemaValidator, TestSuite) {
             else {
                 for (Value::ConstValueIterator schemaItr = d.Begin(); schemaItr != d.End(); ++schemaItr) {
                     {
+                        const char* description1 = (*schemaItr)["description"].GetString();
+                        //printf("\ncompiling schema for json test %s \n", description1);
                         SchemaDocumentType schema((*schemaItr)["schema"], filenames[i], static_cast<SizeType>(strlen(filenames[i])), &provider, &schemaAllocator);
                         GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > validator(schema, &validatorAllocator);
-                        const char* description1 = (*schemaItr)["description"].GetString();
                         const Value& tests = (*schemaItr)["tests"];
                         for (Value::ConstValueIterator testItr = tests.Begin(); testItr != tests.End(); ++testItr) {
                             const char* description2 = (*testItr)["description"].GetString();
+                            //printf("running json test %s \n", description2);
                             if (!onlyRunDescription || strcmp(description2, onlyRunDescription) == 0) {
                                 const Value& data = (*testItr)["data"];
                                 bool expected = (*testItr)["valid"].GetBool();
                                 testCount++;
                                 validator.Reset();
-                                bool actual = data.Accept(validator);
+                                data.Accept(validator);
+                                bool actual = validator.IsValid();
                                 if (expected != actual)
                                     printf("Fail: %30s \"%s\" \"%s\"\n", filename, description1, description2);
-                                else
+                                else {
+                                    //printf("Passed: %30s \"%s\" \"%s\"\n", filename, description1, description2);
                                     passCount++;
+                                }
                             }
                         }
                         //printf("%zu %zu %zu\n", documentAllocator.Size(), schemaAllocator.Size(), validatorAllocator.Size());
@@ -1865,8 +2261,8 @@ TEST(SchemaValidator, TestSuite) {
         jsonAllocator.Clear();
     }
     printf("%d / %d passed (%2d%%)\n", passCount, testCount, passCount * 100 / testCount);
-    // if (passCount != testCount)
-    //     ADD_FAILURE();
+    if (passCount != testCount)
+        ADD_FAILURE();
 }
 
 TEST(SchemaValidatingReader, Simple) {
@@ -1897,12 +2293,14 @@ TEST(SchemaValidatingReader, Invalid) {
     EXPECT_FALSE(reader.IsValid());
     EXPECT_EQ(kParseErrorTermination, reader.GetParseResult().Code());
     EXPECT_STREQ("maxLength", reader.GetInvalidSchemaKeyword());
+    EXPECT_TRUE(reader.GetInvalidSchemaCode() == kValidateErrorMaxLength);
     EXPECT_TRUE(reader.GetInvalidSchemaPointer() == SchemaDocument::PointerType(""));
     EXPECT_TRUE(reader.GetInvalidDocumentPointer() == SchemaDocument::PointerType(""));
     EXPECT_TRUE(d.IsNull());
     Document e;
     e.Parse(
         "{ \"maxLength\": {"
+        "     \"errorCode\": 6,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 3, \"actual\": \"ABCD\""
         "}}");
@@ -1933,9 +2331,11 @@ TEST(SchemaValidatingWriter, Simple) {
     EXPECT_FALSE(validator.IsValid());
     EXPECT_TRUE(validator.GetInvalidSchemaPointer() == SchemaDocument::PointerType(""));
     EXPECT_TRUE(validator.GetInvalidDocumentPointer() == SchemaDocument::PointerType(""));
+    EXPECT_TRUE(validator.GetInvalidSchemaCode() == kValidateErrorMaxLength);
     Document e;
     e.Parse(
         "{ \"maxLength\": {"
+"            \"errorCode\": 6,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": 3, \"actual\": \"ABCD\""
         "}}");
@@ -1963,6 +2363,7 @@ TEST(Schema, Issue552) {
     VALIDATE(s, "\"Life, the universe, and everything\"", true);
     INVALIDATE(s, "[\"Life\", \"the universe\", \"and everything\"]", "", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"expected\": [\"string\", \"number\"], \"actual\": \"array\""
         "}}");
@@ -1978,6 +2379,7 @@ TEST(SchemaValidator, Issue608) {
     VALIDATE(s, "{\"a\" : null, \"b\": null}", true);
     INVALIDATE(s, "{\"a\" : null, \"a\" : null}", "", "required", "",
         "{ \"required\": {"
+        "    \"errorCode\": 15,"
         "    \"instanceRef\": \"#\", \"schemaRef\": \"#\","
         "    \"missing\": [\"b\"]"
         "}}");
@@ -1991,13 +2393,6 @@ TEST(SchemaValidator, Issue728_AllOfRef) {
     VALIDATE(s, "{\"key1\": \"abc\", \"key2\": \"def\"}", true);
 }
 
-TEST(SchemaValidator, Issue825) {
-    Document sd;
-    sd.Parse("{\"type\": \"object\", \"additionalProperties\": false, \"patternProperties\": {\"^i\": { \"type\": \"string\" } } }");
-    SchemaDocument s(sd);
-    VALIDATE(s, "{ \"item\": \"hello\" }", true);
-}
-
 TEST(SchemaValidator, Issue1017_allOfHandler) {
     Document sd;
     sd.Parse("{\"allOf\": [{\"type\": \"object\",\"properties\": {\"cyanArray2\": {\"type\": \"array\",\"items\": { \"type\": \"string\" }}}},{\"type\": \"object\",\"properties\": {\"blackArray\": {\"type\": \"array\",\"items\": { \"type\": \"string\" }}},\"required\": [ \"blackArray\" ]}]}");
@@ -2027,25 +2422,210 @@ TEST(SchemaValidator, Ref_remote) {
     typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
     INVALIDATE_(s, "null", "/integer", "type", "",
         "{ \"type\": {"
+        "    \"errorCode\": 20,"
         "    \"instanceRef\": \"#\","
         "    \"schemaRef\": \"http://localhost:1234/subSchemas.json#/integer\","
         "    \"expected\": [\"integer\"], \"actual\": \"null\""
         "}}",
-        SchemaValidatorType, PointerType);
+        kValidateDefaultFlags, SchemaValidatorType, PointerType);
+}
+
+// Merge with id where $ref is full URI
+TEST(SchemaValidator, Ref_remote_change_resolution_scope_uri) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+    Document sd;
+    sd.Parse("{\"id\": \"http://ignore/blah#/ref\", \"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"http://localhost:1234/subSchemas.json#/integer\"}}}");
+    SchemaDocumentType s(sd, 0, 0, &provider);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"myInt\": null}", "/integer", "type", "/myInt",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\": \"#/myInt\","
+        "    \"schemaRef\": \"http://localhost:1234/subSchemas.json#/integer\","
+        "    \"expected\": [\"integer\"], \"actual\": \"null\""
+        "}}",
+        kValidateDefaultFlags, SchemaValidatorType, PointerType);
+}
+
+// Merge with id where $ref is a relative path
+TEST(SchemaValidator, Ref_remote_change_resolution_scope_relative_path) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+    Document sd;
+    sd.Parse("{\"id\": \"http://localhost:1234/\", \"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"subSchemas.json#/integer\"}}}");
+    SchemaDocumentType s(sd, 0, 0, &provider);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"myInt\": null}", "/integer", "type", "/myInt",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\": \"#/myInt\","
+        "    \"schemaRef\": \"http://localhost:1234/subSchemas.json#/integer\","
+        "    \"expected\": [\"integer\"], \"actual\": \"null\""
+        "}}",
+        kValidateDefaultFlags, SchemaValidatorType, PointerType);
+}
+
+// Merge with id where $ref is an absolute path
+TEST(SchemaValidator, Ref_remote_change_resolution_scope_absolute_path) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+    Document sd;
+    sd.Parse("{\"id\": \"http://localhost:1234/xxxx\", \"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/subSchemas.json#/integer\"}}}");
+    SchemaDocumentType s(sd, 0, 0, &provider);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"myInt\": null}", "/integer", "type", "/myInt",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\": \"#/myInt\","
+        "    \"schemaRef\": \"http://localhost:1234/subSchemas.json#/integer\","
+        "    \"expected\": [\"integer\"], \"actual\": \"null\""
+        "}}",
+        kValidateDefaultFlags, SchemaValidatorType, PointerType);
+}
+
+// Merge with id where $ref is an absolute path, and the document has a base URI
+TEST(SchemaValidator, Ref_remote_change_resolution_scope_absolute_path_document) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+    Document sd;
+    sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/subSchemas.json#/integer\"}}}");
+    SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, &provider);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"myInt\": null}", "/integer", "type", "/myInt",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\": \"#/myInt\","
+        "    \"schemaRef\": \"http://localhost:1234/subSchemas.json#/integer\","
+        "    \"expected\": [\"integer\"], \"actual\": \"null\""
+        "}}",
+        kValidateDefaultFlags, SchemaValidatorType, PointerType);
+}
+
+// $ref is a non-JSON pointer fragment and there a matching id
+TEST(SchemaValidator, Ref_internal_id_1) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    Document sd;
+    sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt1\": {\"$ref\": \"#myId\"}, \"myStr\": {\"type\": \"string\", \"id\": \"#myStrId\"}, \"myInt2\": {\"type\": \"integer\", \"id\": \"#myId\"}}}");
+    SchemaDocumentType s(sd);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"myInt1\": null}", "/properties/myInt2", "type", "/myInt1",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\": \"#/myInt1\","
+        "    \"schemaRef\": \"#/properties/myInt2\","
+        "    \"expected\": [\"integer\"], \"actual\": \"null\""
+        "}}",
+        kValidateDefaultFlags, SchemaValidatorType, PointerType);
+}
+
+// $ref is a non-JSON pointer fragment and there are two matching ids so we take the first
+TEST(SchemaValidator, Ref_internal_id_2) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    Document sd;
+    sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt1\": {\"$ref\": \"#myId\"}, \"myInt2\": {\"type\": \"integer\", \"id\": \"#myId\"}, \"myStr\": {\"type\": \"string\", \"id\": \"#myId\"}}}");
+    SchemaDocumentType s(sd);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"myInt1\": null}", "/properties/myInt2", "type", "/myInt1",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\": \"#/myInt1\","
+        "    \"schemaRef\": \"#/properties/myInt2\","
+        "    \"expected\": [\"integer\"], \"actual\": \"null\""
+        "}}",
+        kValidateDefaultFlags, SchemaValidatorType, PointerType);
+}
+
+// $ref is a non-JSON pointer fragment and there is a matching id within array
+TEST(SchemaValidator, Ref_internal_id_in_array) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    Document sd;
+    sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt1\": {\"$ref\": \"#myId\"}, \"myInt2\": {\"anyOf\": [{\"type\": \"string\", \"id\": \"#myStrId\"}, {\"type\": \"integer\", \"id\": \"#myId\"}]}}}");
+    SchemaDocumentType s(sd);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"myInt1\": null}", "/properties/myInt2/anyOf/1", "type", "/myInt1",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\": \"#/myInt1\","
+        "    \"schemaRef\": \"#/properties/myInt2/anyOf/1\","
+        "    \"expected\": [\"integer\"], \"actual\": \"null\""
+        "}}",
+        kValidateDefaultFlags, SchemaValidatorType, PointerType);
+}
+
+// $ref is a non-JSON pointer fragment and there is a matching id, and the schema is embedded in the document
+TEST(SchemaValidator, Ref_internal_id_and_schema_pointer) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    Document sd;
+    sd.Parse("{ \"schema\": {\"type\": \"object\", \"properties\": {\"myInt1\": {\"$ref\": \"#myId\"}, \"myInt2\": {\"anyOf\": [{\"type\": \"integer\", \"id\": \"#myId\"}]}}}}");
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    SchemaDocumentType s(sd, 0, 0, 0, 0, PointerType("/schema"));
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    INVALIDATE_(s, "{\"myInt1\": null}", "/schema/properties/myInt2/anyOf/0", "type", "/myInt1",
+        "{ \"type\": {"
+        "    \"errorCode\": 20,"
+        "    \"instanceRef\": \"#/myInt1\","
+        "    \"schemaRef\": \"#/schema/properties/myInt2/anyOf/0\","
+        "    \"expected\": [\"integer\"], \"actual\": \"null\""
+        "}}",
+        kValidateDefaultFlags, SchemaValidatorType, PointerType);
+}
+
+// Test that $refs are correctly resolved when intermediate multiple ids are present
+// Includes $ref to a part of the document with a different in-scope id, which also contains $ref..
+TEST(SchemaValidator, Ref_internal_multiple_ids) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    //RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+    CrtAllocator allocator;
+    char* schema = ReadFile("unittestschema/idandref.json", allocator);
+    Document sd;
+    sd.Parse(schema);
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocumentType s(sd, "http://xyz", 10/*, &provider*/);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"PA1\": \"s\", \"PA2\": \"t\", \"PA3\": \"r\", \"PX1\": 1, \"PX2Y\": 2, \"PX3Z\": 3, \"PX4\": 4, \"PX5\": 5, \"PX6\": 6, \"PX7W\": 7, \"PX8N\": { \"NX\": 8}}", "#", "errors", "#",
+        "{ \"type\": ["
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PA1\", \"schemaRef\": \"http://xyz#/definitions/A\", \"expected\": [\"integer\"], \"actual\": \"string\"},"
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PA2\", \"schemaRef\": \"http://xyz#/definitions/A\", \"expected\": [\"integer\"], \"actual\": \"string\"},"
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PA3\", \"schemaRef\": \"http://xyz#/definitions/A\", \"expected\": [\"integer\"], \"actual\": \"string\"},"
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PX1\", \"schemaRef\": \"http://xyz#/definitions/B/definitions/X\", \"expected\": [\"boolean\"], \"actual\": \"integer\"},"
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PX2Y\", \"schemaRef\": \"http://xyz#/definitions/B/definitions/X\", \"expected\": [\"boolean\"], \"actual\": \"integer\"},"
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PX3Z\", \"schemaRef\": \"http://xyz#/definitions/B/definitions/X\", \"expected\": [\"boolean\"], \"actual\": \"integer\"},"
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PX4\", \"schemaRef\": \"http://xyz#/definitions/B/definitions/X\", \"expected\": [\"boolean\"], \"actual\": \"integer\"},"
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PX5\", \"schemaRef\": \"http://xyz#/definitions/B/definitions/X\", \"expected\": [\"boolean\"], \"actual\": \"integer\"},"
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PX6\", \"schemaRef\": \"http://xyz#/definitions/B/definitions/X\", \"expected\": [\"boolean\"], \"actual\": \"integer\"},"
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PX7W\", \"schemaRef\": \"http://xyz#/definitions/B/definitions/X\", \"expected\": [\"boolean\"], \"actual\": \"integer\"},"
+        "    {\"errorCode\": 20, \"instanceRef\": \"#/PX8N/NX\", \"schemaRef\": \"http://xyz#/definitions/B/definitions/X\", \"expected\": [\"boolean\"], \"actual\": \"integer\"}"
+        "]}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidatorType, PointerType);
+    CrtAllocator::Free(schema);
 }
 
 TEST(SchemaValidator, Ref_remote_issue1210) {
     class SchemaDocumentProvider : public IRemoteSchemaDocumentProvider {
         SchemaDocument** collection;
 
-        SchemaDocumentProvider(const SchemaDocumentProvider&);
-        SchemaDocumentProvider& operator=(const SchemaDocumentProvider&);
+        // Dummy private copy constructor & assignment operator.
+        // Function bodies added so that they compile in MSVC 2019.
+        SchemaDocumentProvider(const SchemaDocumentProvider&) : collection(NULL) {
+        }
+        SchemaDocumentProvider& operator=(const SchemaDocumentProvider&) {
+            return *this;
+        }
 
         public:
           SchemaDocumentProvider(SchemaDocument** collection) : collection(collection) { }
           virtual const SchemaDocument* GetRemoteDocument(const char* uri, SizeType length) {
             int i = 0;
-            while (collection[i] && SchemaDocument::URIType(uri, length) != collection[i]->GetURI()) ++i;
+            while (collection[i] && SchemaDocument::SValue(uri, length) != collection[i]->GetURI()) ++i;
             return collection[i];
           }
     };
@@ -2067,6 +2647,306 @@ TEST(SchemaValidator, Ref_remote_issue1210) {
     VALIDATE(sx, "{\"country\":\"US\"}", true);
 }
 
+// Test that when kValidateContinueOnErrorFlag is set, all errors are reported.
+TEST(SchemaValidator, ContinueOnErrors) {
+    CrtAllocator allocator;
+    char* schema = ReadFile("unittestschema/address.json", allocator);
+    Document sd;
+    sd.Parse(schema);
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocument s(sd);
+    VALIDATE(s, "{\"version\": 1.0, \"address\": {\"number\": 24, \"street1\": \"The Woodlands\", \"street3\": \"Ham\", \"city\": \"Romsey\", \"area\": \"Kent\", \"country\": \"UK\", \"postcode\": \"SO51 0GP\"}, \"phones\": [\"0111-222333\", \"0777-666888\"], \"names\": [\"Fred\", \"Bloggs\"]}", true);
+    INVALIDATE_(s, "{\"version\": 1.01, \"address\": {\"number\": 0, \"street2\": false,  \"street3\": \"Ham\", \"city\": \"RomseyTownFC\", \"area\": \"BC\", \"country\": \"USA\", \"postcode\": \"999ABC\"}, \"phones\": [], \"planet\": \"Earth\", \"extra\": {\"S_xxx\": 123}}", "#", "errors", "#",
+        "{ \"multipleOf\": {"
+        "    \"errorCode\": 1, \"instanceRef\": \"#/version\", \"schemaRef\": \"#/definitions/decimal_type\", \"expected\": 1.0, \"actual\": 1.01"
+        "  },"
+        "  \"minimum\": {"
+        "    \"errorCode\": 5, \"instanceRef\": \"#/address/number\", \"schemaRef\": \"#/definitions/positiveInt_type\", \"expected\": 0, \"actual\": 0, \"exclusiveMinimum\": true"
+        "  },"
+        "  \"type\": ["
+        "    {\"expected\": [\"null\", \"string\"], \"actual\": \"boolean\", \"errorCode\": 20, \"instanceRef\": \"#/address/street2\", \"schemaRef\": \"#/definitions/address_type/properties/street2\"},"
+        "    {\"expected\": [\"string\"], \"actual\": \"integer\", \"errorCode\": 20, \"instanceRef\": \"#/extra/S_xxx\", \"schemaRef\": \"#/properties/extra/patternProperties/%5ES_\"}"
+        "  ],"
+        "  \"maxLength\": {"
+        "    \"actual\": \"RomseyTownFC\", \"expected\": 10, \"errorCode\": 6, \"instanceRef\": \"#/address/city\", \"schemaRef\": \"#/definitions/address_type/properties/city\""
+        "  },"
+        "  \"anyOf\": {"
+        "    \"errors\":["
+        "      {\"pattern\": {\"actual\": \"999ABC\", \"errorCode\": 8, \"instanceRef\": \"#/address/postcode\", \"schemaRef\": \"#/definitions/address_type/properties/postcode/anyOf/0\"}},"
+        "      {\"pattern\": {\"actual\": \"999ABC\", \"errorCode\": 8, \"instanceRef\": \"#/address/postcode\", \"schemaRef\": \"#/definitions/address_type/properties/postcode/anyOf/1\"}}"
+        "    ],"
+        "    \"errorCode\": 24, \"instanceRef\": \"#/address/postcode\", \"schemaRef\": \"#/definitions/address_type/properties/postcode\""
+        "  },"
+        "  \"allOf\": {"
+        "    \"errors\":["
+        "      {\"enum\":{\"errorCode\":19,\"instanceRef\":\"#/address/country\",\"schemaRef\":\"#/definitions/country_type\"}}"
+        "    ],"
+        "    \"errorCode\":23,\"instanceRef\":\"#/address/country\",\"schemaRef\":\"#/definitions/address_type/properties/country\""
+        "  },"
+        "  \"minItems\": {"
+        "    \"actual\": 0, \"expected\": 1, \"errorCode\": 10, \"instanceRef\": \"#/phones\", \"schemaRef\": \"#/properties/phones\""
+        "  },"
+        "  \"additionalProperties\": {"
+        "    \"disallowed\": \"planet\", \"errorCode\": 16, \"instanceRef\": \"#\", \"schemaRef\": \"#\""
+        "  },"
+        "  \"required\": {"
+        "    \"missing\": [\"street1\"], \"errorCode\": 15, \"instanceRef\": \"#/address\", \"schemaRef\": \"#/definitions/address_type\""
+        "  }"
+        "}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+    INVALIDATE_(s, "{\"address\": {\"number\": 200, \"street1\": {}, \"street3\": null, \"city\": \"Rom\", \"area\": \"Dorset\", \"postcode\": \"SO51 0GP\"}, \"phones\": [\"0111-222333\", \"0777-666888\", \"0777-666888\"], \"names\": [\"Fred\", \"S\", \"M\", \"Bloggs\"]}", "#", "errors", "#",
+        "{ \"maximum\": {"
+        "    \"errorCode\": 3, \"instanceRef\": \"#/address/number\", \"schemaRef\": \"#/definitions/positiveInt_type\", \"expected\": 100, \"actual\": 200, \"exclusiveMaximum\": true"
+        "  },"
+        "  \"type\": {"
+        "    \"expected\": [\"string\"], \"actual\": \"object\", \"errorCode\": 20, \"instanceRef\": \"#/address/street1\", \"schemaRef\": \"#/definitions/address_type/properties/street1\""
+        "  },"
+        "  \"not\": {"
+        "    \"errorCode\": 25, \"instanceRef\": \"#/address/street3\", \"schemaRef\": \"#/definitions/address_type/properties/street3\""
+        "  },"
+        "  \"minLength\": {"
+        "    \"actual\": \"Rom\", \"expected\": 4, \"errorCode\": 7, \"instanceRef\": \"#/address/city\", \"schemaRef\": \"#/definitions/address_type/properties/city\""
+        "  },"
+        "  \"maxItems\": {"
+        "    \"actual\": 3, \"expected\": 2, \"errorCode\": 9, \"instanceRef\": \"#/phones\", \"schemaRef\": \"#/properties/phones\""
+        "  },"
+        "  \"uniqueItems\": {"
+        "    \"duplicates\": [1, 2], \"errorCode\": 11, \"instanceRef\": \"#/phones\", \"schemaRef\": \"#/properties/phones\""
+        "  },"
+        "  \"minProperties\": {\"actual\": 6, \"expected\": 7, \"errorCode\": 14, \"instanceRef\": \"#/address\", \"schemaRef\": \"#/definitions/address_type\""
+        "  },"
+        "  \"additionalItems\": ["
+        "    {\"disallowed\": 2, \"errorCode\": 12, \"instanceRef\": \"#/names\", \"schemaRef\": \"#/properties/names\"},"
+        "    {\"disallowed\": 3, \"errorCode\": 12, \"instanceRef\": \"#/names\", \"schemaRef\": \"#/properties/names\"}"
+        "  ],"
+        "  \"dependencies\": {"
+        "    \"errors\": {"
+        "      \"address\": {\"required\": {\"missing\": [\"version\"], \"errorCode\": 15, \"instanceRef\": \"#\", \"schemaRef\": \"#/dependencies/address\"}},"
+        "      \"names\": {\"required\": {\"missing\": [\"version\"], \"errorCode\": 15, \"instanceRef\": \"#\", \"schemaRef\": \"#/dependencies/names\"}}"
+        "    },"
+        "    \"errorCode\": 18, \"instanceRef\": \"#\", \"schemaRef\": \"#\""
+        "  },"
+        "  \"oneOf\": {"
+        "    \"errors\": ["
+        "      {\"enum\": {\"errorCode\": 19, \"instanceRef\": \"#/address/area\", \"schemaRef\": \"#/definitions/county_type\"}},"
+        "      {\"enum\": {\"errorCode\": 19, \"instanceRef\": \"#/address/area\", \"schemaRef\": \"#/definitions/province_type\"}}"
+        "    ],"
+        "    \"errorCode\": 21, \"instanceRef\": \"#/address/area\", \"schemaRef\": \"#/definitions/address_type/properties/area\""
+        "  }"
+        "}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+
+        CrtAllocator::Free(schema);
+}
+
+// Test that when kValidateContinueOnErrorFlag is set, it is not propagated to oneOf sub-validator so we only get the first error.
+TEST(SchemaValidator, ContinueOnErrors_OneOf) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+    CrtAllocator allocator;
+    char* schema = ReadFile("unittestschema/oneOf_address.json", allocator);
+    Document sd;
+    sd.Parse(schema);
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocumentType s(sd, 0, 0, &provider);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"version\": 1.01, \"address\": {\"number\": 0, \"street2\": false,  \"street3\": \"Ham\", \"city\": \"RomseyTownFC\", \"area\": \"BC\", \"country\": \"USA\", \"postcode\": \"999ABC\"}, \"phones\": [], \"planet\": \"Earth\", \"extra\": {\"S_xxx\": 123}}", "#", "errors", "#",
+        "{ \"oneOf\": {"
+        "    \"errors\": [{"
+        "      \"multipleOf\": {"
+        "        \"errorCode\": 1, \"instanceRef\": \"#/version\", \"schemaRef\": \"http://localhost:1234/address.json#/definitions/decimal_type\", \"expected\": 1.0, \"actual\": 1.01"
+        "      }"
+        "    }],"
+        "    \"errorCode\": 21, \"instanceRef\": \"#\", \"schemaRef\": \"#\""
+        "  }"
+        "}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidatorType, PointerType);
+    CrtAllocator::Free(schema);
+}
+
+// Test that when kValidateContinueOnErrorFlag is set, it is not propagated to allOf sub-validator so we only get the first error.
+TEST(SchemaValidator, ContinueOnErrors_AllOf) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+    CrtAllocator allocator;
+    char* schema = ReadFile("unittestschema/allOf_address.json", allocator);
+    Document sd;
+    sd.Parse(schema);
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocumentType s(sd, 0, 0, &provider);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"version\": 1.01, \"address\": {\"number\": 0, \"street2\": false,  \"street3\": \"Ham\", \"city\": \"RomseyTownFC\", \"area\": \"BC\", \"country\": \"USA\", \"postcode\": \"999ABC\"}, \"phones\": [], \"planet\": \"Earth\", \"extra\": {\"S_xxx\": 123}}", "#", "errors", "#",
+        "{ \"allOf\": {"
+        "    \"errors\": [{"
+        "      \"multipleOf\": {"
+        "        \"errorCode\": 1, \"instanceRef\": \"#/version\", \"schemaRef\": \"http://localhost:1234/address.json#/definitions/decimal_type\", \"expected\": 1.0, \"actual\": 1.01"
+        "      }"
+        "    }],"
+        "    \"errorCode\": 23, \"instanceRef\": \"#\", \"schemaRef\": \"#\""
+        "  }"
+        "}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidatorType, PointerType);
+    CrtAllocator::Free(schema);
+}
+
+// Test that when kValidateContinueOnErrorFlag is set, it is not propagated to anyOf sub-validator so we only get the first error.
+TEST(SchemaValidator, ContinueOnErrors_AnyOf) {
+    typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+    RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+    CrtAllocator allocator;
+    char* schema = ReadFile("unittestschema/anyOf_address.json", allocator);
+    Document sd;
+    sd.Parse(schema);
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocumentType s(sd, 0, 0, &provider);
+    typedef GenericSchemaValidator<SchemaDocumentType, BaseReaderHandler<UTF8<> >, MemoryPoolAllocator<> > SchemaValidatorType;
+    typedef GenericPointer<Value, MemoryPoolAllocator<> > PointerType;
+    INVALIDATE_(s, "{\"version\": 1.01, \"address\": {\"number\": 0, \"street2\": false,  \"street3\": \"Ham\", \"city\": \"RomseyTownFC\", \"area\": \"BC\", \"country\": \"USA\", \"postcode\": \"999ABC\"}, \"phones\": [], \"planet\": \"Earth\", \"extra\": {\"S_xxx\": 123}}", "#", "errors", "#",
+        "{ \"anyOf\": {"
+        "    \"errors\": [{"
+        "      \"multipleOf\": {"
+        "        \"errorCode\": 1, \"instanceRef\": \"#/version\", \"schemaRef\": \"http://localhost:1234/address.json#/definitions/decimal_type\", \"expected\": 1.0, \"actual\": 1.01"
+        "      }"
+        "    }],"
+        "    \"errorCode\": 24, \"instanceRef\": \"#\", \"schemaRef\": \"#\""
+        "  }"
+        "}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidatorType, PointerType);
+
+    CrtAllocator::Free(schema);
+}
+
+// Test that when kValidateContinueOnErrorFlag is set, arrays with uniqueItems:true are correctly processed when an item is invalid.
+// This tests that we don't blow up if a hasher does not get created.
+TEST(SchemaValidator, ContinueOnErrors_UniqueItems) {
+    CrtAllocator allocator;
+    char* schema = ReadFile("unittestschema/address.json", allocator);
+    Document sd;
+    sd.Parse(schema);
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocument s(sd);
+    VALIDATE(s, "{\"phones\":[\"12-34\",\"56-78\"]}", true);
+    INVALIDATE_(s, "{\"phones\":[\"12-34\",\"12-34\"]}", "#", "errors", "#",
+        "{\"uniqueItems\": {\"duplicates\": [0,1], \"errorCode\": 11, \"instanceRef\": \"#/phones\", \"schemaRef\": \"#/properties/phones\"}}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+    INVALIDATE_(s, "{\"phones\":[\"ab-34\",\"cd-78\"]}", "#", "errors", "#",
+        "{\"pattern\": ["
+        "  {\"actual\": \"ab-34\", \"errorCode\": 8, \"instanceRef\": \"#/phones/0\", \"schemaRef\": \"#/definitions/phone_type\"},"
+        "  {\"actual\": \"cd-78\", \"errorCode\": 8, \"instanceRef\": \"#/phones/1\", \"schemaRef\": \"#/definitions/phone_type\"}"
+        "]}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+    CrtAllocator::Free(schema);
+}
+
+// Test that when kValidateContinueOnErrorFlag is set, an enum field is correctly processed when it has an invalid value.
+// This tests that we don't blow up if a hasher does not get created.
+TEST(SchemaValidator, ContinueOnErrors_Enum) {
+    CrtAllocator allocator;
+    char* schema = ReadFile("unittestschema/address.json", allocator);
+    Document sd;
+    sd.Parse(schema);
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocument s(sd);
+    VALIDATE(s, "{\"gender\":\"M\"}", true);
+    INVALIDATE_(s, "{\"gender\":\"X\"}", "#", "errors", "#",
+        "{\"enum\": {\"errorCode\": 19, \"instanceRef\": \"#/gender\", \"schemaRef\": \"#/properties/gender\"}}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+    INVALIDATE_(s, "{\"gender\":1}", "#", "errors", "#",
+        "{\"type\": {\"expected\":[\"string\"], \"actual\": \"integer\", \"errorCode\": 20, \"instanceRef\": \"#/gender\", \"schemaRef\": \"#/properties/gender\"}}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+    CrtAllocator::Free(schema);
+}
+
+// Test that when kValidateContinueOnErrorFlag is set, an array appearing for an object property is handled
+// This tests that we don't blow up when there is a type mismatch.
+TEST(SchemaValidator, ContinueOnErrors_RogueArray) {
+    CrtAllocator allocator;
+    char* schema = ReadFile("unittestschema/address.json", allocator);
+    Document sd;
+    sd.Parse(schema);
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocument s(sd);
+    INVALIDATE_(s, "{\"address\":[{\"number\": 0}]}", "#", "errors", "#",
+        "{\"type\": {\"expected\":[\"object\"], \"actual\": \"array\", \"errorCode\": 20, \"instanceRef\": \"#/address\", \"schemaRef\": \"#/definitions/address_type\"},"
+        "  \"dependencies\": {"
+        "    \"errors\": {"
+        "      \"address\": {\"required\": {\"missing\": [\"version\"], \"errorCode\": 15, \"instanceRef\": \"#\", \"schemaRef\": \"#/dependencies/address\"}}"
+        "    },\"errorCode\": 18, \"instanceRef\": \"#\", \"schemaRef\": \"#\"}}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+    CrtAllocator::Free(schema);
+}
+
+// Test that when kValidateContinueOnErrorFlag is set, an object appearing for an array property is handled
+// This tests that we don't blow up when there is a type mismatch.
+TEST(SchemaValidator, ContinueOnErrors_RogueObject) {
+    CrtAllocator allocator;
+    char* schema = ReadFile("unittestschema/address.json", allocator);
+    Document sd;
+    sd.Parse(schema);
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocument s(sd);
+    INVALIDATE_(s, "{\"phones\":{\"number\": 0}}", "#", "errors", "#",
+        "{\"type\": {\"expected\":[\"array\"], \"actual\": \"object\", \"errorCode\": 20, \"instanceRef\": \"#/phones\", \"schemaRef\": \"#/properties/phones\"}}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+    CrtAllocator::Free(schema);
+}
+
+// Test that when kValidateContinueOnErrorFlag is set, a string appearing for an array or object property is handled
+// This tests that we don't blow up when there is a type mismatch.
+TEST(SchemaValidator, ContinueOnErrors_RogueString) {
+    CrtAllocator allocator;
+    char* schema = ReadFile("unittestschema/address.json", allocator);
+    Document sd;
+    sd.Parse(schema);
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocument s(sd);
+    INVALIDATE_(s, "{\"address\":\"number\"}", "#", "errors", "#",
+        "{\"type\": {\"expected\":[\"object\"], \"actual\": \"string\", \"errorCode\": 20, \"instanceRef\": \"#/address\", \"schemaRef\": \"#/definitions/address_type\"},"
+        "  \"dependencies\": {"
+        "    \"errors\": {"
+        "      \"address\": {\"required\": {\"missing\": [\"version\"], \"errorCode\": 15, \"instanceRef\": \"#\", \"schemaRef\": \"#/dependencies/address\"}}"
+        "    },\"errorCode\": 18, \"instanceRef\": \"#\", \"schemaRef\": \"#\"}}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+    INVALIDATE_(s, "{\"phones\":\"number\"}", "#", "errors", "#",
+        "{\"type\": {\"expected\":[\"array\"], \"actual\": \"string\", \"errorCode\": 20, \"instanceRef\": \"#/phones\", \"schemaRef\": \"#/properties/phones\"}}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+    CrtAllocator::Free(schema);
+}
+
+// Test that when kValidateContinueOnErrorFlag is set, an incorrect simple type with a sub-schema is handled correctly.
+// This tests that we don't blow up when there is a type mismatch but there is a sub-schema present
+TEST(SchemaValidator, ContinueOnErrors_Issue2) {
+    Document sd;
+    sd.Parse("{\"type\":\"string\", \"anyOf\":[{\"maxLength\":2}]}");
+    ASSERT_FALSE(sd.HasParseError());
+    SchemaDocument s(sd);
+    VALIDATE(s, "\"AB\"", true);
+    INVALIDATE_(s, "\"ABC\"", "#", "errors", "#",
+        "{ \"anyOf\": {"
+        "    \"errors\": [{"
+        "      \"maxLength\": {"
+        "        \"errorCode\": 6, \"instanceRef\": \"#\", \"schemaRef\": \"#/anyOf/0\", \"expected\": 2, \"actual\": \"ABC\""
+        "      }"
+        "    }],"
+        "    \"errorCode\": 24, \"instanceRef\": \"#\", \"schemaRef\": \"#\""
+        "  }"
+        "}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+    // Invalid type
+    INVALIDATE_(s, "333", "#", "errors", "#",
+        "{ \"type\": {"
+        "    \"errorCode\": 20, \"instanceRef\": \"#\", \"schemaRef\": \"#\", \"expected\": [\"string\"], \"actual\": \"integer\""
+        "  }"
+        "}",
+        kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
+}
+
+TEST(SchemaValidator, Schema_UnknownError) {
+    ASSERT_TRUE(SchemaValidator::SchemaType::GetValidateErrorKeyword(kValidateErrors).GetString() == std::string("null"));
+}
+
 #if defined(_MSC_VER) || defined(__clang__)
 RAPIDJSON_DIAG_POP
 #endif