Commit 80e60a19 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

tests/qapi-schema: Restore test case for flat union base bug 



Test case added in commit 2fc00432, and messed up in commit 5223070c.

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

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

+3 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
  'data': { 'boolean': 'bool' } }



{ 'struct': 'UserDefB',

  'data': { 'integer': 'int' } }

  'data': { 'intb': 'int' } }



{ 'union': 'UserDefFlatUnion',

  'base': 'UserDefUnionBase',   # intentional forward reference
@@ -40,9 +40,10 @@ 
            'value2' : 'UserDefB',

            'value3' : 'UserDefB' } }

# FIXME generated struct UserDefFlatUnion has members for direct base

# UserDefOne, but lacks members for indirect base UserDefZero

# UserDefUnionBase, but lacks members for indirect base UserDefZero



{ 'struct': 'UserDefUnionBase',

  'base': 'UserDefZero',

  'data': { 'string': 'str', 'enum1': 'EnumOne' } }



# this variant of UserDefFlatUnion defaults to a union that uses fields with

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

+4 −4
Original line number Diff line number Diff line
@@ -6,9 +6,9 @@ 
 OrderedDict([('struct', 'UserDefTwoDict'), ('data', OrderedDict([('string1', 'str'), ('dict2', 'UserDefTwoDictDict'), ('*dict3', 'UserDefTwoDictDict')]))]),

 OrderedDict([('struct', 'UserDefTwo'), ('data', OrderedDict([('string0', 'str'), ('dict1', 'UserDefTwoDict')]))]),

 OrderedDict([('struct', 'UserDefA'), ('data', OrderedDict([('boolean', 'bool')]))]),

 OrderedDict([('struct', 'UserDefB'), ('data', OrderedDict([('integer', 'int')]))]),

 OrderedDict([('struct', 'UserDefB'), ('data', OrderedDict([('intb', 'int')]))]),

 OrderedDict([('union', 'UserDefFlatUnion'), ('base', 'UserDefUnionBase'), ('discriminator', 'enum1'), ('data', OrderedDict([('value1', 'UserDefA'), ('value2', 'UserDefB'), ('value3', 'UserDefB')]))]),

 OrderedDict([('struct', 'UserDefUnionBase'), ('data', OrderedDict([('string', 'str'), ('enum1', 'EnumOne')]))]),

 OrderedDict([('struct', 'UserDefUnionBase'), ('base', 'UserDefZero'), ('data', OrderedDict([('string', 'str'), ('enum1', 'EnumOne')]))]),

 OrderedDict([('union', 'UserDefFlatUnion2'), ('base', 'UserDefUnionBase'), ('discriminator', 'enum1'), ('data', OrderedDict([('value1', 'UserDefC'), ('value2', 'UserDefB'), ('value3', 'UserDefA')]))]),

 OrderedDict([('alternate', 'UserDefAlternate'), ('data', OrderedDict([('uda', 'UserDefA'), ('s', 'str'), ('i', 'int')]))]),

 OrderedDict([('struct', 'UserDefC'), ('data', OrderedDict([('string1', 'str'), ('string2', 'str')]))]),
@@ -45,8 +45,8 @@ 
 OrderedDict([('struct', 'UserDefTwoDict'), ('data', OrderedDict([('string1', 'str'), ('dict2', 'UserDefTwoDictDict'), ('*dict3', 'UserDefTwoDictDict')]))]),

 OrderedDict([('struct', 'UserDefTwo'), ('data', OrderedDict([('string0', 'str'), ('dict1', 'UserDefTwoDict')]))]),

 OrderedDict([('struct', 'UserDefA'), ('data', OrderedDict([('boolean', 'bool')]))]),

 OrderedDict([('struct', 'UserDefB'), ('data', OrderedDict([('integer', 'int')]))]),

 OrderedDict([('struct', 'UserDefUnionBase'), ('data', OrderedDict([('string', 'str'), ('enum1', 'EnumOne')]))]),

 OrderedDict([('struct', 'UserDefB'), ('data', OrderedDict([('intb', 'int')]))]),

 OrderedDict([('struct', 'UserDefUnionBase'), ('base', 'UserDefZero'), ('data', OrderedDict([('string', 'str'), ('enum1', 'EnumOne')]))]),

 OrderedDict([('struct', 'UserDefC'), ('data', OrderedDict([('string1', 'str'), ('string2', 'str')]))]),

 OrderedDict([('struct', 'UserDefOptions'), ('data', OrderedDict([('*i64', ['int']), ('*u64', ['uint64']), ('*u16', ['uint16']), ('*i64x', 'int'), ('*u64x', 'uint64')]))]),

 OrderedDict([('struct', 'EventStructOne'), ('data', OrderedDict([('struct1', 'UserDefOne'), ('string', 'str'), ('*enum2', 'EnumOne')]))]),