Patchwork [v2,17/21] qapi: add test-visiter, tests for gen. visiter code

login
register
mail settings
Submitter Michael Roth
Date June 3, 2011, 10:33 p.m.
Message ID <1307140399-9023-18-git-send-email-mdroth@linux.vnet.ibm.com>
Download mbox | patch
Permalink /patch/98689/
State New
Headers show

Comments

Michael Roth - June 3, 2011, 10:33 p.m.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 test-visiter.c |  214 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 214 insertions(+), 0 deletions(-)
 create mode 100644 test-visiter.c
Anthony Liguori - June 7, 2011, 7:08 p.m.
On 06/03/2011 05:33 PM, Michael Roth wrote:
> Signed-off-by: Michael Roth<mdroth@linux.vnet.ibm.com>
> ---
>   test-visiter.c |  214 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>   1 files changed, 214 insertions(+), 0 deletions(-)
>   create mode 100644 test-visiter.c
>
> diff --git a/test-visiter.c b/test-visiter.c
> new file mode 100644
> index 0000000..31596a0
> --- /dev/null
> +++ b/test-visiter.c
> @@ -0,0 +1,214 @@
> +#include<glib.h>
> +#include "qapi/qmp-output-visiter.h"
> +#include "qapi/qmp-input-visiter.h"
> +#include "test-qapi-types.h"
> +#include "test-qapi-visit.h"
> +#include "qemu-objects.h"
> +
> +typedef struct TestStruct
> +{
> +    int64_t x;
> +    int64_t y;
> +} TestStruct;
> +
> +typedef struct TestStructList
> +{
> +    TestStruct *value;
> +    struct TestStructList *next;
> +} TestStructList;
> +
> +static void visit_type_TestStruct(Visiter *v, TestStruct **obj, const char *name, Error **errp)
> +{
> +    visit_start_struct(v, (void **)obj, "TestStruct", name, errp);
> +    visit_type_int(v,&(*obj)->x, "x", errp);
> +    visit_type_int(v,&(*obj)->y, "y", errp);
> +    visit_end_struct(v, errp);
> +}
> +
> +static void visit_type_TestStructList(Visiter *m, TestStructList ** obj, const char *name, Error **errp)
> +{
> +    GenericList *i;
> +
> +    visit_start_list(m, name, errp);
> +
> +    for (i = visit_next_list(m, (GenericList **)obj, errp); i; i = visit_next_list(m,&i, errp)) {
> +        TestStructList *native_i = (TestStructList *)i;
> +        visit_type_TestStruct(m,&native_i->value, NULL, errp);
> +    }
> +
> +    visit_end_list(m, errp);
> +}
> +
> +/* test deep nesting with refs to other user-defined types */
> +static void test_nested_structs(void)
> +{
> +    QmpOutputVisiter *mo;
> +    QmpInputVisiter *mi;
> +    Visiter *v;
> +    UserDefOne ud1;
> +    UserDefOne *ud1_p =&ud1, *ud1c_p = NULL;
> +    UserDefTwo ud2;
> +    UserDefTwo *ud2_p =&ud2, *ud2c_p = NULL;
> +    Error *err = NULL;
> +    QObject *obj;
> +    QString *str;
> +
> +    ud1.integer = 42;
> +    ud1.string = strdup("fourty two");
> +
> +    /* sanity check */
> +    mo = qmp_output_visiter_new();
> +    v = qmp_output_get_visiter(mo);
> +    visit_type_UserDefOne(v,&ud1_p, "o_O",&err);
> +    if (err) {
> +        g_error("%s", error_get_pretty(err));
> +    }
> +    obj = qmp_output_get_qobject(mo);
> +    g_assert(obj);
> +    qobject_decref(obj);
> +
> +    ud2.string = strdup("fourty three");
> +    ud2.dict.string = strdup("fourty four");
> +    ud2.dict.dict.userdef = ud1_p;
> +    ud2.dict.dict.string = strdup("fourty five");
> +    ud2.dict.has_dict2 = true;
> +    ud2.dict.dict2.userdef = ud1_p;
> +    ud2.dict.dict2.string = strdup("fourty six");
> +
> +    /* c type ->  qobject */
> +    mo = qmp_output_visiter_new();
> +    v = qmp_output_get_visiter(mo);
> +    visit_type_UserDefTwo(v,&ud2_p, "unused",&err);
> +    if (err) {
> +        g_error("%s", error_get_pretty(err));
> +    }
> +    obj = qmp_output_get_qobject(mo);
> +    g_assert(obj);
> +    str = qobject_to_json_pretty(obj);
> +    g_print("%s\n", qstring_get_str(str));
> +    QDECREF(str);
> +
> +    /* qobject ->  c type, should match original struct */
> +    mi = qmp_input_visiter_new(obj);
> +    v = qmp_input_get_visiter(mi);
> +    visit_type_UserDefTwo(v,&ud2c_p, NULL,&err);
> +    if (err) {
> +        g_error("%s", error_get_pretty(err));
> +    }
> +
> +    g_assert(!g_strcmp0(ud2c_p->string, ud2.string));
> +    g_assert(!g_strcmp0(ud2c_p->dict.string, ud2.dict.string));
> +
> +    ud1c_p = ud2c_p->dict.dict.userdef;
> +    g_assert(ud1c_p->integer == ud1_p->integer);
> +    g_assert(!g_strcmp0(ud1c_p->string, ud1_p->string));
> +
> +    g_assert(!g_strcmp0(ud2c_p->dict.dict.string, ud2.dict.dict.string));
> +
> +    ud1c_p = ud2c_p->dict.dict2.userdef;
> +    g_assert(ud1c_p->integer == ud1_p->integer);
> +    g_assert(!g_strcmp0(ud1c_p->string, ud1_p->string));
> +
> +    g_assert(!g_strcmp0(ud2c_p->dict.dict2.string, ud2.dict.dict2.string));
> +    qemu_free(ud1.string);
> +    qemu_free(ud2.string);
> +    qemu_free(ud2.dict.string);
> +    qemu_free(ud2.dict.dict.string);
> +    qemu_free(ud2.dict.dict2.string);
> +
> +    qapi_free_UserDefTwo(ud2c_p);
> +
> +    qobject_decref(obj);
> +}
> +
> +int main(int argc, char **argv)
> +{
> +    QmpOutputVisiter *mo;
> +    QmpInputVisiter *mi;
> +    Visiter *v;
> +    TestStruct ts = { 42, 82 };
> +    TestStruct *pts =&ts;
> +    TestStructList *lts = NULL;
> +    Error *err = NULL;
> +    QObject *obj;
> +    QString *str;
> +
> +    g_test_init(&argc,&argv, NULL);
> +
> +    mo = qmp_output_visiter_new();
> +    v = qmp_output_get_visiter(mo);
> +
> +    visit_type_TestStruct(v,&pts, NULL,&err);
> +
> +    obj = qmp_output_get_qobject(mo);
> +
> +    str = qobject_to_json(obj);
> +
> +    printf("%s\n", qstring_get_str(str));
> +
> +    QDECREF(str);
> +
> +    obj = QOBJECT(qint_from_int(0x42));
> +
> +    mi = qmp_input_visiter_new(obj);
> +    v = qmp_input_get_visiter(mi);
> +
> +    int64_t value = 0;
> +
> +    visit_type_int(v,&value, NULL,&err);
> +    if (err) {
> +        printf("%s\n", error_get_pretty(err));
> +        return 1;
> +    }
> +
> +    g_assert(value == 0x42);
> +
> +    qobject_decref(obj);
> +
> +    obj = qobject_from_json("{'x': 42, 'y': 84}");
> +    mi = qmp_input_visiter_new(obj);
> +    v = qmp_input_get_visiter(mi);
> +
> +    pts = NULL;
> +
> +    visit_type_TestStruct(v,&pts, NULL,&err);
> +    if (err) {
> +        printf("%s\n", error_get_pretty(err));
> +        return 1;
> +    }
> +
> +    g_assert(pts != NULL);
> +    g_assert(pts->x == 42);
> +    g_assert(pts->y == 84);
> +
> +    qobject_decref(obj);
> +
> +    obj = qobject_from_json("[{'x': 42, 'y': 84}, {'x': 12, 'y': 24}]");
> +    mi = qmp_input_visiter_new(obj);
> +    v = qmp_input_get_visiter(mi);
> +
> +    visit_type_TestStructList(v,&lts, NULL,&err);
> +    if (err) {
> +        printf("%s\n", error_get_pretty(err));
> +        return 1;
> +    }
> +
> +    g_assert(lts != NULL);
> +    g_assert(lts->value->x == 42);
> +    g_assert(lts->value->y == 84);
> +
> +    lts = lts->next;
> +    g_assert(lts != NULL);
> +    g_assert(lts->value->x == 12);
> +    g_assert(lts->value->y == 24);
> +
> +    g_assert(lts->next == NULL);
> +
> +    qobject_decref(obj);

Please stick the above into a function so you can make it a named tested.

Regards,

Anthony Liguori

> +
> +    g_test_add_func("/0.15/nested_structs", test_nested_structs);
> +
> +    g_test_run();
> +
> +    return 0;
> +}

Patch

diff --git a/test-visiter.c b/test-visiter.c
new file mode 100644
index 0000000..31596a0
--- /dev/null
+++ b/test-visiter.c
@@ -0,0 +1,214 @@ 
+#include <glib.h>
+#include "qapi/qmp-output-visiter.h"
+#include "qapi/qmp-input-visiter.h"
+#include "test-qapi-types.h"
+#include "test-qapi-visit.h"
+#include "qemu-objects.h"
+
+typedef struct TestStruct
+{
+    int64_t x;
+    int64_t y;
+} TestStruct;
+
+typedef struct TestStructList
+{
+    TestStruct *value;
+    struct TestStructList *next;
+} TestStructList;
+
+static void visit_type_TestStruct(Visiter *v, TestStruct **obj, const char *name, Error **errp)
+{
+    visit_start_struct(v, (void **)obj, "TestStruct", name, errp);
+    visit_type_int(v, &(*obj)->x, "x", errp);
+    visit_type_int(v, &(*obj)->y, "y", errp);
+    visit_end_struct(v, errp);
+}
+
+static void visit_type_TestStructList(Visiter *m, TestStructList ** obj, const char *name, Error **errp)
+{
+    GenericList *i;
+
+    visit_start_list(m, name, errp);
+    
+    for (i = visit_next_list(m, (GenericList **)obj, errp); i; i = visit_next_list(m, &i, errp)) {
+        TestStructList *native_i = (TestStructList *)i;
+        visit_type_TestStruct(m, &native_i->value, NULL, errp);
+    }
+
+    visit_end_list(m, errp);
+}
+
+/* test deep nesting with refs to other user-defined types */
+static void test_nested_structs(void)
+{
+    QmpOutputVisiter *mo;
+    QmpInputVisiter *mi;
+    Visiter *v;
+    UserDefOne ud1;
+    UserDefOne *ud1_p = &ud1, *ud1c_p = NULL;
+    UserDefTwo ud2;
+    UserDefTwo *ud2_p = &ud2, *ud2c_p = NULL;
+    Error *err = NULL;
+    QObject *obj;
+    QString *str;
+
+    ud1.integer = 42;
+    ud1.string = strdup("fourty two");
+
+    /* sanity check */
+    mo = qmp_output_visiter_new();
+    v = qmp_output_get_visiter(mo);
+    visit_type_UserDefOne(v, &ud1_p, "o_O", &err);
+    if (err) {
+        g_error("%s", error_get_pretty(err));
+    }
+    obj = qmp_output_get_qobject(mo);
+    g_assert(obj);
+    qobject_decref(obj);
+
+    ud2.string = strdup("fourty three");
+    ud2.dict.string = strdup("fourty four");
+    ud2.dict.dict.userdef = ud1_p;
+    ud2.dict.dict.string = strdup("fourty five");
+    ud2.dict.has_dict2 = true;
+    ud2.dict.dict2.userdef = ud1_p;
+    ud2.dict.dict2.string = strdup("fourty six");
+
+    /* c type -> qobject */
+    mo = qmp_output_visiter_new();
+    v = qmp_output_get_visiter(mo);
+    visit_type_UserDefTwo(v, &ud2_p, "unused", &err);
+    if (err) {
+        g_error("%s", error_get_pretty(err));
+    }
+    obj = qmp_output_get_qobject(mo);
+    g_assert(obj);
+    str = qobject_to_json_pretty(obj);
+    g_print("%s\n", qstring_get_str(str));
+    QDECREF(str);
+
+    /* qobject -> c type, should match original struct */
+    mi = qmp_input_visiter_new(obj);
+    v = qmp_input_get_visiter(mi);
+    visit_type_UserDefTwo(v, &ud2c_p, NULL, &err);
+    if (err) {
+        g_error("%s", error_get_pretty(err));
+    }
+
+    g_assert(!g_strcmp0(ud2c_p->string, ud2.string));
+    g_assert(!g_strcmp0(ud2c_p->dict.string, ud2.dict.string));
+
+    ud1c_p = ud2c_p->dict.dict.userdef;
+    g_assert(ud1c_p->integer == ud1_p->integer);
+    g_assert(!g_strcmp0(ud1c_p->string, ud1_p->string));
+
+    g_assert(!g_strcmp0(ud2c_p->dict.dict.string, ud2.dict.dict.string));
+
+    ud1c_p = ud2c_p->dict.dict2.userdef;
+    g_assert(ud1c_p->integer == ud1_p->integer);
+    g_assert(!g_strcmp0(ud1c_p->string, ud1_p->string));
+
+    g_assert(!g_strcmp0(ud2c_p->dict.dict2.string, ud2.dict.dict2.string));
+    qemu_free(ud1.string);
+    qemu_free(ud2.string);
+    qemu_free(ud2.dict.string);
+    qemu_free(ud2.dict.dict.string);
+    qemu_free(ud2.dict.dict2.string);
+
+    qapi_free_UserDefTwo(ud2c_p);
+
+    qobject_decref(obj);
+}
+
+int main(int argc, char **argv)
+{
+    QmpOutputVisiter *mo;
+    QmpInputVisiter *mi;
+    Visiter *v;
+    TestStruct ts = { 42, 82 };
+    TestStruct *pts = &ts;
+    TestStructList *lts = NULL;
+    Error *err = NULL;
+    QObject *obj;
+    QString *str;
+
+    g_test_init(&argc, &argv, NULL);
+
+    mo = qmp_output_visiter_new();
+    v = qmp_output_get_visiter(mo);
+
+    visit_type_TestStruct(v, &pts, NULL, &err);
+
+    obj = qmp_output_get_qobject(mo);
+
+    str = qobject_to_json(obj);
+
+    printf("%s\n", qstring_get_str(str));
+
+    QDECREF(str);
+
+    obj = QOBJECT(qint_from_int(0x42));
+
+    mi = qmp_input_visiter_new(obj);
+    v = qmp_input_get_visiter(mi);
+
+    int64_t value = 0;
+
+    visit_type_int(v, &value, NULL, &err);
+    if (err) {
+        printf("%s\n", error_get_pretty(err));
+        return 1;
+    }
+
+    g_assert(value == 0x42);
+
+    qobject_decref(obj);
+
+    obj = qobject_from_json("{'x': 42, 'y': 84}");
+    mi = qmp_input_visiter_new(obj);
+    v = qmp_input_get_visiter(mi);
+
+    pts = NULL;
+
+    visit_type_TestStruct(v, &pts, NULL, &err);
+    if (err) {
+        printf("%s\n", error_get_pretty(err));
+        return 1;
+    }
+
+    g_assert(pts != NULL);
+    g_assert(pts->x == 42);
+    g_assert(pts->y == 84);
+
+    qobject_decref(obj);
+
+    obj = qobject_from_json("[{'x': 42, 'y': 84}, {'x': 12, 'y': 24}]");
+    mi = qmp_input_visiter_new(obj);
+    v = qmp_input_get_visiter(mi);
+
+    visit_type_TestStructList(v, &lts, NULL, &err);
+    if (err) {
+        printf("%s\n", error_get_pretty(err));
+        return 1;
+    }
+
+    g_assert(lts != NULL);
+    g_assert(lts->value->x == 42);
+    g_assert(lts->value->y == 84);
+
+    lts = lts->next;
+    g_assert(lts != NULL);
+    g_assert(lts->value->x == 12);
+    g_assert(lts->value->y == 24);
+
+    g_assert(lts->next == NULL);
+
+    qobject_decref(obj);
+
+    g_test_add_func("/0.15/nested_structs", test_nested_structs);
+
+    g_test_run();
+
+    return 0;
+}