Revision 69ed8366

b/Makefile
164 164

  
165 165
$(qapi-obj-y): $(GENERATED_HEADERS)
166 166
qapi-dir := qapi-generated
167
test-visitor.o: QEMU_CFLAGS += -I $(qapi-dir)
167
test-visitor.o test-qmp-commands.o: QEMU_CFLAGS += -I $(qapi-dir)
168 168

  
169 169
$(qapi-dir)/test-qapi-types.c: $(qapi-dir)/test-qapi-types.h
170 170
$(qapi-dir)/test-qapi-types.h: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-types.py
......
172 172
$(qapi-dir)/test-qapi-visit.c: $(qapi-dir)/test-qapi-visit.h
173 173
$(qapi-dir)/test-qapi-visit.h: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-visit.py
174 174
	$(call quiet-command,python $(SRC_PATH)/scripts/qapi-visit.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
175
$(qapi-dir)/test-qmp-commands.h: $(qapi-dir)/test-qmp-marshal.c
176
$(qapi-dir)/test-qmp-marshal.c: $(SRC_PATH)/qapi-schema-test.json $(SRC_PATH)/scripts/qapi-commands.py
177
	    $(call quiet-command,python $(SRC_PATH)/scripts/qapi-commands.py -o "$(qapi-dir)" -p "test-" < $<, "  GEN   $@")
175 178

  
176 179
test-visitor.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h) $(qapi-obj-y)
177 180
test-visitor: test-visitor.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o
178 181

  
182
test-qmp-commands.o: $(addprefix $(qapi-dir)/, test-qapi-types.c test-qapi-types.h test-qapi-visit.c test-qapi-visit.h test-qmp-marshal.c test-qmp-commands.h) $(qapi-obj-y)
183
test-qmp-commands: test-qmp-commands.o qfloat.o qint.o qdict.o qstring.o qlist.o qbool.o $(qapi-obj-y) error.o osdep.o qemu-malloc.o $(oslib-obj-y) qjson.o json-streamer.o json-lexer.o json-parser.o qerror.o qemu-error.o qemu-tool.o $(qapi-dir)/test-qapi-visit.o $(qapi-dir)/test-qapi-types.o $(qapi-dir)/test-qmp-marshal.o module.o
184

  
179 185
QEMULIBS=libhw32 libhw64 libuser libdis libdis-user
180 186

  
181 187
clean:
b/test-qmp-commands.c
1
#include <glib.h>
2
#include "qemu-objects.h"
3
#include "test-qmp-commands.h"
4
#include "qapi/qmp-core.h"
5
#include "module.h"
6

  
7
void qmp_user_def_cmd(Error **errp)
8
{
9
}
10

  
11
void qmp_user_def_cmd1(UserDefOne * ud1, Error **errp)
12
{
13
}
14

  
15
UserDefTwo * qmp_user_def_cmd2(UserDefOne * ud1a, UserDefOne * ud1b, Error **errp)
16
{
17
    UserDefTwo *ret;
18
    UserDefOne *ud1c = qemu_mallocz(sizeof(UserDefOne));
19
    UserDefOne *ud1d = qemu_mallocz(sizeof(UserDefOne));
20

  
21
    ud1c->string = strdup(ud1a->string);
22
    ud1c->integer = ud1a->integer;
23
    ud1d->string = strdup(ud1b->string);
24
    ud1d->integer = ud1b->integer;
25

  
26
    ret = qemu_mallocz(sizeof(UserDefTwo));
27
    ret->string = strdup("blah1");
28
    ret->dict.string = strdup("blah2");
29
    ret->dict.dict.userdef = ud1c;
30
    ret->dict.dict.string = strdup("blah3");
31
    ret->dict.has_dict2 = true;
32
    ret->dict.dict2.userdef = ud1d;
33
    ret->dict.dict2.string = strdup("blah4");
34

  
35
    return ret;
36
}
37

  
38
/* test commands with no input and no return value */
39
static void test_dispatch_cmd(void)
40
{
41
    QDict *req = qdict_new();
42
    QObject *resp;
43

  
44
    qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd")));
45

  
46
    resp = qmp_dispatch(QOBJECT(req));
47
    assert(resp != NULL);
48
    assert(!qdict_haskey(qobject_to_qdict(resp), "error"));
49
    g_print("\nresp: %s\n", qstring_get_str(qobject_to_json(resp)));
50

  
51
    qobject_decref(resp);
52
    QDECREF(req);
53
}
54

  
55
/* test commands that return an error due to invalid parameters */
56
static void test_dispatch_cmd_error(void)
57
{
58
    QDict *req = qdict_new();
59
    QObject *resp;
60

  
61
    qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd2")));
62

  
63
    resp = qmp_dispatch(QOBJECT(req));
64
    assert(resp != NULL);
65
    assert(qdict_haskey(qobject_to_qdict(resp), "error"));
66
    g_print("\nresp: %s\n", qstring_get_str(qobject_to_json_pretty(resp)));
67

  
68
    qobject_decref(resp);
69
    QDECREF(req);
70
}
71

  
72
/* test commands that involve both input parameters and return values */
73
static void test_dispatch_cmd_io(void)
74
{
75
    QDict *req = qdict_new();
76
    QDict *args = qdict_new();
77
    QDict *ud1a = qdict_new();
78
    QDict *ud1b = qdict_new();
79
    QObject *resp;
80

  
81
    qdict_put_obj(ud1a, "integer", QOBJECT(qint_from_int(42)));
82
    qdict_put_obj(ud1a, "string", QOBJECT(qstring_from_str("hello")));
83
    qdict_put_obj(ud1b, "integer", QOBJECT(qint_from_int(422)));
84
    qdict_put_obj(ud1b, "string", QOBJECT(qstring_from_str("hello2")));
85
    qdict_put_obj(args, "ud1a", QOBJECT(ud1a));
86
    qdict_put_obj(args, "ud1b", QOBJECT(ud1b));
87
    qdict_put_obj(req, "arguments", QOBJECT(args));
88

  
89
    qdict_put_obj(req, "execute", QOBJECT(qstring_from_str("user_def_cmd2")));
90

  
91
    /* TODO: put in full payload and check for errors */
92
    resp = qmp_dispatch(QOBJECT(req));
93
    assert(resp != NULL);
94
    assert(!qdict_haskey(qobject_to_qdict(resp), "error"));
95
    g_print("\nresp: %s\n", qstring_get_str(qobject_to_json_pretty(resp)));
96

  
97
    qobject_decref(resp);
98
    QDECREF(req);
99
}
100

  
101
int main(int argc, char **argv)
102
{
103
    g_test_init(&argc, &argv, NULL);
104

  
105
    g_test_add_func("/0.15/dispatch_cmd", test_dispatch_cmd);
106
    g_test_add_func("/0.15/dispatch_cmd_error", test_dispatch_cmd_error);
107
    g_test_add_func("/0.15/dispatch_cmd_io", test_dispatch_cmd_io);
108

  
109
    module_call_init(MODULE_INIT_QAPI);
110
    g_test_run();
111

  
112
    return 0;
113
}

Also available in: Unified diff