Commit ab045267 authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qapi: Rename anonymous union type in test 



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

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 811d04fd

tests/qapi-schema/qapi-schema-test.json

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
  'discriminator': 'enum1',

  'data': { 'value1' : 'UserDefC', 'value2' : 'UserDefB', 'value3' : 'UserDefA' } }



{ 'union': 'UserDefAnonUnion',

{ 'union': 'UserDefAlternate',

  'discriminator': {},

  'data': { 'uda': 'UserDefA', 's': 'str', 'i': 'int' } }

tests/qapi-schema/qapi-schema-test.out

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 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', '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([('command', 'user_def_cmd'), ('data', OrderedDict())]),

 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_D'), ('data', OrderedDict([('a', 'EventStructOne'), ('b', 'str'), ('*c', 'str'), ('*enum3', 'EnumOne')]))])]

[{'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}]

[OrderedDict([('type', 'NestedEnumsOne'), ('data', OrderedDict([('enum1', 'EnumOne'), ('*enum2', 'EnumOne'), ('enum3', 'EnumOne'), ('*enum4', 'EnumOne')]))]),

 OrderedDict([('type', 'UserDefZero'), ('data', OrderedDict([('integer', 'int')]))]),

tests/test-qmp-input-strict.c

+14 −14
Original line number Diff line number Diff line
@@ -173,18 +173,18 @@ static void test_validate_union_flat(TestInputVisitorData *data, 
    qapi_free_UserDefFlatUnion(tmp);

}



static void test_validate_union_anon(TestInputVisitorData *data,

static void test_validate_alternate(TestInputVisitorData *data,

                                    const void *unused)

{

    UserDefAnonUnion *tmp = NULL;

    UserDefAlternate *tmp = NULL;

    Visitor *v;

    Error *err = NULL;



    v = validate_test_init(data, "42");



    visit_type_UserDefAnonUnion(v, &tmp, NULL, &err);

    visit_type_UserDefAlternate(v, &tmp, NULL, &err);

    g_assert(!err);

    qapi_free_UserDefAnonUnion(tmp);

    qapi_free_UserDefAlternate(tmp);

}



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);

}



static void test_validate_fail_union_anon(TestInputVisitorData *data,

static void test_validate_fail_alternate(TestInputVisitorData *data,

                                         const void *unused)

{

    UserDefAnonUnion *tmp = NULL;

    UserDefAlternate *tmp = NULL;

    Visitor *v;

    Error *err = NULL;



    v = validate_test_init(data, "3.14");



    visit_type_UserDefAnonUnion(v, &tmp, NULL, &err);

    visit_type_UserDefAlternate(v, &tmp, NULL, &err);

    g_assert(err);

    qapi_free_UserDefAnonUnion(tmp);

    qapi_free_UserDefAlternate(tmp);

}



static void validate_test_add(const char *testpath,
@@ -312,8 +312,8 @@ int main(int argc, char **argv) 
                      &testdata, test_validate_list);

    validate_test_add("/visitor/input-strict/pass/union-flat",

                      &testdata, test_validate_union_flat);

    validate_test_add("/visitor/input-strict/pass/union-anon",

                      &testdata, test_validate_union_anon);

    validate_test_add("/visitor/input-strict/pass/alternate",

                      &testdata, test_validate_alternate);

    validate_test_add("/visitor/input-strict/pass/union-native-list",

                      &testdata, test_validate_union_native_list);

    validate_test_add("/visitor/input-strict/fail/struct",
@@ -326,8 +326,8 @@ int main(int argc, char **argv) 
                      &testdata, test_validate_fail_union_flat);

    validate_test_add("/visitor/input-strict/fail/union-flat-no-discriminator",

                      &testdata, test_validate_fail_union_flat_no_discrim);

    validate_test_add("/visitor/input-strict/fail/union-anon",

                      &testdata, test_validate_fail_union_anon);

    validate_test_add("/visitor/input-strict/fail/alternate",

                      &testdata, test_validate_fail_alternate);

    validate_test_add("/visitor/input-strict/fail/union-native-list",

                      &testdata, test_validate_fail_union_native_list);

tests/test-qmp-input-visitor.c

+8 −8
Original line number Diff line number Diff line
@@ -315,20 +315,20 @@ static void test_visitor_in_union_flat(TestInputVisitorData *data, 
    qapi_free_UserDefFlatUnion(tmp);

}



static void test_visitor_in_union_anon(TestInputVisitorData *data,

static void test_visitor_in_alternate(TestInputVisitorData *data,

                                      const void *unused)

{

    Visitor *v;

    Error *err = NULL;

    UserDefAnonUnion *tmp;

    UserDefAlternate *tmp;



    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_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);

    qapi_free_UserDefAnonUnion(tmp);

    qapi_free_UserDefAlternate(tmp);

}



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);

    input_visitor_test_add("/visitor/input/union-flat",

                           &in_visitor_data, test_visitor_in_union_flat);

    input_visitor_test_add("/visitor/input/union-anon",

                           &in_visitor_data, test_visitor_in_union_anon);

    input_visitor_test_add("/visitor/input/alternate",

                           &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/native_list/int",

tests/test-qmp-output-visitor.c

+8 −8
Original line number Diff line number Diff line
@@ -453,24 +453,24 @@ static void test_visitor_out_union_flat(TestOutputVisitorData *data, 
    QDECREF(qdict);

}



static void test_visitor_out_union_anon(TestOutputVisitorData *data,

static void test_visitor_out_alternate(TestOutputVisitorData *data,

                                       const void *unused)

{

    QObject *arg;

    Error *err = NULL;



    UserDefAnonUnion *tmp = g_malloc0(sizeof(UserDefAnonUnion));

    tmp->kind = USER_DEF_ANON_UNION_KIND_I;

    UserDefAlternate *tmp = g_malloc0(sizeof(UserDefAlternate));

    tmp->kind = USER_DEF_ALTERNATE_KIND_I;

    tmp->i = 42;



    visit_type_UserDefAnonUnion(data->ov, &tmp, NULL, &err);

    visit_type_UserDefAlternate(data->ov, &tmp, NULL, &err);

    g_assert(err == NULL);

    arg = qmp_output_get_qobject(data->qov);



    g_assert(qobject_type(arg) == QTYPE_QINT);

    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,
@@ -830,8 +830,8 @@ int main(int argc, char **argv) 
                            &out_visitor_data, test_visitor_out_list_qapi_free);

    output_visitor_test_add("/visitor/output/union-flat",

                            &out_visitor_data, test_visitor_out_union_flat);

    output_visitor_test_add("/visitor/output/union-anon",

                            &out_visitor_data, test_visitor_out_union_anon);

    output_visitor_test_add("/visitor/output/alternate",

                            &out_visitor_data, test_visitor_out_alternate);

    output_visitor_test_add("/visitor/output/empty",

                            &out_visitor_data, test_visitor_out_empty);

    output_visitor_test_add("/visitor/output/native_list/int",