luo980/json-schema-validator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve error-message-grammar and style.

Browse Source
This commit is contained in:
garethsb-sony 2019-03-20 15:44:14 +01:00 committed by Patrick Boettcher
parent 6c482e1035
commit c40fb7aa34
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/json-validator.cpp
View File

@ -276,7 +276,7 @@ class logical_combination : public schema
} }
if (count == 0) if (count == 0)
e.error(ptr, instance, "no validation has succeeded but ANYOF/ONEOF them is required to validate."); e.error(ptr, instance, "no validation has succeeded but one of them is required to validate.");
} }
// specialized for each of the logical_combination_types // specialized for each of the logical_combination_types
@ -309,7 +309,7 @@ template <>
bool logical_combination<allOf>::is_validate_complete(const json &instance, const json::json_pointer &ptr, basic_error_handler &e, bool err, size_t) bool logical_combination<allOf>::is_validate_complete(const json &instance, const json::json_pointer &ptr, basic_error_handler &e, bool err, size_t)
{ {
if (err) if (err)
e.error(ptr, instance, "at least one schema has failed, but ALLOF them are required to validate."); e.error(ptr, instance, "at least one schema has failed, but all of them are required to validate.");
return err; return err;
} }
@ -323,7 +323,7 @@ template <>
bool logical_combination<oneOf>::is_validate_complete(const json &instance, const json::json_pointer &ptr, basic_error_handler &e, bool, size_t count) bool logical_combination<oneOf>::is_validate_complete(const json &instance, const json::json_pointer &ptr, basic_error_handler &e, bool, size_t count)
{ {
if (count > 1) if (count > 1)
e.error(ptr, instance, "more than one schema has succeeded, but only ONEOF them is required to validate."); e.error(ptr, instance, "more than one schema has succeeded, but exactly one of them is required to validate.");
return count > 1; return count > 1;
} }
@ -705,7 +705,7 @@ class boolean : public schema
// return; // return;
//} //}
e.error(ptr, instance, "instance invalid as par false-schema"); e.error(ptr, instance, "instance invalid as per false-schema");
} }
} }