[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 13/14] qapi: More tests of input arrays
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v7 13/14] qapi: More tests of input arrays |
Date: |
Fri, 16 Oct 2015 22:35:48 -0600 |
Our testsuite had no coverage of empty arrays, nor of what
happens when the input does not match the expected type.
Useful to have, especially if we start changing the visitor
contracts.
Signed-off-by: Eric Blake <address@hidden>
---
v7: no change
v6: new patch
---
tests/test-qmp-input-visitor.c | 51 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
index f036b65..ce5bc65 100644
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -236,6 +236,12 @@ static void test_visitor_in_list(TestInputVisitorData
*data,
}
qapi_free_UserDefOneList(head);
+ head = NULL;
+
+ /* An empty list is valid */
+ v = visitor_input_test_init(data, "[]");
+ visit_type_UserDefOneList(v, &head, NULL, &error_abort);
+ g_assert(!head);
}
static void test_visitor_in_any(TestInputVisitorData *data,
@@ -716,6 +722,49 @@ static void test_visitor_in_errors(TestInputVisitorData
*data,
qapi_free_strList(q);
}
+static void test_visitor_in_wrong_type(TestInputVisitorData *data,
+ const void *unused)
+{
+ TestStruct *p = NULL;
+ Visitor *v;
+ strList *q = NULL;
+ int64_t i;
+
+ /* Make sure arrays and structs cannot be confused */
+
+ v = visitor_input_test_init(data, "[]");
+ visit_type_TestStruct(v, &p, NULL, &data->err);
+ g_assert(data->err);
+ g_assert(!p);
+
+ v = visitor_input_test_init(data, "{}");
+ visit_type_strList(v, &q, NULL, &data->err);
+ assert(data->err);
+ assert(!q);
+
+ /* Make sure primitives and struct cannot be confused */
+
+ v = visitor_input_test_init(data, "1");
+ visit_type_TestStruct(v, &p, NULL, &data->err);
+ g_assert(data->err);
+ g_assert(!p);
+
+ v = visitor_input_test_init(data, "{}");
+ visit_type_int(v, &i, NULL, &data->err);
+ assert(data->err);
+
+ /* Make sure primitives and arrays cannot be confused */
+
+ v = visitor_input_test_init(data, "1");
+ visit_type_strList(v, &q, NULL, &data->err);
+ assert(data->err);
+ assert(!q);
+
+ v = visitor_input_test_init(data, "[]");
+ visit_type_int(v, &i, NULL, &data->err);
+ assert(data->err);
+}
+
int main(int argc, char **argv)
{
TestInputVisitorData in_visitor_data;
@@ -748,6 +797,8 @@ int main(int argc, char **argv)
&in_visitor_data, test_visitor_in_alternate);
input_visitor_test_add("/visitor/input/errors",
&in_visitor_data, test_visitor_in_errors);
+ input_visitor_test_add("/visitor/input/wrong-type",
+ &in_visitor_data, test_visitor_in_wrong_type);
input_visitor_test_add("/visitor/input/alternate-number",
&in_visitor_data, test_visitor_in_alternate_number);
input_visitor_test_add("/visitor/input/native_list/int",
--
2.4.3
- [Qemu-devel] [PATCH v7 04/14] qapi-introspect: Guarantee particular sorting, (continued)
- [Qemu-devel] [PATCH v7 04/14] qapi-introspect: Guarantee particular sorting, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 01/14] qapi: Use generated TestStruct machinery in tests, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 03/14] qapi: Provide nicer array names in introspection, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 06/14] qapi: Update tests related to QMP/branch collisions, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 08/14] qapi: Fix alternates that accept 'number' but not 'int', Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 09/14] qapi: Remove dead visitor code, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 14/14] qapi: Simplify visits of optional fields, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 05/14] qapi: Rework collision assertions, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 12/14] qapi: Test failure in middle of array parse, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 10/14] qapi: Plug leaks in test-qmp-*, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 13/14] qapi: More tests of input arrays,
Eric Blake <=
- [Qemu-devel] [PATCH v7 02/14] qapi: Strengthen test of TestStructList, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 07/14] qapi: Simplify visiting of alternate types, Eric Blake, 2015/10/17
- [Qemu-devel] [PATCH v7 11/14] qapi: Simplify error testing in test-qmp-*, Eric Blake, 2015/10/17