2011-11-15 05:31:51 +04:00
|
|
|
/*
|
|
|
|
* QMP Input Visitor unit-tests.
|
|
|
|
*
|
2015-05-04 18:05:06 +03:00
|
|
|
* Copyright (C) 2011, 2015 Red Hat Inc.
|
2011-11-15 05:31:51 +04:00
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
|
*
|
|
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
|
|
* See the COPYING file in the top-level directory.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <glib.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
2012-12-06 14:22:34 +04:00
|
|
|
#include "qemu-common.h"
|
2011-11-15 05:31:51 +04:00
|
|
|
#include "qapi/qmp-input-visitor.h"
|
|
|
|
#include "test-qapi-types.h"
|
|
|
|
#include "test-qapi-visit.h"
|
2012-12-17 21:19:43 +04:00
|
|
|
#include "qapi/qmp/types.h"
|
2011-11-15 05:31:51 +04:00
|
|
|
|
|
|
|
typedef struct TestInputVisitorData {
|
|
|
|
QObject *obj;
|
|
|
|
QmpInputVisitor *qiv;
|
|
|
|
} TestInputVisitorData;
|
|
|
|
|
|
|
|
static void visitor_input_teardown(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
qobject_decref(data->obj);
|
|
|
|
data->obj = NULL;
|
|
|
|
|
|
|
|
if (data->qiv) {
|
|
|
|
qmp_input_visitor_cleanup(data->qiv);
|
|
|
|
data->qiv = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-11-06 09:35:28 +03:00
|
|
|
/* The various test_init functions are provided instead of a test setup
|
|
|
|
function so that the JSON string used by the tests are kept in the test
|
|
|
|
functions (and not in main()). */
|
|
|
|
static Visitor *visitor_input_test_init_internal(TestInputVisitorData *data,
|
|
|
|
const char *json_string,
|
|
|
|
va_list *ap)
|
|
|
|
{
|
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
data->obj = qobject_from_jsonv(json_string, ap);
|
|
|
|
g_assert(data->obj);
|
|
|
|
|
|
|
|
data->qiv = qmp_input_visitor_new(data->obj);
|
|
|
|
g_assert(data->qiv);
|
|
|
|
|
|
|
|
v = qmp_input_get_visitor(data->qiv);
|
|
|
|
g_assert(v);
|
|
|
|
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
2011-12-23 23:34:38 +04:00
|
|
|
static GCC_FMT_ATTR(2, 3)
|
|
|
|
Visitor *visitor_input_test_init(TestInputVisitorData *data,
|
|
|
|
const char *json_string, ...)
|
2011-11-15 05:31:51 +04:00
|
|
|
{
|
|
|
|
Visitor *v;
|
|
|
|
va_list ap;
|
|
|
|
|
|
|
|
va_start(ap, json_string);
|
2015-11-06 09:35:28 +03:00
|
|
|
v = visitor_input_test_init_internal(data, json_string, &ap);
|
2011-11-15 05:31:51 +04:00
|
|
|
va_end(ap);
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
|
2013-05-11 02:46:10 +04:00
|
|
|
/* similar to visitor_input_test_init(), but does not expect a string
|
|
|
|
* literal/format json_string argument and so can be used for
|
|
|
|
* programatically generated strings (and we can't pass in programatically
|
|
|
|
* generated strings via %s format parameters since qobject_from_jsonv()
|
|
|
|
* will wrap those in double-quotes and treat the entire object as a
|
|
|
|
* string)
|
|
|
|
*/
|
|
|
|
static Visitor *visitor_input_test_init_raw(TestInputVisitorData *data,
|
|
|
|
const char *json_string)
|
|
|
|
{
|
2015-11-06 09:35:28 +03:00
|
|
|
return visitor_input_test_init_internal(data, json_string, NULL);
|
2013-05-11 02:46:10 +04:00
|
|
|
}
|
|
|
|
|
2011-11-15 05:31:51 +04:00
|
|
|
static void test_visitor_in_int(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
int64_t res = 0, value = -42;
|
2014-05-02 15:26:29 +04:00
|
|
|
Error *err = NULL;
|
2011-11-15 05:31:51 +04:00
|
|
|
Visitor *v;
|
|
|
|
|
2011-12-23 23:34:38 +04:00
|
|
|
v = visitor_input_test_init(data, "%" PRId64, value);
|
2011-11-15 05:31:51 +04:00
|
|
|
|
2014-05-02 15:26:29 +04:00
|
|
|
visit_type_int(v, &res, NULL, &err);
|
|
|
|
g_assert(!err);
|
2011-11-15 05:31:51 +04:00
|
|
|
g_assert_cmpint(res, ==, value);
|
|
|
|
}
|
|
|
|
|
2013-05-11 02:46:06 +04:00
|
|
|
static void test_visitor_in_int_overflow(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
int64_t res = 0;
|
2014-05-02 15:26:29 +04:00
|
|
|
Error *err = NULL;
|
2013-05-11 02:46:06 +04:00
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
/* this will overflow a Qint/int64, so should be deserialized into
|
|
|
|
* a QFloat/double field instead, leading to an error if we pass it
|
|
|
|
* to visit_type_int. confirm this.
|
|
|
|
*/
|
|
|
|
v = visitor_input_test_init(data, "%f", DBL_MAX);
|
|
|
|
|
2014-05-02 15:26:29 +04:00
|
|
|
visit_type_int(v, &res, NULL, &err);
|
|
|
|
g_assert(err);
|
|
|
|
error_free(err);
|
2013-05-11 02:46:06 +04:00
|
|
|
}
|
|
|
|
|
2011-11-15 05:31:51 +04:00
|
|
|
static void test_visitor_in_bool(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
2014-05-02 15:26:29 +04:00
|
|
|
Error *err = NULL;
|
2011-11-15 05:31:51 +04:00
|
|
|
bool res = false;
|
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "true");
|
|
|
|
|
2014-05-02 15:26:29 +04:00
|
|
|
visit_type_bool(v, &res, NULL, &err);
|
|
|
|
g_assert(!err);
|
2011-11-15 05:31:51 +04:00
|
|
|
g_assert_cmpint(res, ==, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_number(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
double res = 0, value = 3.14;
|
2014-05-02 15:26:29 +04:00
|
|
|
Error *err = NULL;
|
2011-11-15 05:31:51 +04:00
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "%f", value);
|
|
|
|
|
2014-05-02 15:26:29 +04:00
|
|
|
visit_type_number(v, &res, NULL, &err);
|
|
|
|
g_assert(!err);
|
2011-11-15 05:31:51 +04:00
|
|
|
g_assert_cmpfloat(res, ==, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_string(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
char *res = NULL, *value = (char *) "Q E M U";
|
2014-05-02 15:26:29 +04:00
|
|
|
Error *err = NULL;
|
2011-11-15 05:31:51 +04:00
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "%s", value);
|
|
|
|
|
2014-05-02 15:26:29 +04:00
|
|
|
visit_type_str(v, &res, NULL, &err);
|
|
|
|
g_assert(!err);
|
2011-11-15 05:31:51 +04:00
|
|
|
g_assert_cmpstr(res, ==, value);
|
|
|
|
|
|
|
|
g_free(res);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_enum(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
2014-05-02 15:26:29 +04:00
|
|
|
Error *err = NULL;
|
2011-11-15 05:31:51 +04:00
|
|
|
Visitor *v;
|
|
|
|
EnumOne i;
|
|
|
|
|
|
|
|
for (i = 0; EnumOne_lookup[i]; i++) {
|
|
|
|
EnumOne res = -1;
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "%s", EnumOne_lookup[i]);
|
|
|
|
|
2014-05-02 15:26:29 +04:00
|
|
|
visit_type_EnumOne(v, &res, NULL, &err);
|
|
|
|
g_assert(!err);
|
2011-11-15 05:31:51 +04:00
|
|
|
g_assert_cmpint(i, ==, res);
|
|
|
|
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
data->obj = NULL;
|
|
|
|
data->qiv = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void test_visitor_in_struct(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
TestStruct *p = NULL;
|
2014-05-02 15:26:29 +04:00
|
|
|
Error *err = NULL;
|
2011-11-15 05:31:51 +04:00
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "{ 'integer': -42, 'boolean': true, 'string': 'foo' }");
|
|
|
|
|
2014-05-02 15:26:29 +04:00
|
|
|
visit_type_TestStruct(v, &p, NULL, &err);
|
|
|
|
g_assert(!err);
|
2011-11-15 05:31:51 +04:00
|
|
|
g_assert_cmpint(p->integer, ==, -42);
|
|
|
|
g_assert(p->boolean == true);
|
|
|
|
g_assert_cmpstr(p->string, ==, "foo");
|
|
|
|
|
|
|
|
g_free(p->string);
|
|
|
|
g_free(p);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void check_and_free_str(char *str, const char *cmp)
|
|
|
|
{
|
|
|
|
g_assert_cmpstr(str, ==, cmp);
|
|
|
|
g_free(str);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_struct_nested(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
2015-05-04 18:05:29 +03:00
|
|
|
UserDefTwo *udp = NULL;
|
2014-05-02 15:26:29 +04:00
|
|
|
Error *err = NULL;
|
2011-11-15 05:31:51 +04:00
|
|
|
Visitor *v;
|
|
|
|
|
2015-05-04 18:05:29 +03:00
|
|
|
v = visitor_input_test_init(data, "{ 'string0': 'string0', "
|
|
|
|
"'dict1': { 'string1': 'string1', "
|
|
|
|
"'dict2': { 'userdef': { 'integer': 42, "
|
|
|
|
"'string': 'string' }, 'string': 'string2'}}}");
|
2011-11-15 05:31:51 +04:00
|
|
|
|
2015-05-04 18:05:29 +03:00
|
|
|
visit_type_UserDefTwo(v, &udp, NULL, &err);
|
2014-05-02 15:26:29 +04:00
|
|
|
g_assert(!err);
|
2011-11-15 05:31:51 +04:00
|
|
|
|
|
|
|
check_and_free_str(udp->string0, "string0");
|
qapi: Drop tests for inline nested structs
A future patch will be using a 'name':{dictionary} entry in the
QAPI schema to specify a default value for an optional argument;
but existing use of inline nested structs conflicts with that goal.
More precisely, a definition in the QAPI schema associates a name
with a set of properties:
Example 1: { 'struct': 'Foo', 'data': { MEMBERS... } }
associates the global name 'Foo' with properties (meta-type struct)
and MEMBERS...
Example 2: 'mumble': TYPE
within MEMBERS... above associates 'mumble' with properties (type
TYPE) and (optional false) within type Foo
The syntax of example 1 is extensible; if we need another property,
we add another name/value pair to the dictionary (such as
'base':TYPE). The syntax of example 2 is not extensible, because
the right hand side can only be a type.
We have used name encoding to add a property: "'*mumble': 'int'"
associates 'mumble' with (type int) and (optional true). Nice,
but doesn't scale. So the solution is to change our existing uses
to be syntactic sugar to an extensible form:
NAME: TYPE --> NAME: { 'type': TYPE, 'optional': false }
*ONAME: TYPE --> ONAME: { 'type': TYPE, 'optional': true }
This patch fixes the testsuite to avoid inline nested types, by
breaking the nesting into explicit types; it means that the type
is now boxed instead of unboxed in C code, but makes no difference
on the wire (and if desired, a later patch could change the
generator to not do so much boxing in C). When touching code to
add new allocations, also convert existing allocations to
consistently prefer typesafe g_new0 over g_malloc0 when a type
name is involved.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-05-04 18:05:30 +03:00
|
|
|
check_and_free_str(udp->dict1->string1, "string1");
|
qapi: Unbox base members
Rather than storing a base class as a pointer to a box, just
store the fields of that base class in the same order, so that
a child struct can be directly cast to its parent. This gives
less malloc overhead, less pointer dereferencing, and even less
generated code. Compare to the earlier commit 1e6c1616a "qapi:
Generate a nicer struct for flat unions" (although that patch
had fewer places to change, as less of qemu was directly using
qapi structs for flat unions). It also allows us to turn on
automatic type-safe wrappers for upcasting to the base class
of a struct.
Changes to the generated code look like this in qapi-types.h:
| struct SpiceChannel {
|- SpiceBasicInfo *base;
|+ /* Members inherited from SpiceBasicInfo: */
|+ char *host;
|+ char *port;
|+ NetworkAddressFamily family;
|+ /* Own members: */
| int64_t connection_id;
as well as additional upcast functions like qapi_SpiceChannel_base().
Meanwhile, changes to qapi-visit.c look like:
| static void visit_type_SpiceChannel_fields(Visitor *v, SpiceChannel **obj, Error **errp)
| {
| Error *err = NULL;
|
|- visit_type_implicit_SpiceBasicInfo(v, &(*obj)->base, &err);
|+ visit_type_SpiceBasicInfo_fields(v, (SpiceBasicInfo **)obj, &err);
| if (err) {
(the cast is necessary, since our upcast wrappers only deal with a
single pointer, not pointer-to-pointer); plus the wholesale
elimination of some now-unused visit_type_implicit_FOO() functions.
Without boxing, the corner case of one empty struct having
another empty struct as its base type now requires inserting a
dummy member (previously, the 'Base *base' member sufficed).
And now that we no longer consume a 'base' member in the generated
C struct, we can delete the former negative struct-base-clash-base
test.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-11-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-10-27 01:34:49 +03:00
|
|
|
g_assert_cmpint(udp->dict1->dict2->userdef->integer, ==, 42);
|
qapi: Drop tests for inline nested structs
A future patch will be using a 'name':{dictionary} entry in the
QAPI schema to specify a default value for an optional argument;
but existing use of inline nested structs conflicts with that goal.
More precisely, a definition in the QAPI schema associates a name
with a set of properties:
Example 1: { 'struct': 'Foo', 'data': { MEMBERS... } }
associates the global name 'Foo' with properties (meta-type struct)
and MEMBERS...
Example 2: 'mumble': TYPE
within MEMBERS... above associates 'mumble' with properties (type
TYPE) and (optional false) within type Foo
The syntax of example 1 is extensible; if we need another property,
we add another name/value pair to the dictionary (such as
'base':TYPE). The syntax of example 2 is not extensible, because
the right hand side can only be a type.
We have used name encoding to add a property: "'*mumble': 'int'"
associates 'mumble' with (type int) and (optional true). Nice,
but doesn't scale. So the solution is to change our existing uses
to be syntactic sugar to an extensible form:
NAME: TYPE --> NAME: { 'type': TYPE, 'optional': false }
*ONAME: TYPE --> ONAME: { 'type': TYPE, 'optional': true }
This patch fixes the testsuite to avoid inline nested types, by
breaking the nesting into explicit types; it means that the type
is now boxed instead of unboxed in C code, but makes no difference
on the wire (and if desired, a later patch could change the
generator to not do so much boxing in C). When touching code to
add new allocations, also convert existing allocations to
consistently prefer typesafe g_new0 over g_malloc0 when a type
name is involved.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-05-04 18:05:30 +03:00
|
|
|
check_and_free_str(udp->dict1->dict2->userdef->string, "string");
|
|
|
|
check_and_free_str(udp->dict1->dict2->string, "string2");
|
|
|
|
g_assert(udp->dict1->has_dict3 == false);
|
|
|
|
|
|
|
|
g_free(udp->dict1->dict2->userdef);
|
|
|
|
g_free(udp->dict1->dict2);
|
|
|
|
g_free(udp->dict1);
|
2011-11-15 05:31:51 +04:00
|
|
|
g_free(udp);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_list(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
UserDefOneList *item, *head = NULL;
|
2014-05-02 15:26:29 +04:00
|
|
|
Error *err = NULL;
|
2011-11-15 05:31:51 +04:00
|
|
|
Visitor *v;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "[ { 'string': 'string0', 'integer': 42 }, { 'string': 'string1', 'integer': 43 }, { 'string': 'string2', 'integer': 44 } ]");
|
|
|
|
|
2014-05-02 15:26:29 +04:00
|
|
|
visit_type_UserDefOneList(v, &head, NULL, &err);
|
|
|
|
g_assert(!err);
|
2011-11-15 05:31:51 +04:00
|
|
|
g_assert(head != NULL);
|
|
|
|
|
|
|
|
for (i = 0, item = head; item; item = item->next, i++) {
|
|
|
|
char string[12];
|
|
|
|
|
|
|
|
snprintf(string, sizeof(string), "string%d", i);
|
|
|
|
g_assert_cmpstr(item->value->string, ==, string);
|
qapi: Unbox base members
Rather than storing a base class as a pointer to a box, just
store the fields of that base class in the same order, so that
a child struct can be directly cast to its parent. This gives
less malloc overhead, less pointer dereferencing, and even less
generated code. Compare to the earlier commit 1e6c1616a "qapi:
Generate a nicer struct for flat unions" (although that patch
had fewer places to change, as less of qemu was directly using
qapi structs for flat unions). It also allows us to turn on
automatic type-safe wrappers for upcasting to the base class
of a struct.
Changes to the generated code look like this in qapi-types.h:
| struct SpiceChannel {
|- SpiceBasicInfo *base;
|+ /* Members inherited from SpiceBasicInfo: */
|+ char *host;
|+ char *port;
|+ NetworkAddressFamily family;
|+ /* Own members: */
| int64_t connection_id;
as well as additional upcast functions like qapi_SpiceChannel_base().
Meanwhile, changes to qapi-visit.c look like:
| static void visit_type_SpiceChannel_fields(Visitor *v, SpiceChannel **obj, Error **errp)
| {
| Error *err = NULL;
|
|- visit_type_implicit_SpiceBasicInfo(v, &(*obj)->base, &err);
|+ visit_type_SpiceBasicInfo_fields(v, (SpiceBasicInfo **)obj, &err);
| if (err) {
(the cast is necessary, since our upcast wrappers only deal with a
single pointer, not pointer-to-pointer); plus the wholesale
elimination of some now-unused visit_type_implicit_FOO() functions.
Without boxing, the corner case of one empty struct having
another empty struct as its base type now requires inserting a
dummy member (previously, the 'Base *base' member sufficed).
And now that we no longer consume a 'base' member in the generated
C struct, we can delete the former negative struct-base-clash-base
test.
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-11-git-send-email-eblake@redhat.com>
[Commit message tweaked slightly]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-10-27 01:34:49 +03:00
|
|
|
g_assert_cmpint(item->value->integer, ==, 42 + i);
|
2011-11-15 05:31:51 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
qapi_free_UserDefOneList(head);
|
|
|
|
}
|
|
|
|
|
2015-09-16 14:06:24 +03:00
|
|
|
static void test_visitor_in_any(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
QObject *res = NULL;
|
|
|
|
Error *err = NULL;
|
|
|
|
Visitor *v;
|
|
|
|
QInt *qint;
|
|
|
|
QBool *qbool;
|
|
|
|
QString *qstring;
|
|
|
|
QDict *qdict;
|
|
|
|
QObject *qobj;
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "-42");
|
|
|
|
visit_type_any(v, &res, NULL, &err);
|
|
|
|
g_assert(!err);
|
|
|
|
qint = qobject_to_qint(res);
|
|
|
|
g_assert(qint);
|
|
|
|
g_assert_cmpint(qint_get_int(qint), ==, -42);
|
|
|
|
qobject_decref(res);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "{ 'integer': -42, 'boolean': true, 'string': 'foo' }");
|
|
|
|
visit_type_any(v, &res, NULL, &err);
|
|
|
|
g_assert(!err);
|
|
|
|
qdict = qobject_to_qdict(res);
|
|
|
|
g_assert(qdict && qdict_size(qdict) == 3);
|
|
|
|
qobj = qdict_get(qdict, "integer");
|
|
|
|
g_assert(qobj);
|
|
|
|
qint = qobject_to_qint(qobj);
|
|
|
|
g_assert(qint);
|
|
|
|
g_assert_cmpint(qint_get_int(qint), ==, -42);
|
|
|
|
qobj = qdict_get(qdict, "boolean");
|
|
|
|
g_assert(qobj);
|
|
|
|
qbool = qobject_to_qbool(qobj);
|
|
|
|
g_assert(qbool);
|
|
|
|
g_assert(qbool_get_bool(qbool) == true);
|
|
|
|
qobj = qdict_get(qdict, "string");
|
|
|
|
g_assert(qobj);
|
|
|
|
qstring = qobject_to_qstring(qobj);
|
|
|
|
g_assert(qstring);
|
|
|
|
g_assert_cmpstr(qstring_get_str(qstring), ==, "foo");
|
|
|
|
qobject_decref(res);
|
|
|
|
}
|
|
|
|
|
2014-03-01 11:40:33 +04:00
|
|
|
static void test_visitor_in_union_flat(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
Visitor *v;
|
|
|
|
Error *err = NULL;
|
|
|
|
UserDefFlatUnion *tmp;
|
qapi: Prefer typesafe upcasts to qapi base classes
A previous patch (commit 1e6c1616) made it possible to
directly cast from a qapi flat union type to its base type.
However, it requires the use of a C cast, which turns off
compiler type-safety checks. Fortunately, no such casts
exist, just yet.
Regardless, add inline type-safe wrappers named
qapi_FOO_base() for any union type FOO that has a base,
which can be used for a safer upcast, and enhance the
testsuite to cover the new functionality.
A future patch will extend the upcast support to structs,
where such conversions do exist already.
Note that C makes const-correct upcasts annoying because
it lacks overloads; these functions cast away const so that
they can accept user pointers whether const or not, and the
result in turn can be assigned to normal or const pointers.
Alternatively, this could have been done with macros, but
type-safe macros are hairy, and not worthwhile here.
This patch just adds upcasts. None of our code needed to
downcast from a base qapi class to a child. Also, in the
case of grandchildren (such as BlockdevOptionsQcow2), the
caller will need to call two functions to get to the inner
base (although it wouldn't be too hard to generate a
qapi_FOO_base_base() if desired). If a user changes qapi
to alter the base class hierarchy, such as going from
'A -> C' to 'A -> B -> C', it will change the type of
'qapi_C_base()', and the compiler will point out the places
that are affected by the new base.
One alternative was proposed, but was deemed too ugly to use
in practice: the generators could output redundant
information using anonymous types:
| struct Child {
| union {
| struct {
| Type1 parent_member1;
| Type2 parent_member2;
| };
| Parent base;
| };
| };
With that ugly proposal, for a given qapi type, obj->member
and obj->base.member would refer to the same storage; allowing
convenience in working with members without needing 'base.'
allowing typesafe upcast without needing a C cast by accessing
'&obj->base', and allowing downcasts from the parent back to
the child possible through container_of(obj, Child, base).
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-10-git-send-email-eblake@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-10-27 01:34:48 +03:00
|
|
|
UserDefUnionBase *base;
|
2014-03-01 11:40:33 +04:00
|
|
|
|
2014-03-05 06:44:39 +04:00
|
|
|
v = visitor_input_test_init(data,
|
|
|
|
"{ 'enum1': 'value1', "
|
qapi-visit: Convert to QAPISchemaVisitor, fixing bugs
Fixes flat unions to visit the base's base members (the previous
commit merely added them to the struct). Same test case.
Patch's effect on visit_type_UserDefFlatUnion():
static void visit_type_UserDefFlatUnion_fields(Visitor *m, UserDefFlatUnion **obj, Error **errp)
{
Error *err = NULL;
+ visit_type_int(m, &(*obj)->integer, "integer", &err);
+ if (err) {
+ goto out;
+ }
visit_type_str(m, &(*obj)->string, "string", &err);
if (err) {
goto out;
Test cases updated for the bug fix.
Fixes alternates to generate a visitor for their implicit enumeration
type. None of them are currently used, obviously. Example:
block-core.json's BlockdevRef now generates
visit_type_BlockdevRefKind().
Code is generated in a different order now, and therefore has got a
few new forward declarations. Doesn't matter.
The guard QAPI_VISIT_BUILTIN_VISITOR_DECL is renamed to
QAPI_VISIT_BUILTIN.
The previous commit's two ugly special cases exist here, too. Mark
both TODO.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
2015-09-16 14:06:10 +03:00
|
|
|
"'integer': 41, "
|
2014-03-05 06:44:39 +04:00
|
|
|
"'string': 'str', "
|
|
|
|
"'boolean': true }");
|
2014-03-01 11:40:33 +04:00
|
|
|
|
|
|
|
visit_type_UserDefFlatUnion(v, &tmp, NULL, &err);
|
|
|
|
g_assert(err == NULL);
|
2015-07-31 11:30:04 +03:00
|
|
|
g_assert_cmpint(tmp->enum1, ==, ENUM_ONE_VALUE1);
|
2014-03-05 06:44:39 +04:00
|
|
|
g_assert_cmpstr(tmp->string, ==, "str");
|
qapi-visit: Convert to QAPISchemaVisitor, fixing bugs
Fixes flat unions to visit the base's base members (the previous
commit merely added them to the struct). Same test case.
Patch's effect on visit_type_UserDefFlatUnion():
static void visit_type_UserDefFlatUnion_fields(Visitor *m, UserDefFlatUnion **obj, Error **errp)
{
Error *err = NULL;
+ visit_type_int(m, &(*obj)->integer, "integer", &err);
+ if (err) {
+ goto out;
+ }
visit_type_str(m, &(*obj)->string, "string", &err);
if (err) {
goto out;
Test cases updated for the bug fix.
Fixes alternates to generate a visitor for their implicit enumeration
type. None of them are currently used, obviously. Example:
block-core.json's BlockdevRef now generates
visit_type_BlockdevRefKind().
Code is generated in a different order now, and therefore has got a
few new forward declarations. Doesn't matter.
The guard QAPI_VISIT_BUILTIN_VISITOR_DECL is renamed to
QAPI_VISIT_BUILTIN.
The previous commit's two ugly special cases exist here, too. Mark
both TODO.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
2015-09-16 14:06:10 +03:00
|
|
|
g_assert_cmpint(tmp->integer, ==, 41);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(tmp->u.value1->boolean, ==, true);
|
qapi: Prefer typesafe upcasts to qapi base classes
A previous patch (commit 1e6c1616) made it possible to
directly cast from a qapi flat union type to its base type.
However, it requires the use of a C cast, which turns off
compiler type-safety checks. Fortunately, no such casts
exist, just yet.
Regardless, add inline type-safe wrappers named
qapi_FOO_base() for any union type FOO that has a base,
which can be used for a safer upcast, and enhance the
testsuite to cover the new functionality.
A future patch will extend the upcast support to structs,
where such conversions do exist already.
Note that C makes const-correct upcasts annoying because
it lacks overloads; these functions cast away const so that
they can accept user pointers whether const or not, and the
result in turn can be assigned to normal or const pointers.
Alternatively, this could have been done with macros, but
type-safe macros are hairy, and not worthwhile here.
This patch just adds upcasts. None of our code needed to
downcast from a base qapi class to a child. Also, in the
case of grandchildren (such as BlockdevOptionsQcow2), the
caller will need to call two functions to get to the inner
base (although it wouldn't be too hard to generate a
qapi_FOO_base_base() if desired). If a user changes qapi
to alter the base class hierarchy, such as going from
'A -> C' to 'A -> B -> C', it will change the type of
'qapi_C_base()', and the compiler will point out the places
that are affected by the new base.
One alternative was proposed, but was deemed too ugly to use
in practice: the generators could output redundant
information using anonymous types:
| struct Child {
| union {
| struct {
| Type1 parent_member1;
| Type2 parent_member2;
| };
| Parent base;
| };
| };
With that ugly proposal, for a given qapi type, obj->member
and obj->base.member would refer to the same storage; allowing
convenience in working with members without needing 'base.'
allowing typesafe upcast without needing a C cast by accessing
'&obj->base', and allowing downcasts from the parent back to
the child possible through container_of(obj, Child, base).
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-10-git-send-email-eblake@redhat.com>
[Commit message tweaked]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
2015-10-27 01:34:48 +03:00
|
|
|
|
|
|
|
base = qapi_UserDefFlatUnion_base(tmp);
|
|
|
|
g_assert(&base->enum1 == &tmp->enum1);
|
|
|
|
|
2014-03-01 11:40:33 +04:00
|
|
|
qapi_free_UserDefFlatUnion(tmp);
|
|
|
|
}
|
|
|
|
|
2015-05-04 18:05:11 +03:00
|
|
|
static void test_visitor_in_alternate(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
2014-03-01 11:40:30 +04:00
|
|
|
{
|
|
|
|
Visitor *v;
|
|
|
|
Error *err = NULL;
|
2015-05-04 18:05:11 +03:00
|
|
|
UserDefAlternate *tmp;
|
2014-03-01 11:40:30 +04:00
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42");
|
2015-09-30 01:21:06 +03:00
|
|
|
visit_type_UserDefAlternate(v, &tmp, NULL, &error_abort);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(tmp->type, ==, USER_DEF_ALTERNATE_KIND_I);
|
|
|
|
g_assert_cmpint(tmp->u.i, ==, 42);
|
2015-05-04 18:05:11 +03:00
|
|
|
qapi_free_UserDefAlternate(tmp);
|
2015-09-30 01:21:06 +03:00
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "'string'");
|
|
|
|
visit_type_UserDefAlternate(v, &tmp, NULL, &error_abort);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(tmp->type, ==, USER_DEF_ALTERNATE_KIND_S);
|
|
|
|
g_assert_cmpstr(tmp->u.s, ==, "string");
|
2015-09-30 01:21:06 +03:00
|
|
|
qapi_free_UserDefAlternate(tmp);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "false");
|
|
|
|
visit_type_UserDefAlternate(v, &tmp, NULL, &err);
|
|
|
|
g_assert(err);
|
|
|
|
error_free(err);
|
|
|
|
err = NULL;
|
|
|
|
qapi_free_UserDefAlternate(tmp);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_alternate_number(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
Visitor *v;
|
|
|
|
Error *err = NULL;
|
|
|
|
AltStrBool *asb;
|
|
|
|
AltStrNum *asn;
|
|
|
|
AltNumStr *ans;
|
|
|
|
AltStrInt *asi;
|
|
|
|
AltIntNum *ain;
|
|
|
|
AltNumInt *ani;
|
|
|
|
|
|
|
|
/* Parsing an int */
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42");
|
|
|
|
visit_type_AltStrBool(v, &asb, NULL, &err);
|
|
|
|
g_assert(err);
|
|
|
|
error_free(err);
|
|
|
|
err = NULL;
|
|
|
|
qapi_free_AltStrBool(asb);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
/* FIXME: Order of alternate should not affect semantics; asn should
|
|
|
|
* parse the same as ans */
|
|
|
|
v = visitor_input_test_init(data, "42");
|
|
|
|
visit_type_AltStrNum(v, &asn, NULL, &err);
|
2015-10-27 01:34:53 +03:00
|
|
|
/* FIXME g_assert_cmpint(asn->type, == ALT_STR_NUM_KIND_N); */
|
|
|
|
/* FIXME g_assert_cmpfloat(asn->u.n, ==, 42); */
|
2015-09-30 01:21:06 +03:00
|
|
|
g_assert(err);
|
|
|
|
error_free(err);
|
|
|
|
err = NULL;
|
|
|
|
qapi_free_AltStrNum(asn);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42");
|
|
|
|
visit_type_AltNumStr(v, &ans, NULL, &error_abort);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(ans->type, ==, ALT_NUM_STR_KIND_N);
|
|
|
|
g_assert_cmpfloat(ans->u.n, ==, 42);
|
2015-09-30 01:21:06 +03:00
|
|
|
qapi_free_AltNumStr(ans);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42");
|
|
|
|
visit_type_AltStrInt(v, &asi, NULL, &error_abort);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(asi->type, ==, ALT_STR_INT_KIND_I);
|
|
|
|
g_assert_cmpint(asi->u.i, ==, 42);
|
2015-09-30 01:21:06 +03:00
|
|
|
qapi_free_AltStrInt(asi);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42");
|
|
|
|
visit_type_AltIntNum(v, &ain, NULL, &error_abort);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(ain->type, ==, ALT_INT_NUM_KIND_I);
|
|
|
|
g_assert_cmpint(ain->u.i, ==, 42);
|
2015-09-30 01:21:06 +03:00
|
|
|
qapi_free_AltIntNum(ain);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42");
|
|
|
|
visit_type_AltNumInt(v, &ani, NULL, &error_abort);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(ani->type, ==, ALT_NUM_INT_KIND_I);
|
|
|
|
g_assert_cmpint(ani->u.i, ==, 42);
|
2015-09-30 01:21:06 +03:00
|
|
|
qapi_free_AltNumInt(ani);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
/* Parsing a double */
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42.5");
|
|
|
|
visit_type_AltStrBool(v, &asb, NULL, &err);
|
|
|
|
g_assert(err);
|
|
|
|
error_free(err);
|
|
|
|
err = NULL;
|
|
|
|
qapi_free_AltStrBool(asb);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42.5");
|
|
|
|
visit_type_AltStrNum(v, &asn, NULL, &error_abort);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(asn->type, ==, ALT_STR_NUM_KIND_N);
|
|
|
|
g_assert_cmpfloat(asn->u.n, ==, 42.5);
|
2015-09-30 01:21:06 +03:00
|
|
|
qapi_free_AltStrNum(asn);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42.5");
|
|
|
|
visit_type_AltNumStr(v, &ans, NULL, &error_abort);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(ans->type, ==, ALT_NUM_STR_KIND_N);
|
|
|
|
g_assert_cmpfloat(ans->u.n, ==, 42.5);
|
2015-09-30 01:21:06 +03:00
|
|
|
qapi_free_AltNumStr(ans);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42.5");
|
|
|
|
visit_type_AltStrInt(v, &asi, NULL, &err);
|
|
|
|
g_assert(err);
|
|
|
|
error_free(err);
|
|
|
|
err = NULL;
|
|
|
|
qapi_free_AltStrInt(asi);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42.5");
|
|
|
|
visit_type_AltIntNum(v, &ain, NULL, &error_abort);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(ain->type, ==, ALT_INT_NUM_KIND_N);
|
|
|
|
g_assert_cmpfloat(ain->u.n, ==, 42.5);
|
2015-09-30 01:21:06 +03:00
|
|
|
qapi_free_AltIntNum(ain);
|
|
|
|
visitor_input_teardown(data, NULL);
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "42.5");
|
|
|
|
visit_type_AltNumInt(v, &ani, NULL, &error_abort);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(ani->type, ==, ALT_NUM_INT_KIND_N);
|
|
|
|
g_assert_cmpfloat(ani->u.n, ==, 42.5);
|
2015-09-30 01:21:06 +03:00
|
|
|
qapi_free_AltNumInt(ani);
|
|
|
|
visitor_input_teardown(data, NULL);
|
2014-03-01 11:40:30 +04:00
|
|
|
}
|
|
|
|
|
2013-05-11 02:46:10 +04:00
|
|
|
static void test_native_list_integer_helper(TestInputVisitorData *data,
|
|
|
|
const void *unused,
|
|
|
|
UserDefNativeListUnionKind kind)
|
|
|
|
{
|
|
|
|
UserDefNativeListUnion *cvalue = NULL;
|
|
|
|
Error *err = NULL;
|
|
|
|
Visitor *v;
|
|
|
|
GString *gstr_list = g_string_new("");
|
|
|
|
GString *gstr_union = g_string_new("");
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 32; i++) {
|
|
|
|
g_string_append_printf(gstr_list, "%d", i);
|
|
|
|
if (i != 31) {
|
|
|
|
g_string_append(gstr_list, ", ");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
g_string_append_printf(gstr_union, "{ 'type': '%s', 'data': [ %s ] }",
|
|
|
|
UserDefNativeListUnionKind_lookup[kind],
|
|
|
|
gstr_list->str);
|
|
|
|
v = visitor_input_test_init_raw(data, gstr_union->str);
|
|
|
|
|
|
|
|
visit_type_UserDefNativeListUnion(v, &cvalue, NULL, &err);
|
|
|
|
g_assert(err == NULL);
|
|
|
|
g_assert(cvalue != NULL);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(cvalue->type, ==, kind);
|
2013-05-11 02:46:10 +04:00
|
|
|
|
|
|
|
switch (kind) {
|
|
|
|
case USER_DEF_NATIVE_LIST_UNION_KIND_INTEGER: {
|
|
|
|
intList *elem = NULL;
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.integer; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
g_assert_cmpint(elem->value, ==, i);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case USER_DEF_NATIVE_LIST_UNION_KIND_S8: {
|
|
|
|
int8List *elem = NULL;
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.s8; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
g_assert_cmpint(elem->value, ==, i);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case USER_DEF_NATIVE_LIST_UNION_KIND_S16: {
|
|
|
|
int16List *elem = NULL;
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.s16; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
g_assert_cmpint(elem->value, ==, i);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case USER_DEF_NATIVE_LIST_UNION_KIND_S32: {
|
|
|
|
int32List *elem = NULL;
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.s32; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
g_assert_cmpint(elem->value, ==, i);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case USER_DEF_NATIVE_LIST_UNION_KIND_S64: {
|
|
|
|
int64List *elem = NULL;
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.s64; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
g_assert_cmpint(elem->value, ==, i);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case USER_DEF_NATIVE_LIST_UNION_KIND_U8: {
|
|
|
|
uint8List *elem = NULL;
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.u8; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
g_assert_cmpint(elem->value, ==, i);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case USER_DEF_NATIVE_LIST_UNION_KIND_U16: {
|
|
|
|
uint16List *elem = NULL;
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.u16; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
g_assert_cmpint(elem->value, ==, i);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case USER_DEF_NATIVE_LIST_UNION_KIND_U32: {
|
|
|
|
uint32List *elem = NULL;
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.u32; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
g_assert_cmpint(elem->value, ==, i);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case USER_DEF_NATIVE_LIST_UNION_KIND_U64: {
|
|
|
|
uint64List *elem = NULL;
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.u64; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
g_assert_cmpint(elem->value, ==, i);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
2013-07-25 20:21:28 +04:00
|
|
|
g_assert_not_reached();
|
2013-05-11 02:46:10 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
g_string_free(gstr_union, true);
|
|
|
|
g_string_free(gstr_list, true);
|
|
|
|
qapi_free_UserDefNativeListUnion(cvalue);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_int(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
test_native_list_integer_helper(data, unused,
|
|
|
|
USER_DEF_NATIVE_LIST_UNION_KIND_INTEGER);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_int8(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
test_native_list_integer_helper(data, unused,
|
|
|
|
USER_DEF_NATIVE_LIST_UNION_KIND_S8);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_int16(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
test_native_list_integer_helper(data, unused,
|
|
|
|
USER_DEF_NATIVE_LIST_UNION_KIND_S16);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_int32(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
test_native_list_integer_helper(data, unused,
|
|
|
|
USER_DEF_NATIVE_LIST_UNION_KIND_S32);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_int64(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
test_native_list_integer_helper(data, unused,
|
|
|
|
USER_DEF_NATIVE_LIST_UNION_KIND_S64);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_uint8(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
test_native_list_integer_helper(data, unused,
|
|
|
|
USER_DEF_NATIVE_LIST_UNION_KIND_U8);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_uint16(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
test_native_list_integer_helper(data, unused,
|
|
|
|
USER_DEF_NATIVE_LIST_UNION_KIND_U16);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_uint32(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
test_native_list_integer_helper(data, unused,
|
|
|
|
USER_DEF_NATIVE_LIST_UNION_KIND_U32);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_uint64(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
test_native_list_integer_helper(data, unused,
|
|
|
|
USER_DEF_NATIVE_LIST_UNION_KIND_U64);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_bool(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
UserDefNativeListUnion *cvalue = NULL;
|
|
|
|
boolList *elem = NULL;
|
|
|
|
Error *err = NULL;
|
|
|
|
Visitor *v;
|
|
|
|
GString *gstr_list = g_string_new("");
|
|
|
|
GString *gstr_union = g_string_new("");
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 32; i++) {
|
|
|
|
g_string_append_printf(gstr_list, "%s",
|
|
|
|
(i % 3 == 0) ? "true" : "false");
|
|
|
|
if (i != 31) {
|
|
|
|
g_string_append(gstr_list, ", ");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
g_string_append_printf(gstr_union, "{ 'type': 'boolean', 'data': [ %s ] }",
|
|
|
|
gstr_list->str);
|
|
|
|
v = visitor_input_test_init_raw(data, gstr_union->str);
|
|
|
|
|
|
|
|
visit_type_UserDefNativeListUnion(v, &cvalue, NULL, &err);
|
|
|
|
g_assert(err == NULL);
|
|
|
|
g_assert(cvalue != NULL);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(cvalue->type, ==, USER_DEF_NATIVE_LIST_UNION_KIND_BOOLEAN);
|
2013-05-11 02:46:10 +04:00
|
|
|
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.boolean; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
g_assert_cmpint(elem->value, ==, (i % 3 == 0) ? 1 : 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_string_free(gstr_union, true);
|
|
|
|
g_string_free(gstr_list, true);
|
|
|
|
qapi_free_UserDefNativeListUnion(cvalue);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_string(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
UserDefNativeListUnion *cvalue = NULL;
|
|
|
|
strList *elem = NULL;
|
|
|
|
Error *err = NULL;
|
|
|
|
Visitor *v;
|
|
|
|
GString *gstr_list = g_string_new("");
|
|
|
|
GString *gstr_union = g_string_new("");
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 32; i++) {
|
|
|
|
g_string_append_printf(gstr_list, "'%d'", i);
|
|
|
|
if (i != 31) {
|
|
|
|
g_string_append(gstr_list, ", ");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
g_string_append_printf(gstr_union, "{ 'type': 'string', 'data': [ %s ] }",
|
|
|
|
gstr_list->str);
|
|
|
|
v = visitor_input_test_init_raw(data, gstr_union->str);
|
|
|
|
|
|
|
|
visit_type_UserDefNativeListUnion(v, &cvalue, NULL, &err);
|
|
|
|
g_assert(err == NULL);
|
|
|
|
g_assert(cvalue != NULL);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(cvalue->type, ==, USER_DEF_NATIVE_LIST_UNION_KIND_STRING);
|
2013-05-11 02:46:10 +04:00
|
|
|
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.string; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
gchar str[8];
|
|
|
|
sprintf(str, "%d", i);
|
|
|
|
g_assert_cmpstr(elem->value, ==, str);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_string_free(gstr_union, true);
|
|
|
|
g_string_free(gstr_list, true);
|
|
|
|
qapi_free_UserDefNativeListUnion(cvalue);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define DOUBLE_STR_MAX 16
|
|
|
|
|
|
|
|
static void test_visitor_in_native_list_number(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
UserDefNativeListUnion *cvalue = NULL;
|
|
|
|
numberList *elem = NULL;
|
|
|
|
Error *err = NULL;
|
|
|
|
Visitor *v;
|
|
|
|
GString *gstr_list = g_string_new("");
|
|
|
|
GString *gstr_union = g_string_new("");
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < 32; i++) {
|
|
|
|
g_string_append_printf(gstr_list, "%f", (double)i / 3);
|
|
|
|
if (i != 31) {
|
|
|
|
g_string_append(gstr_list, ", ");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
g_string_append_printf(gstr_union, "{ 'type': 'number', 'data': [ %s ] }",
|
|
|
|
gstr_list->str);
|
|
|
|
v = visitor_input_test_init_raw(data, gstr_union->str);
|
|
|
|
|
|
|
|
visit_type_UserDefNativeListUnion(v, &cvalue, NULL, &err);
|
|
|
|
g_assert(err == NULL);
|
|
|
|
g_assert(cvalue != NULL);
|
2015-10-27 01:34:53 +03:00
|
|
|
g_assert_cmpint(cvalue->type, ==, USER_DEF_NATIVE_LIST_UNION_KIND_NUMBER);
|
2013-05-11 02:46:10 +04:00
|
|
|
|
2015-10-27 01:34:53 +03:00
|
|
|
for (i = 0, elem = cvalue->u.number; elem; elem = elem->next, i++) {
|
2013-05-11 02:46:10 +04:00
|
|
|
GString *double_expected = g_string_new("");
|
|
|
|
GString *double_actual = g_string_new("");
|
|
|
|
|
|
|
|
g_string_printf(double_expected, "%.6f", (double)i / 3);
|
|
|
|
g_string_printf(double_actual, "%.6f", elem->value);
|
|
|
|
g_assert_cmpstr(double_expected->str, ==, double_actual->str);
|
|
|
|
|
|
|
|
g_string_free(double_expected, true);
|
|
|
|
g_string_free(double_actual, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_string_free(gstr_union, true);
|
|
|
|
g_string_free(gstr_list, true);
|
|
|
|
qapi_free_UserDefNativeListUnion(cvalue);
|
|
|
|
}
|
|
|
|
|
2011-11-15 05:31:51 +04:00
|
|
|
static void input_visitor_test_add(const char *testpath,
|
|
|
|
TestInputVisitorData *data,
|
|
|
|
void (*test_func)(TestInputVisitorData *data, const void *user_data))
|
|
|
|
{
|
|
|
|
g_test_add(testpath, TestInputVisitorData, data, NULL, test_func,
|
|
|
|
visitor_input_teardown);
|
|
|
|
}
|
|
|
|
|
2012-03-22 15:51:03 +04:00
|
|
|
static void test_visitor_in_errors(TestInputVisitorData *data,
|
|
|
|
const void *unused)
|
|
|
|
{
|
|
|
|
TestStruct *p = NULL;
|
2014-05-02 15:26:29 +04:00
|
|
|
Error *err = NULL;
|
2012-03-22 15:51:03 +04:00
|
|
|
Visitor *v;
|
|
|
|
|
|
|
|
v = visitor_input_test_init(data, "{ 'integer': false, 'boolean': 'foo', 'string': -42 }");
|
|
|
|
|
2014-05-02 15:26:29 +04:00
|
|
|
visit_type_TestStruct(v, &p, NULL, &err);
|
|
|
|
g_assert(err);
|
2015-07-31 01:33:07 +03:00
|
|
|
/* FIXME - a failed parse should not leave a partially-allocated p
|
|
|
|
* for us to clean up; this could cause callers to leak memory. */
|
2012-03-22 15:51:03 +04:00
|
|
|
g_assert(p->string == NULL);
|
|
|
|
|
2014-05-02 15:26:29 +04:00
|
|
|
error_free(err);
|
2012-03-22 15:51:03 +04:00
|
|
|
g_free(p->string);
|
|
|
|
g_free(p);
|
|
|
|
}
|
|
|
|
|
2011-11-15 05:31:51 +04:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
{
|
|
|
|
TestInputVisitorData in_visitor_data;
|
|
|
|
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
|
|
|
|
input_visitor_test_add("/visitor/input/int",
|
|
|
|
&in_visitor_data, test_visitor_in_int);
|
2013-05-11 02:46:06 +04:00
|
|
|
input_visitor_test_add("/visitor/input/int_overflow",
|
|
|
|
&in_visitor_data, test_visitor_in_int_overflow);
|
2011-11-15 05:31:51 +04:00
|
|
|
input_visitor_test_add("/visitor/input/bool",
|
|
|
|
&in_visitor_data, test_visitor_in_bool);
|
|
|
|
input_visitor_test_add("/visitor/input/number",
|
|
|
|
&in_visitor_data, test_visitor_in_number);
|
|
|
|
input_visitor_test_add("/visitor/input/string",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data, test_visitor_in_string);
|
2011-11-15 05:31:51 +04:00
|
|
|
input_visitor_test_add("/visitor/input/enum",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data, test_visitor_in_enum);
|
2011-11-15 05:31:51 +04:00
|
|
|
input_visitor_test_add("/visitor/input/struct",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data, test_visitor_in_struct);
|
2011-11-15 05:31:51 +04:00
|
|
|
input_visitor_test_add("/visitor/input/struct-nested",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data, test_visitor_in_struct_nested);
|
2011-11-15 05:31:51 +04:00
|
|
|
input_visitor_test_add("/visitor/input/list",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data, test_visitor_in_list);
|
2015-09-16 14:06:24 +03:00
|
|
|
input_visitor_test_add("/visitor/input/any",
|
|
|
|
&in_visitor_data, test_visitor_in_any);
|
2014-03-01 11:40:33 +04:00
|
|
|
input_visitor_test_add("/visitor/input/union-flat",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data, test_visitor_in_union_flat);
|
2015-05-04 18:05:11 +03:00
|
|
|
input_visitor_test_add("/visitor/input/alternate",
|
|
|
|
&in_visitor_data, test_visitor_in_alternate);
|
2012-03-22 15:51:03 +04:00
|
|
|
input_visitor_test_add("/visitor/input/errors",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data, test_visitor_in_errors);
|
2015-09-30 01:21:06 +03:00
|
|
|
input_visitor_test_add("/visitor/input/alternate-number",
|
|
|
|
&in_visitor_data, test_visitor_in_alternate_number);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/int",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_int);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/int8",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_int8);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/int16",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_int16);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/int32",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_int32);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/int64",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_int64);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/uint8",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_uint8);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/uint16",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_uint16);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/uint32",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_uint32);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/uint64",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_uint64);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/bool",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data, test_visitor_in_native_list_bool);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/str",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_string);
|
2013-05-11 02:46:10 +04:00
|
|
|
input_visitor_test_add("/visitor/input/native_list/number",
|
2015-05-04 18:05:06 +03:00
|
|
|
&in_visitor_data,
|
|
|
|
test_visitor_in_native_list_number);
|
2011-11-15 05:31:51 +04:00
|
|
|
|
|
|
|
g_test_run();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|