Commit 8168ca8e authored by Markus Armbruster's avatar Markus Armbruster
Browse files

tests/qapi-schema: Avoid 'str' in alternate test cases 



The next commit is going to make alternate members of type 'str'
conflict with other scalar types.  Would break a few test cases that
don't actually require 'str'.  Flip them from 'str' to 'bool' or
'EnumOne'.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1495471335-23707-4-git-send-email-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent 8339fa26

tests/qapi-schema/alternate-clash.json

+1 −1
Original line number Diff line number Diff line
@@ -5,4 +5,4 @@ 
# the implicit Alt1Kind enum, we would still have a collision with the

# resulting C union trying to have two members named 'a_b'.

{ 'alternate': 'Alt1',

  'data': { 'a-b': 'str', 'a_b': 'int' } }
 
  'data': { 'a-b': 'bool', 'a_b': 'int' } }

tests/qapi-schema/alternate-nested.json

+1 −1
Original line number Diff line number Diff line 
# we reject a nested alternate branch

{ 'alternate': 'Alt1',

  'data': { 'name': 'str', 'value': 'int' } }

  'data': { 'name': 'bool', 'value': 'int' } }

{ 'alternate': 'Alt2',

  'data': { 'nested': 'Alt1', 'b': 'bool' } }

tests/qapi-schema/args-alternate.json

+1 −1
Original line number Diff line number Diff line 
# we do not allow alternate arguments

{ 'alternate': 'Alt', 'data': { 'case1': 'int', 'case2': 'str' } }

{ 'alternate': 'Alt', 'data': { 'case1': 'int', 'case2': 'bool' } }

{ 'command': 'oops', 'data': 'Alt' }

tests/qapi-schema/doc-bad-alternate-member.json

+1 −1
Original line number Diff line number Diff line
@@ -6,4 +6,4 @@ 
# @bb: b

##

{ 'alternate': 'AorB',

  'data': { 'a': 'str', 'b': 'int' } }
 
  'data': { 'a': 'bool', 'b': 'int' } }

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

+5 −4
Original line number Diff line number Diff line
@@ -93,16 +93,17 @@ 
{ 'struct': 'WrapAlternate',

  'data': { 'alt': 'UserDefAlternate' } }

{ 'alternate': 'UserDefAlternate',

  'data': { 'udfu': 'UserDefFlatUnion', 's': 'str', 'i': 'int' } }

  'data': { 'udfu': 'UserDefFlatUnion', 'e': 'EnumOne', 'i': 'int' } }



{ 'struct': 'UserDefC',

  'data': { 'string1': 'str', 'string2': 'str' } }



# for testing use of 'number' within alternates

{ 'alternate': 'AltStrBool', 'data': { 's': 'str', 'b': 'bool' } }

{ 'alternate': 'AltStrNum', 'data': { 's': 'str', 'n': 'number' } }

{ 'alternate': 'AltEnumBool', 'data': { 'e': 'EnumOne', 'b': 'bool' } }

{ 'alternate': 'AltEnumNum', 'data': { 'e': 'EnumOne', 'n': 'number' } }

{ 'alternate': 'AltNumStr', 'data': { 'n': 'number', 's': 'str' } }

{ 'alternate': 'AltStrInt', 'data': { 's': 'str', 'i': 'int' } }

{ 'alternate': 'AltNumEnum', 'data': { 'n': 'number', 'e': 'EnumOne' } }

{ 'alternate': 'AltEnumInt', 'data': { 'e': 'EnumOne', 'i': 'int' } }

{ 'alternate': 'AltIntNum', 'data': { 'i': 'int', 'n': 'number' } }

{ 'alternate': 'AltNumInt', 'data': { 'n': 'number', 'i': 'int' } }