david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check-qjson: Simplify around compare_litqobj_to_qobj()

Browse Source 
Make compare_litqobj_to_qobj() cope with null, and drop non-null
assertions from callers.

compare_litqobj_to_qobj() already checks the QType matches; drop the
redundant assertions from callers.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1487363905-9480-5-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2017-02-17 21:38:15 +01:00
parent a68931ea5f
commit 9eaaf97168
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/check-qjson.c
View File

@ -1110,7 +1110,7 @@ static void compare_helper(QObject *obj, void *opaque)
static int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs) static int compare_litqobj_to_qobj(LiteralQObject *lhs, QObject *rhs)
{ {
if (lhs->type != qobject_type(rhs)) { if (!rhs || lhs->type != qobject_type(rhs)) {
return 0; return 0;
} }
@ -1184,18 +1184,12 @@ static void simple_dict(void)
QString *str; QString *str;
obj = qobject_from_json(test_cases[i].encoded); obj = qobject_from_json(test_cases[i].encoded);
g_assert(obj != NULL);
g_assert(qobject_type(obj) == QTYPE_QDICT);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
str = qobject_to_json(obj); str = qobject_to_json(obj);
qobject_decref(obj); qobject_decref(obj);
obj = qobject_from_json(qstring_get_str(str)); obj = qobject_from_json(qstring_get_str(str));
g_assert(obj != NULL);
g_assert(qobject_type(obj) == QTYPE_QDICT);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
qobject_decref(obj); qobject_decref(obj);
QDECREF(str); QDECREF(str);
@ -1299,18 +1293,12 @@ static void simple_list(void)
QString *str; QString *str;
obj = qobject_from_json(test_cases[i].encoded); obj = qobject_from_json(test_cases[i].encoded);
g_assert(obj != NULL);
g_assert(qobject_type(obj) == QTYPE_QLIST);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
str = qobject_to_json(obj); str = qobject_to_json(obj);
qobject_decref(obj); qobject_decref(obj);
obj = qobject_from_json(qstring_get_str(str)); obj = qobject_from_json(qstring_get_str(str));
g_assert(obj != NULL);
g_assert(qobject_type(obj) == QTYPE_QLIST);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
qobject_decref(obj); qobject_decref(obj);
QDECREF(str); QDECREF(str);
@ -1367,18 +1355,12 @@ static void simple_whitespace(void)
QString *str; QString *str;
obj = qobject_from_json(test_cases[i].encoded); obj = qobject_from_json(test_cases[i].encoded);
g_assert(obj != NULL);
g_assert(qobject_type(obj) == QTYPE_QLIST);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
str = qobject_to_json(obj); str = qobject_to_json(obj);
qobject_decref(obj); qobject_decref(obj);
obj = qobject_from_json(qstring_get_str(str)); obj = qobject_from_json(qstring_get_str(str));
g_assert(obj != NULL);
g_assert(qobject_type(obj) == QTYPE_QLIST);
g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&test_cases[i].decoded, obj) == 1);
qobject_decref(obj); qobject_decref(obj);
@ -1403,8 +1385,6 @@ static void simple_varargs(void)
g_assert(embedded_obj != NULL); g_assert(embedded_obj != NULL);
obj = qobject_from_jsonf("[%d, 2, %p]", 1, embedded_obj); obj = qobject_from_jsonf("[%d, 2, %p]", 1, embedded_obj);
g_assert(obj != NULL);
g_assert(compare_litqobj_to_qobj(&decoded, obj) == 1); g_assert(compare_litqobj_to_qobj(&decoded, obj) == 1);
qobject_decref(obj); qobject_decref(obj);