qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aliguori@linux.vnet.ibm.com, Jes.Sorensen@redhat.com,
	agl@linux.vnet.ibm.com, mdroth@linux.vnet.ibm.com,
	lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH v1][ 19/21] qapi: add test-qmp-commands, tests for gen. marshalling/dispatch code
Date: Wed,  1 Jun 2011 12:24:47 -0500	[thread overview]
Message-ID: <1306949089-15597-20-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1306949089-15597-1-git-send-email-mdroth@linux.vnet.ibm.com>


Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 test-qmp-commands.c |  113 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 113 insertions(+), 0 deletions(-)
 create mode 100644 test-qmp-commands.c

diff --git a/test-qmp-commands.c b/test-qmp-commands.c
new file mode 100644
index 0000000..7752904
--- /dev/null
+++ b/test-qmp-commands.c
@@ -0,0 +1,113 @@
+#include <glib.h>
+#include "qemu-objects.h"
+#include "test-qmp-commands.h"
+#include "qapi/qmp-core.h"
+#include "module.h"
+
+void qmp_user_def_cmd(Error **errp)
+{
+}
+
+void qmp_user_def_cmd1(UserDefOne * ud1, Error **errp)
+{
+}
+
+UserDefTwo * qmp_user_def_cmd2(UserDefOne * ud1a, UserDefOne * ud1b, Error **errp)
+{
+    UserDefTwo *ret;
+    UserDefOne *ud1c = qemu_mallocz(sizeof(UserDefOne));
+    UserDefOne *ud1d = qemu_mallocz(sizeof(UserDefOne));
+
+    ud1c->string = strdup(ud1a->string);
+    ud1c->integer = ud1a->integer;
+    ud1d->string = strdup(ud1b->string);
+    ud1d->integer = ud1b->integer;
+
+    ret = qemu_mallocz(sizeof(UserDefTwo));
+    ret->string = strdup("blah1");
+    ret->dict.string = strdup("blah2");
+    ret->dict.dict.userdef = ud1c;
+    ret->dict.dict.string = strdup("blah3");
+    ret->dict.has_dict2 = true;
+    ret->dict.dict2.userdef = ud1d;
+    ret->dict.dict2.string = strdup("blah4");
+
+    return ret;
+}
+
+/* test commands with no input and no return value */
+static void test_dispatch_cmd(void)
+{
+    QDict *req = qdict_new();
+    QObject *resp;
+
+    qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd")));
+
+    resp = qmp_dispatch(QOBJECT(req));
+    assert(resp != NULL);
+    assert(!qdict_haskey(qobject_to_qdict(resp), "error"));
+    g_print("\nresp: %s\n", qstring_get_str(qobject_to_json(resp)));
+
+    qobject_decref(resp);
+    QDECREF(req);
+}
+
+/* test commands that return an error due to invalid parameters */
+static void test_dispatch_cmd_error(void)
+{
+    QDict *req = qdict_new();
+    QObject *resp;
+
+    qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd2")));
+
+    resp = qmp_dispatch(QOBJECT(req));
+    assert(resp != NULL);
+    assert(qdict_haskey(qobject_to_qdict(resp), "error"));
+    g_print("\nresp: %s\n", qstring_get_str(qobject_to_json_pretty(resp)));
+
+    qobject_decref(resp);
+    QDECREF(req);
+}
+
+/* test commands that involve both input parameters and return values */
+static void test_dispatch_cmd_io(void)
+{
+    QDict *req = qdict_new();
+    QDict *args = qdict_new();
+    QDict *ud1a = qdict_new();
+    QDict *ud1b = qdict_new();
+    QObject *resp;
+
+    qdict_put_obj(ud1a, "integer", QOBJECT(qint_from_int(42)));
+    qdict_put_obj(ud1a, "string", QOBJECT(qstring_from_str("hello")));
+    qdict_put_obj(ud1b, "integer", QOBJECT(qint_from_int(422)));
+    qdict_put_obj(ud1b, "string", QOBJECT(qstring_from_str("hello2")));
+    qdict_put_obj(args, "ud1a", QOBJECT(ud1a));
+    qdict_put_obj(args, "ud1b", QOBJECT(ud1b));
+    qdict_put_obj(req, "arguments", QOBJECT(args));
+
+    qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd2")));
+
+    /* TODO: put in full payload and check for errors */
+    resp = qmp_dispatch(QOBJECT(req));
+    assert(resp != NULL);
+    assert(!qdict_haskey(qobject_to_qdict(resp), "error"));
+    g_print("\nresp: %s\n", qstring_get_str(qobject_to_json_pretty(resp)));
+
+    qobject_decref(resp);
+    QDECREF(req);
+}
+
+int main(int argc, char **argv)
+{
+    g_test_init(&argc, &argv, NULL);
+
+    g_test_add_func("/0.15/dispatch_cmd", test_dispatch_cmd);
+    g_test_add_func("/0.15/dispatch_cmd_error", test_dispatch_cmd_error);
+    g_test_add_func("/0.15/dispatch_cmd_io", test_dispatch_cmd_io);
+
+    module_call_init(MODULE_INIT_QAPI);
+    g_test_run();
+
+    return 0;
+}
-- 
1.7.0.4

  parent reply	other threads:[~2011-06-02  3:00 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-01 17:24 [Qemu-devel] [QAPI+QGA 2/3] QAPI code generation infrastructure Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 01/21] Add hard build dependency on glib Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 02/21] qlist: add qlist_first()/qlist_next() Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 03/21] qapi: add module init types for qapi Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 04/21] qapi: add ordereddict/qapi.py helper libraries Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 05/21] qapi: add qapi-types.py code generator Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 06/21] qapi: add qapi-visit.py " Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 07/21] qapi: add qapi-commands.py " Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 08/21] qapi: add qapi-types-core.h Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 09/21] qapi: add qapi-visit-core.h Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 10/21] qapi: add QMP input visiter Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 11/21] qapi: add QMP output visiter Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 12/21] qapi: add QAPI dealloc visiter Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 13/21] qapi: add command registration/lookup functions Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 14/21] qapi: add QMP dispatch functions Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 15/21] qapi: add base declaration/types for QMP Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 16/21] qapi: test schema used for unit tests Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 17/21] qapi: add test-visiter, tests for gen. visiter code Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 18/21] qapi: Makefile changes to build test-visiter Michael Roth
2011-06-01 17:24 ` Michael Roth [this message]
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 20/21] qapi: Makefile changes to build test-qmp-commands Michael Roth
2011-06-01 17:24 ` [Qemu-devel] [PATCH v1][ 21/21] qapi: add QAPI code generation documentation Michael Roth
2011-06-02 13:25   ` Lluís

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1306949089-15597-20-git-send-email-mdroth@linux.vnet.ibm.com \
    --to=mdroth@linux.vnet.ibm.com \
    --cc=Jes.Sorensen@redhat.com \
    --cc=agl@linux.vnet.ibm.com \
    --cc=aliguori@linux.vnet.ibm.com \
    --cc=lcapitulino@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).