Skip to content

Commit

Permalink
tests: Factor out common code in qapi output tests
Browse files Browse the repository at this point in the history 
Create a new visitor_get() function to capture common
actions taken in collecting output from an output visitor,
to make it easier to refactor the output visitors in a
later patch.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1465490926-28625-12-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
  • Loading branch information
@ebblake
ebblake authored and Markus Armbruster committed Jul 6, 2016
1 parent a8fff94 commit 23d1705
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 72 deletions.
78 changes: 27 additions & 51 deletions tests/test-qmp-output-visitor.c
View file
Expand Up @@ -23,6 +23,7 @@
typedef struct TestOutputVisitorData {
QmpOutputVisitor *qov;
Visitor *ov;
QObject *obj;
} TestOutputVisitorData;

static void visitor_output_setup(TestOutputVisitorData *data,
Expand All @@ -41,6 +42,15 @@ static void visitor_output_teardown(TestOutputVisitorData *data,
visit_free(data->ov);
data->qov = NULL;
data->ov = NULL;
qobject_decref(data->obj);
data->obj = NULL;
}

static QObject *visitor_get(TestOutputVisitorData *data)
{
data->obj = qmp_output_get_qobject(data->qov);
g_assert(data->obj);
return data->obj;
}

static void visitor_reset(TestOutputVisitorData *data)
Expand All @@ -57,12 +67,9 @@ static void test_visitor_out_int(TestOutputVisitorData *data,

visit_type_int(data->ov, NULL, &value, &error_abort);

obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QINT);
g_assert_cmpint(qint_get_int(qobject_to_qint(obj)), ==, value);

qobject_decref(obj);
}

static void test_visitor_out_bool(TestOutputVisitorData *data,
Expand All @@ -73,12 +80,9 @@ static void test_visitor_out_bool(TestOutputVisitorData *data,

visit_type_bool(data->ov, NULL, &value, &error_abort);

obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QBOOL);
g_assert(qbool_get_bool(qobject_to_qbool(obj)) == value);

qobject_decref(obj);
}

static void test_visitor_out_number(TestOutputVisitorData *data,
Expand All @@ -89,12 +93,9 @@ static void test_visitor_out_number(TestOutputVisitorData *data,

visit_type_number(data->ov, NULL, &value, &error_abort);

obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QFLOAT);
g_assert(qfloat_get_double(qobject_to_qfloat(obj)) == value);

qobject_decref(obj);
}

static void test_visitor_out_string(TestOutputVisitorData *data,
Expand All @@ -105,12 +106,9 @@ static void test_visitor_out_string(TestOutputVisitorData *data,

visit_type_str(data->ov, NULL, &string, &error_abort);

obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QSTRING);
g_assert_cmpstr(qstring_get_str(qobject_to_qstring(obj)), ==, string);

qobject_decref(obj);
}

static void test_visitor_out_no_string(TestOutputVisitorData *data,
Expand All @@ -122,12 +120,9 @@ static void test_visitor_out_no_string(TestOutputVisitorData *data,
/* A null string should return "" */
visit_type_str(data->ov, NULL, &string, &error_abort);

obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QSTRING);
g_assert_cmpstr(qstring_get_str(qobject_to_qstring(obj)), ==, "");

qobject_decref(obj);
}

static void test_visitor_out_enum(TestOutputVisitorData *data,
Expand All @@ -139,12 +134,10 @@ static void test_visitor_out_enum(TestOutputVisitorData *data,
for (i = 0; i < ENUM_ONE__MAX; i++) {
visit_type_EnumOne(data->ov, "unused", &i, &error_abort);

obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QSTRING);
g_assert_cmpstr(qstring_get_str(qobject_to_qstring(obj)), ==,
EnumOne_lookup[i]);
qobject_decref(obj);
visitor_reset(data);
}
}
Expand Down Expand Up @@ -177,17 +170,14 @@ static void test_visitor_out_struct(TestOutputVisitorData *data,

visit_type_TestStruct(data->ov, NULL, &p, &error_abort);

obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QDICT);

qdict = qobject_to_qdict(obj);
g_assert_cmpint(qdict_size(qdict), ==, 3);
g_assert_cmpint(qdict_get_int(qdict, "integer"), ==, 42);
g_assert_cmpint(qdict_get_bool(qdict, "boolean"), ==, false);
g_assert_cmpstr(qdict_get_str(qdict, "string"), ==, "foo");

QDECREF(qdict);
}

static void test_visitor_out_struct_nested(TestOutputVisitorData *data,
Expand Down Expand Up @@ -222,8 +212,7 @@ static void test_visitor_out_struct_nested(TestOutputVisitorData *data,

visit_type_UserDefTwo(data->ov, "unused", &ud2, &error_abort);

obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QDICT);

qdict = qobject_to_qdict(obj);
Expand All @@ -250,7 +239,6 @@ static void test_visitor_out_struct_nested(TestOutputVisitorData *data,
g_assert_cmpint(qdict_get_int(userdef, "integer"), ==, value);
g_assert_cmpstr(qdict_get_str(userdef, "string"), ==, string);

QDECREF(qdict);
qapi_free_UserDefTwo(ud2);
}

Expand Down Expand Up @@ -302,8 +290,7 @@ static void test_visitor_out_list(TestOutputVisitorData *data,

visit_type_TestStructList(data->ov, NULL, &head, &error_abort);

obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QLIST);

qlist = qobject_to_qlist(obj);
Expand All @@ -324,7 +311,6 @@ static void test_visitor_out_list(TestOutputVisitorData *data,
}
g_assert_cmpint(i, ==, max_items);

QDECREF(qlist);
qapi_free_TestStructList(head);
}

Expand Down Expand Up @@ -368,11 +354,9 @@ static void test_visitor_out_any(TestOutputVisitorData *data,

qobj = QOBJECT(qint_from_int(-42));
visit_type_any(data->ov, NULL, &qobj, &error_abort);
obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
g_assert(qobject_type(obj) == QTYPE_QINT);
g_assert_cmpint(qint_get_int(qobject_to_qint(obj)), ==, -42);
qobject_decref(obj);
qobject_decref(qobj);

visitor_reset(data);
Expand All @@ -383,8 +367,7 @@ static void test_visitor_out_any(TestOutputVisitorData *data,
qobj = QOBJECT(qdict);
visit_type_any(data->ov, NULL, &qobj, &error_abort);
qobject_decref(qobj);
obj = qmp_output_get_qobject(data->qov);
g_assert(obj != NULL);
obj = visitor_get(data);
qdict = qobject_to_qdict(obj);
g_assert(qdict);
qobj = qdict_get(qdict, "integer");
Expand All @@ -402,7 +385,6 @@ static void test_visitor_out_any(TestOutputVisitorData *data,
qstring = qobject_to_qstring(qobj);
g_assert(qstring);
g_assert_cmpstr(qstring_get_str(qstring), ==, "foo");
qobject_decref(obj);
}

static void test_visitor_out_union_flat(TestOutputVisitorData *data,
Expand All @@ -418,7 +400,7 @@ static void test_visitor_out_union_flat(TestOutputVisitorData *data,
tmp->u.value1.boolean = true;

visit_type_UserDefFlatUnion(data->ov, NULL, &tmp, &error_abort);
arg = qmp_output_get_qobject(data->qov);
arg = visitor_get(data);

g_assert(qobject_type(arg) == QTYPE_QDICT);
qdict = qobject_to_qdict(arg);
Expand All @@ -429,7 +411,6 @@ static void test_visitor_out_union_flat(TestOutputVisitorData *data,
g_assert_cmpint(qdict_get_bool(qdict, "boolean"), ==, true);

qapi_free_UserDefFlatUnion(tmp);
QDECREF(qdict);
}

static void test_visitor_out_alternate(TestOutputVisitorData *data,
Expand All @@ -444,27 +425,25 @@ static void test_visitor_out_alternate(TestOutputVisitorData *data,
tmp->u.i = 42;

visit_type_UserDefAlternate(data->ov, NULL, &tmp, &error_abort);
arg = qmp_output_get_qobject(data->qov);
arg = visitor_get(data);

g_assert(qobject_type(arg) == QTYPE_QINT);
g_assert_cmpint(qint_get_int(qobject_to_qint(arg)), ==, 42);

qapi_free_UserDefAlternate(tmp);
qobject_decref(arg);

visitor_reset(data);
tmp = g_new0(UserDefAlternate, 1);
tmp->type = QTYPE_QSTRING;
tmp->u.s = g_strdup("hello");

visit_type_UserDefAlternate(data->ov, NULL, &tmp, &error_abort);
arg = qmp_output_get_qobject(data->qov);
arg = visitor_get(data);

g_assert(qobject_type(arg) == QTYPE_QSTRING);
g_assert_cmpstr(qstring_get_str(qobject_to_qstring(arg)), ==, "hello");

qapi_free_UserDefAlternate(tmp);
qobject_decref(arg);

visitor_reset(data);
tmp = g_new0(UserDefAlternate, 1);
Expand All @@ -475,7 +454,7 @@ static void test_visitor_out_alternate(TestOutputVisitorData *data,
tmp->u.udfu.u.value1.boolean = true;

visit_type_UserDefAlternate(data->ov, NULL, &tmp, &error_abort);
arg = qmp_output_get_qobject(data->qov);
arg = visitor_get(data);

g_assert_cmpint(qobject_type(arg), ==, QTYPE_QDICT);
qdict = qobject_to_qdict(arg);
Expand All @@ -486,7 +465,6 @@ static void test_visitor_out_alternate(TestOutputVisitorData *data,
g_assert_cmpint(qdict_get_bool(qdict, "boolean"), ==, true);

qapi_free_UserDefAlternate(tmp);
qobject_decref(arg);
}

static void test_visitor_out_null(TestOutputVisitorData *data,
Expand All @@ -500,14 +478,13 @@ static void test_visitor_out_null(TestOutputVisitorData *data,
visit_type_null(data->ov, "a", &error_abort);
visit_check_struct(data->ov, &error_abort);
visit_end_struct(data->ov, NULL);
arg = qmp_output_get_qobject(data->qov);
arg = visitor_get(data);
g_assert(qobject_type(arg) == QTYPE_QDICT);
qdict = qobject_to_qdict(arg);
g_assert_cmpint(qdict_size(qdict), ==, 1);
nil = qdict_get(qdict, "a");
g_assert(nil);
g_assert(qobject_type(nil) == QTYPE_QNULL);
qobject_decref(arg);
}

static void init_native_list(UserDefNativeListUnion *cvalue)
Expand Down Expand Up @@ -738,10 +715,9 @@ static void test_native_list(TestOutputVisitorData *data,

visit_type_UserDefNativeListUnion(data->ov, NULL, &cvalue, &error_abort);

obj = qmp_output_get_qobject(data->qov);
obj = visitor_get(data);
check_native_list(obj, cvalue->type);
qapi_free_UserDefNativeListUnion(cvalue);
qobject_decref(obj);
}

static void test_visitor_out_native_list_int(TestOutputVisitorData *data,
Expand Down

0 comments on commit 23d1705

Please sign in to comment.