gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Turn off some not-yet-implemented test cases, and fix a few

Browse Source 
[ci skip]
This commit is contained in:
miloyip 2015-05-06 18:31:56 +08:00
parent 5ad3639dd5
commit ca2061acef
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/rapidjson/schema.h
View File

@ -960,8 +960,8 @@ public:
virtual bool StartObject(Context&) const { return false; }
virtual bool Key(Context&, const Ch*, SizeType, bool) const { return false; }
virtual bool EndObject(Context&, SizeType) const { return false; }
virtual bool StartArray(Context&) const { return true; }
virtual bool EndArray(Context&, SizeType) const { return true; }
virtual bool StartArray(Context&) const { return false; }
virtual bool EndArray(Context&, SizeType) const { return false; }
private:
#if RAPIDJSON_SCHEMA_USE_STDREGEX
@ -1350,6 +1350,7 @@ public:
while (!schemaStack_.Empty())
PopSchema();
//documentStack_.Clear();
valid_ = true;
};
// Implementation of ISchemaValidator<Encoding>

39
test/unittest/schematest.cpp
View File

@ -645,8 +645,8 @@ TEST(SchemaValidator, TestSuite) {
"additionalProperties.json",
"allOf.json",
"anyOf.json",
"definitions.json",
"dependencies.json",
//"definitions.json",
//"dependencies.json",
"enum.json",
"items.json",
"maximum.json",
@ -660,16 +660,21 @@ TEST(SchemaValidator, TestSuite) {
"multipleOf.json",
"not.json",
"oneOf.json",
#if RAPIDJSON_SCHEMA_HAS_REGEX
"pattern.json",
"patternProperties.json",
#endif
"properties.json",
"ref.json",
"refRemote.json",
//"ref.json",
//"refRemote.json",
"required.json",
"type.json",
"uniqueItems.json"
//"uniqueItems.json"
};
const char* onlyRunDescription = 0;
//const char* onlyRunDescription = "a string is a string";
unsigned testCount = 0;
unsigned passCount = 0;
@ -694,19 +699,21 @@ TEST(SchemaValidator, TestSuite) {
SchemaValidator validator(schema);
const Value& tests = (*schemaItr)["tests"];
for (Value::ConstValueIterator testItr = tests.Begin(); testItr != tests.End(); ++testItr) {
testCount++;
const Value& data = (*testItr)["data"];
bool expected = (*testItr)["valid"].GetBool();
const char* description = (*testItr)["description"].GetString();
validator.Reset();
bool actual = data.Accept(validator);
if (expected != actual) {
char buffer[256];
sprintf(buffer, "%s \"%s\"", filename, description);
GTEST_NONFATAL_FAILURE_(buffer);
if (!onlyRunDescription || strcmp(description, onlyRunDescription) == 0) {
const Value& data = (*testItr)["data"];
bool expected = (*testItr)["valid"].GetBool();
testCount++;
validator.Reset();
bool actual = data.Accept(validator);
if (expected != actual) {
char buffer[256];
sprintf(buffer, "%s \"%s\"", filename, description);
GTEST_NONFATAL_FAILURE_(buffer);
}
else
passCount++;
}
else
passCount++;
}
}
}