Commit ab22ad96 authored by Markus Armbruster's avatar Markus Armbruster Committed by Luiz Capitulino
Browse files

tests/qapi-schema: Cover optional command arguments 



Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Signed-off-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
parent 357765fe

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

+3 −1
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ 
# testing commands

{ 'command': 'user_def_cmd', 'data': {} }

{ 'command': 'user_def_cmd1', 'data': {'ud1a': 'UserDefOne'} }

{ 'command': 'user_def_cmd2', 'data': {'ud1a': 'UserDefOne', 'ud1b': 'UserDefOne'}, 'returns': 'UserDefTwo' }

{ 'command': 'user_def_cmd2',

  'data': {'ud1a': 'UserDefOne', '*ud1b': 'UserDefOne'},

  'returns': 'UserDefTwo' }



# For testing integer range flattening in opts-visitor. The following schema

# corresponds to the option format:

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

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 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'])]))]),

 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_cmd2'), ('data', OrderedDict([('ud1a', 'UserDefOne'), ('*ud1b', 'UserDefOne')])), ('returns', 'UserDefTwo')]),

 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')]))]),

tests/test-qmp-commands.c

+5 −3
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ void qmp_user_def_cmd1(UserDefOne * ud1, Error **errp) 
{

}



UserDefTwo * qmp_user_def_cmd2(UserDefOne * ud1a, UserDefOne * ud1b, Error **errp)

UserDefTwo *qmp_user_def_cmd2(UserDefOne *ud1a,

                              bool has_udb1, UserDefOne *ud1b,

                              Error **errp)

{

    UserDefTwo *ret;

    UserDefOne *ud1c = g_malloc0(sizeof(UserDefOne));
@@ -24,8 +26,8 @@ UserDefTwo * qmp_user_def_cmd2(UserDefOne * ud1a, UserDefOne * ud1b, Error **err 


    ud1c->string = strdup(ud1a->string);

    ud1c->integer = ud1a->integer;

    ud1d->string = strdup(ud1b->string);

    ud1d->integer = ud1b->integer;

    ud1d->string = strdup(has_udb1 ? ud1b->string : "blah0");

    ud1d->integer = has_udb1 ? ud1b->integer : 0;



    ret = g_malloc0(sizeof(UserDefTwo));

    ret->string = strdup("blah1");