mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Rename anonymous union type in test

Browse Source 
Reduce churn in the future patch that replaces anonymous unions
with a new metatype 'alternate' by changing 'AnonUnion' to
'Alternate'.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-05-04 09:05:11 -06:00 committed by Markus Armbruster
parent 811d04fd0c
commit ab04526744
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/qapi-schema/qapi-schema-test.json
View File

@ -53,7 +53,7 @@
'discriminator': 'enum1', 'discriminator': 'enum1',
'data': { 'value1' : 'UserDefC', 'value2' : 'UserDefB', 'value3' : 'UserDefA' } } 'data': { 'value1' : 'UserDefC', 'value2' : 'UserDefB', 'value3' : 'UserDefA' } }
{ 'union': 'UserDefAnonUnion', { 'union': 'UserDefAlternate',
'discriminator': {}, 'discriminator': {},
'data': { 'uda': 'UserDefA', 's': 'str', 'i': 'int' } } 'data': { 'uda': 'UserDefA', 's': 'str', 'i': 'int' } }

4
tests/qapi-schema/qapi-schema-test.out
View File

@ -10,7 +10,7 @@
OrderedDict([('type', 'UserDefUnionBase'), ('data', OrderedDict([('string', 'str'), ('enum1', 'EnumOne')]))]), OrderedDict([('type', 'UserDefUnionBase'), ('data', OrderedDict([('string', 'str'), ('enum1', 'EnumOne')]))]),
OrderedDict([('union', 'UserDefFlatUnion'), ('base', 'UserDefUnionBase'), ('discriminator', 'enum1'), ('data', OrderedDict([('value1', 'UserDefA'), ('value2', 'UserDefB'), ('value3', 'UserDefB')]))]), OrderedDict([('union', 'UserDefFlatUnion'), ('base', 'UserDefUnionBase'), ('discriminator', 'enum1'), ('data', OrderedDict([('value1', 'UserDefA'), ('value2', 'UserDefB'), ('value3', 'UserDefB')]))]),
OrderedDict([('union', 'UserDefFlatUnion2'), ('base', 'UserDefUnionBase'), ('discriminator', 'enum1'), ('data', OrderedDict([('value1', 'UserDefC'), ('value2', 'UserDefB'), ('value3', 'UserDefA')]))]), OrderedDict([('union', 'UserDefFlatUnion2'), ('base', 'UserDefUnionBase'), ('discriminator', 'enum1'), ('data', OrderedDict([('value1', 'UserDefC'), ('value2', 'UserDefB'), ('value3', 'UserDefA')]))]),
OrderedDict([('union', 'UserDefAnonUnion'), ('discriminator', OrderedDict()), ('data', OrderedDict([('uda', 'UserDefA'), ('s', 'str'), ('i', 'int')]))]), OrderedDict([('union', 'UserDefAlternate'), ('discriminator', OrderedDict()), ('data', OrderedDict([('uda', 'UserDefA'), ('s', 'str'), ('i', 'int')]))]),
OrderedDict([('union', 'UserDefNativeListUnion'), ('data', OrderedDict([('integer', ['int']), ('s8', ['int8']), ('s16', ['int16']), ('s32', ['int32']), ('s64', ['int64']), ('u8', ['uint8']), ('u16', ['uint16']), ('u32', ['uint32']), ('u64', ['uint64']), ('number', ['number']), ('boolean', ['bool']), ('string', ['str']), ('sizes', ['size'])]))]), OrderedDict([('union', 'UserDefNativeListUnion'), ('data', OrderedDict([('integer', ['int']), ('s8', ['int8']), ('s16', ['int16']), ('s32', ['int32']), ('s64', ['int64']), ('u8', ['uint8']), ('u16', ['uint16']), ('u32', ['uint32']), ('u64', ['uint64']), ('number', ['number']), ('boolean', ['bool']), ('string', ['str']), ('sizes', ['size'])]))]),
OrderedDict([('command', 'user_def_cmd'), ('data', OrderedDict())]), OrderedDict([('command', 'user_def_cmd'), ('data', OrderedDict())]),
OrderedDict([('command', 'user_def_cmd1'), ('data', OrderedDict([('ud1a', 'UserDefOne')]))]), OrderedDict([('command', 'user_def_cmd1'), ('data', OrderedDict([('ud1a', 'UserDefOne')]))]),
@ -23,7 +23,7 @@
OrderedDict([('event', 'EVENT_C'), ('data', OrderedDict([('*a', 'int'), ('*b', 'UserDefOne'), ('c', 'str')]))]), OrderedDict([('event', 'EVENT_C'), ('data', OrderedDict([('*a', 'int'), ('*b', 'UserDefOne'), ('c', 'str')]))]),
OrderedDict([('event', 'EVENT_D'), ('data', OrderedDict([('a', 'EventStructOne'), ('b', 'str'), ('*c', 'str'), ('*enum3', 'EnumOne')]))])] OrderedDict([('event', 'EVENT_D'), ('data', OrderedDict([('a', 'EventStructOne'), ('b', 'str'), ('*c', 'str'), ('*enum3', 'EnumOne')]))])]
[{'enum_name': 'EnumOne', 'enum_values': ['value1', 'value2', 'value3']}, [{'enum_name': 'EnumOne', 'enum_values': ['value1', 'value2', 'value3']},
{'enum_name': 'UserDefAnonUnionKind', 'enum_values': None}, {'enum_name': 'UserDefAlternateKind', 'enum_values': None},
{'enum_name': 'UserDefNativeListUnionKind', 'enum_values': None}] {'enum_name': 'UserDefNativeListUnionKind', 'enum_values': None}]
[OrderedDict([('type', 'NestedEnumsOne'), ('data', OrderedDict([('enum1', 'EnumOne'), ('*enum2', 'EnumOne'), ('enum3', 'EnumOne'), ('*enum4', 'EnumOne')]))]), [OrderedDict([('type', 'NestedEnumsOne'), ('data', OrderedDict([('enum1', 'EnumOne'), ('*enum2', 'EnumOne'), ('enum3', 'EnumOne'), ('*enum4', 'EnumOne')]))]),
OrderedDict([('type', 'UserDefZero'), ('data', OrderedDict([('integer', 'int')]))]), OrderedDict([('type', 'UserDefZero'), ('data', OrderedDict([('integer', 'int')]))]),

28
tests/test-qmp-input-strict.c
View File

@ -173,18 +173,18 @@ static void test_validate_union_flat(TestInputVisitorData *data,
qapi_free_UserDefFlatUnion(tmp); qapi_free_UserDefFlatUnion(tmp);
} }
static void test_validate_union_anon(TestInputVisitorData *data, static void test_validate_alternate(TestInputVisitorData *data,
const void *unused) const void *unused)
{ {
UserDefAnonUnion *tmp = NULL; UserDefAlternate *tmp = NULL;
Visitor *v; Visitor *v;
Error *err = NULL; Error *err = NULL;
v = validate_test_init(data, "42"); v = validate_test_init(data, "42");
visit_type_UserDefAnonUnion(v, &tmp, NULL, &err); visit_type_UserDefAlternate(v, &tmp, NULL, &err);
g_assert(!err); g_assert(!err);
qapi_free_UserDefAnonUnion(tmp); qapi_free_UserDefAlternate(tmp);
} }
static void test_validate_fail_struct(TestInputVisitorData *data, static void test_validate_fail_struct(TestInputVisitorData *data,
@ -276,18 +276,18 @@ static void test_validate_fail_union_flat_no_discrim(TestInputVisitorData *data,
qapi_free_UserDefFlatUnion2(tmp); qapi_free_UserDefFlatUnion2(tmp);
} }
static void test_validate_fail_union_anon(TestInputVisitorData *data, static void test_validate_fail_alternate(TestInputVisitorData *data,
const void *unused) const void *unused)
{ {
UserDefAnonUnion *tmp = NULL; UserDefAlternate *tmp = NULL;
Visitor *v; Visitor *v;
Error *err = NULL; Error *err = NULL;
v = validate_test_init(data, "3.14"); v = validate_test_init(data, "3.14");
visit_type_UserDefAnonUnion(v, &tmp, NULL, &err); visit_type_UserDefAlternate(v, &tmp, NULL, &err);
g_assert(err); g_assert(err);
qapi_free_UserDefAnonUnion(tmp); qapi_free_UserDefAlternate(tmp);
} }
static void validate_test_add(const char *testpath, static void validate_test_add(const char *testpath,
@ -312,8 +312,8 @@ int main(int argc, char **argv)
&testdata, test_validate_list); &testdata, test_validate_list);
validate_test_add("/visitor/input-strict/pass/union-flat", validate_test_add("/visitor/input-strict/pass/union-flat",
&testdata, test_validate_union_flat); &testdata, test_validate_union_flat);
validate_test_add("/visitor/input-strict/pass/union-anon", validate_test_add("/visitor/input-strict/pass/alternate",
&testdata, test_validate_union_anon); &testdata, test_validate_alternate);
validate_test_add("/visitor/input-strict/pass/union-native-list", validate_test_add("/visitor/input-strict/pass/union-native-list",
&testdata, test_validate_union_native_list); &testdata, test_validate_union_native_list);
validate_test_add("/visitor/input-strict/fail/struct", validate_test_add("/visitor/input-strict/fail/struct",
@ -326,8 +326,8 @@ int main(int argc, char **argv)
&testdata, test_validate_fail_union_flat); &testdata, test_validate_fail_union_flat);
validate_test_add("/visitor/input-strict/fail/union-flat-no-discriminator", validate_test_add("/visitor/input-strict/fail/union-flat-no-discriminator",
&testdata, test_validate_fail_union_flat_no_discrim); &testdata, test_validate_fail_union_flat_no_discrim);
validate_test_add("/visitor/input-strict/fail/union-anon", validate_test_add("/visitor/input-strict/fail/alternate",
&testdata, test_validate_fail_union_anon); &testdata, test_validate_fail_alternate);
validate_test_add("/visitor/input-strict/fail/union-native-list", validate_test_add("/visitor/input-strict/fail/union-native-list",
&testdata, test_validate_fail_union_native_list); &testdata, test_validate_fail_union_native_list);

16
tests/test-qmp-input-visitor.c
View File

@ -315,20 +315,20 @@ static void test_visitor_in_union_flat(TestInputVisitorData *data,
qapi_free_UserDefFlatUnion(tmp); qapi_free_UserDefFlatUnion(tmp);
} }
static void test_visitor_in_union_anon(TestInputVisitorData *data, static void test_visitor_in_alternate(TestInputVisitorData *data,
const void *unused) const void *unused)
{ {
Visitor *v; Visitor *v;
Error *err = NULL; Error *err = NULL;
UserDefAnonUnion *tmp; UserDefAlternate *tmp;
v = visitor_input_test_init(data, "42"); v = visitor_input_test_init(data, "42");
visit_type_UserDefAnonUnion(v, &tmp, NULL, &err); visit_type_UserDefAlternate(v, &tmp, NULL, &err);
g_assert(err == NULL); g_assert(err == NULL);
g_assert_cmpint(tmp->kind, ==, USER_DEF_ANON_UNION_KIND_I); g_assert_cmpint(tmp->kind, ==, USER_DEF_ALTERNATE_KIND_I);
g_assert_cmpint(tmp->i, ==, 42); g_assert_cmpint(tmp->i, ==, 42);
qapi_free_UserDefAnonUnion(tmp); qapi_free_UserDefAlternate(tmp);
} }
static void test_native_list_integer_helper(TestInputVisitorData *data, static void test_native_list_integer_helper(TestInputVisitorData *data,
@ -664,8 +664,8 @@ int main(int argc, char **argv)
&in_visitor_data, test_visitor_in_list); &in_visitor_data, test_visitor_in_list);
input_visitor_test_add("/visitor/input/union-flat", input_visitor_test_add("/visitor/input/union-flat",
&in_visitor_data, test_visitor_in_union_flat); &in_visitor_data, test_visitor_in_union_flat);
input_visitor_test_add("/visitor/input/union-anon", input_visitor_test_add("/visitor/input/alternate",
&in_visitor_data, test_visitor_in_union_anon); &in_visitor_data, test_visitor_in_alternate);
input_visitor_test_add("/visitor/input/errors", input_visitor_test_add("/visitor/input/errors",
&in_visitor_data, test_visitor_in_errors); &in_visitor_data, test_visitor_in_errors);
input_visitor_test_add("/visitor/input/native_list/int", input_visitor_test_add("/visitor/input/native_list/int",

16
tests/test-qmp-output-visitor.c
View File

@ -453,24 +453,24 @@ static void test_visitor_out_union_flat(TestOutputVisitorData *data,
QDECREF(qdict); QDECREF(qdict);
} }
static void test_visitor_out_union_anon(TestOutputVisitorData *data, static void test_visitor_out_alternate(TestOutputVisitorData *data,
const void *unused) const void *unused)
{ {
QObject *arg; QObject *arg;
Error *err = NULL; Error *err = NULL;
UserDefAnonUnion *tmp = g_malloc0(sizeof(UserDefAnonUnion)); UserDefAlternate *tmp = g_malloc0(sizeof(UserDefAlternate));
tmp->kind = USER_DEF_ANON_UNION_KIND_I; tmp->kind = USER_DEF_ALTERNATE_KIND_I;
tmp->i = 42; tmp->i = 42;
visit_type_UserDefAnonUnion(data->ov, &tmp, NULL, &err); visit_type_UserDefAlternate(data->ov, &tmp, NULL, &err);
g_assert(err == NULL); g_assert(err == NULL);
arg = qmp_output_get_qobject(data->qov); arg = qmp_output_get_qobject(data->qov);
g_assert(qobject_type(arg) == QTYPE_QINT); g_assert(qobject_type(arg) == QTYPE_QINT);
g_assert_cmpint(qint_get_int(qobject_to_qint(arg)), ==, 42); g_assert_cmpint(qint_get_int(qobject_to_qint(arg)), ==, 42);
qapi_free_UserDefAnonUnion(tmp); qapi_free_UserDefAlternate(tmp);
} }
static void test_visitor_out_empty(TestOutputVisitorData *data, static void test_visitor_out_empty(TestOutputVisitorData *data,
@ -830,8 +830,8 @@ int main(int argc, char **argv)
&out_visitor_data, test_visitor_out_list_qapi_free); &out_visitor_data, test_visitor_out_list_qapi_free);
output_visitor_test_add("/visitor/output/union-flat", output_visitor_test_add("/visitor/output/union-flat",
&out_visitor_data, test_visitor_out_union_flat); &out_visitor_data, test_visitor_out_union_flat);
output_visitor_test_add("/visitor/output/union-anon", output_visitor_test_add("/visitor/output/alternate",
&out_visitor_data, test_visitor_out_union_anon); &out_visitor_data, test_visitor_out_alternate);
output_visitor_test_add("/visitor/output/empty", output_visitor_test_add("/visitor/output/empty",
&out_visitor_data, test_visitor_out_empty); &out_visitor_data, test_visitor_out_empty);
output_visitor_test_add("/visitor/output/native_list/int", output_visitor_test_add("/visitor/output/native_list/int",