[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 02/27] qapi: Strengthen test of TestStructList
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v9 02/27] qapi: Strengthen test of TestStructList |
Date: |
Tue, 3 Nov 2015 23:20:24 -0700 |
Make each list element different, to ensure that order is
preserved, and use the generated free function instead of
hand-rolling our own to ensure (under valgrind) that the
list is properly cleaned.
Suggested-by: Markus Armbruster <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
---
v9: no change
v8: no change
v7: new patch
---
tests/test-qmp-output-visitor.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c
index baf58dc..9364843 100644
--- a/tests/test-qmp-output-visitor.c
+++ b/tests/test-qmp-output-visitor.c
@@ -283,7 +283,7 @@ static void
test_visitor_out_struct_errors(TestOutputVisitorData *data,
static void test_visitor_out_list(TestOutputVisitorData *data,
const void *unused)
{
- char *value_str = (char *) "list value";
+ const char *value_str = "list value";
TestStructList *p, *head = NULL;
const int max_items = 10;
bool value_bool = true;
@@ -294,12 +294,13 @@ static void test_visitor_out_list(TestOutputVisitorData
*data,
QList *qlist;
int i;
+ /* Build the list in reverse order... */
for (i = 0; i < max_items; i++) {
p = g_malloc0(sizeof(*p));
p->value = g_malloc0(sizeof(*p->value));
- p->value->integer = value_int;
+ p->value->integer = value_int + (max_items - i - 1);
p->value->boolean = value_bool;
- p->value->string = value_str;
+ p->value->string = g_strdup(value_str);
p->next = head;
head = p;
@@ -315,6 +316,7 @@ static void test_visitor_out_list(TestOutputVisitorData
*data,
qlist = qobject_to_qlist(obj);
g_assert(!qlist_empty(qlist));
+ /* ...and ensure that the visitor sees it in order */
i = 0;
QLIST_FOREACH_ENTRY(qlist, entry) {
QDict *qdict;
@@ -322,7 +324,7 @@ static void test_visitor_out_list(TestOutputVisitorData
*data,
g_assert(qobject_type(entry->value) == QTYPE_QDICT);
qdict = qobject_to_qdict(entry->value);
g_assert_cmpint(qdict_size(qdict), ==, 3);
- g_assert_cmpint(qdict_get_int(qdict, "integer"), ==, value_int);
+ g_assert_cmpint(qdict_get_int(qdict, "integer"), ==, value_int + i);
g_assert_cmpint(qdict_get_bool(qdict, "boolean"), ==, value_bool);
g_assert_cmpstr(qdict_get_str(qdict, "string"), ==, value_str);
i++;
@@ -330,13 +332,7 @@ static void test_visitor_out_list(TestOutputVisitorData
*data,
g_assert_cmpint(i, ==, max_items);
QDECREF(qlist);
-
- for (p = head; p;) {
- TestStructList *tmp = p->next;
- g_free(p->value);
- g_free(p);
- p = tmp;
- }
+ qapi_free_TestStructList(head);
}
static void test_visitor_out_list_qapi_free(TestOutputVisitorData *data,
--
2.4.3
- [Qemu-devel] [PATCH v9 00/27] alternate layout (post-introspection cleanups, subset C), Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 07/27] qapi: More tests of input arrays, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 05/27] qapi: More tests of alternate output, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 06/27] qapi: Test failure in middle of array parse, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 02/27] qapi: Strengthen test of TestStructList,
Eric Blake <=
- [Qemu-devel] [PATCH v9 10/27] qapi: Track simple union tag in object.local_members, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 09/27] qapi-introspect: Document lack of sorting, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 14/27] qapi: Fix up commit 7618b91's clash sanity checking change, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 13/27] qapi: Drop obsolete tag value collision assertions, Eric Blake, 2015/11/04
- [Qemu-devel] [PATCH v9 03/27] qapi: Plug leaks in test-qmp-*, Eric Blake, 2015/11/04