[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 03/13] tests/qapi-schema: Cover simple argument t
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 03/13] tests/qapi-schema: Cover simple argument types |
Date: |
Sat, 1 Mar 2014 08:40:29 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
tests/qapi-schema/qapi-schema-test.json | 2 ++
tests/qapi-schema/qapi-schema-test.out | 1 +
tests/test-qmp-commands.c | 16 ++++++++++++++++
3 files changed, 19 insertions(+)
diff --git a/tests/qapi-schema/qapi-schema-test.json
b/tests/qapi-schema/qapi-schema-test.json
index d2b1397..3f62821 100644
--- a/tests/qapi-schema/qapi-schema-test.json
+++ b/tests/qapi-schema/qapi-schema-test.json
@@ -53,6 +53,8 @@
{ 'command': 'user_def_cmd2',
'data': {'ud1a': 'UserDefOne', '*ud1b': 'UserDefOne'},
'returns': 'UserDefTwo' }
+{ 'command': 'user_def_cmd3', 'data': {'a': 'int', '*b': 'int' },
+ 'returns': 'int' }
# For testing integer range flattening in opts-visitor. The following schema
# corresponds to the option format:
diff --git a/tests/qapi-schema/qapi-schema-test.out
b/tests/qapi-schema/qapi-schema-test.out
index af9829e..59468ac 100644
--- a/tests/qapi-schema/qapi-schema-test.out
+++ b/tests/qapi-schema/qapi-schema-test.out
@@ -10,6 +10,7 @@
OrderedDict([('command', 'user_def_cmd'), ('data', OrderedDict())]),
OrderedDict([('command', 'user_def_cmd1'), ('data', OrderedDict([('ud1a',
'UserDefOne')]))]),
OrderedDict([('command', 'user_def_cmd2'), ('data', OrderedDict([('ud1a',
'UserDefOne'), ('*ud1b', 'UserDefOne')])), ('returns', 'UserDefTwo')]),
+ OrderedDict([('command', 'user_def_cmd3'), ('data', OrderedDict([('a',
'int'), ('*b', 'int')])), ('returns', 'int')]),
OrderedDict([('type', 'UserDefOptions'), ('data', OrderedDict([('*i64',
['int']), ('*u64', ['uint64']), ('*u16', ['uint16']), ('*i64x', 'int'),
('*u64x', 'uint64')]))])]
['EnumOne', 'UserDefUnionKind', 'UserDefNativeListUnionKind']
[OrderedDict([('type', 'NestedEnumsOne'), ('data', OrderedDict([('enum1',
'EnumOne'), ('*enum2', 'EnumOne'), ('enum3', 'EnumOne'), ('*enum4',
'EnumOne')]))]),
diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c
index d7720ab..4586cee 100644
--- a/tests/test-qmp-commands.c
+++ b/tests/test-qmp-commands.c
@@ -41,6 +41,11 @@ UserDefTwo *qmp_user_def_cmd2(UserDefOne *ud1a,
return ret;
}
+int64_t qmp_user_def_cmd3(int64_t a, bool has_b, int64_t b, Error **errp)
+{
+ return a + (has_b ? b : 0);
+}
+
/* test commands with no input and no return value */
static void test_dispatch_cmd(void)
{
@@ -95,10 +100,12 @@ static void test_dispatch_cmd_io(void)
{
QDict *req = qdict_new();
QDict *args = qdict_new();
+ QDict *args3 = qdict_new();
QDict *ud1a = qdict_new();
QDict *ud1b = qdict_new();
QDict *ret, *ret_dict, *ret_dict_dict, *ret_dict_dict_userdef;
QDict *ret_dict_dict2, *ret_dict_dict2_userdef;
+ QInt *ret3;
qdict_put_obj(ud1a, "integer", QOBJECT(qint_from_int(42)));
qdict_put_obj(ud1a, "string", QOBJECT(qstring_from_str("hello")));
@@ -125,6 +132,15 @@ static void test_dispatch_cmd_io(void)
assert(!strcmp(qdict_get_str(ret_dict_dict2_userdef, "string"), "hello2"));
assert(!strcmp(qdict_get_str(ret_dict_dict2, "string"), "blah4"));
QDECREF(ret);
+
+ qdict_put(args3, "a", qint_from_int(66));
+ qdict_put(req, "arguments", args3);
+ qdict_put(req, "execute", qstring_from_str("user_def_cmd3"));
+
+ ret3 = qobject_to_qint(test_qmp_dispatch(req));
+ assert(qint_get_int(ret3) == 66);
+ QDECREF(ret);
+
QDECREF(req);
}
--
1.8.1.4
- [Qemu-devel] [PATCH v3 02/13] tests/qapi-schema: Cover optional command arguments, (continued)
- [Qemu-devel] [PATCH v3 02/13] tests/qapi-schema: Cover optional command arguments, Markus Armbruster, 2014/03/01
- [Qemu-devel] [PATCH v3 01/13] tests/qapi-schema: Actually check successful QMP command response, Markus Armbruster, 2014/03/01
- [Qemu-devel] [PATCH v3 06/13] tests/qapi-schema: Cover union types with base, Markus Armbruster, 2014/03/01
- [Qemu-devel] [PATCH v3 13/13] qapi: Add missing null check to opts_start_struct(), Markus Armbruster, 2014/03/01
- [Qemu-devel] [PATCH v3 05/13] tests/qapi-schema: Cover complex types with base, Markus Armbruster, 2014/03/01
- [Qemu-devel] [PATCH v3 11/13] qapi: Clean up null checking in generated visitors, Markus Armbruster, 2014/03/01
- [Qemu-devel] [PATCH v3 09/13] qapi: Drop nonsensical header guard in generated qapi-visit.c, Markus Armbruster, 2014/03/01
- [Qemu-devel] [PATCH v3 08/13] qapi: Fix licensing of scripts, Markus Armbruster, 2014/03/01
- [Qemu-devel] [PATCH v3 12/13] qapi: Clean up superfluous null check in qapi_dealloc_type_str(), Markus Armbruster, 2014/03/01
- [Qemu-devel] [PATCH v3 03/13] tests/qapi-schema: Cover simple argument types,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 10/13] qapi: Drop unused code in qapi-commands.py, Markus Armbruster, 2014/03/01
- [Qemu-devel] [PATCH v3 07/13] tests/qapi-schema: Cover flat union types, Markus Armbruster, 2014/03/01
- Re: [Qemu-devel] [PATCH v3 00/13] qapi: Test coverage & clean up generated code, Luiz Capitulino, 2014/03/03