| Message ID | 1430751937-17523-20-git-send-email-eblake@redhat.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/tests/Makefile b/tests/Makefile index 835ec9c..c27940c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -214,6 +214,8 @@ check-qapi-schema-y := $(addprefix tests/qapi-schema/, \ missing-type.json bad-ident.json ident-with-escape.json \ double-type.json bad-base.json bad-type-bool.json bad-type-int.json \ bad-type-dict.json double-data.json unknown-expr-key.json \ + redefined-type.json redefined-command.json redefined-builtin.json \ + redefined-event.json command-int.json event-max.json \ missing-colon.json missing-comma-list.json \ missing-comma-object.json non-objects.json \ qapi-schema-test.json quoted-structural-chars.json \ diff --git a/tests/qapi-schema/command-int.err b/tests/qapi-schema/command-int.err new file mode 100644 index 0000000..e69de29 diff --git a/tests/qapi-schema/command-int.exit b/tests/qapi-schema/command-int.exit new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/qapi-schema/command-int.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/command-int.json b/tests/qapi-schema/command-int.json new file mode 100644 index 0000000..fcbb643 --- /dev/null +++ b/tests/qapi-schema/command-int.json @@ -0,0 +1,3 @@ +# FIXME: we should reject collisions between commands and types +{ 'command': 'int', 'data': { 'character': 'str' }, + 'returns': { 'value': 'int' } } diff --git a/tests/qapi-schema/command-int.out b/tests/qapi-schema/command-int.out new file mode 100644 index 0000000..d8e1854 --- /dev/null +++ b/tests/qapi-schema/command-int.out @@ -0,0 +1,3 @@ +[OrderedDict([('command', 'int'), ('data', OrderedDict([('character', 'str')])), ('returns', OrderedDict([('value', 'int')]))])] +[] +[] diff --git a/tests/qapi-schema/event-max.err b/tests/qapi-schema/event-max.err new file mode 100644 index 0000000..e69de29 diff --git a/tests/qapi-schema/event-max.exit b/tests/qapi-schema/event-max.exit new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/qapi-schema/event-max.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/event-max.json b/tests/qapi-schema/event-max.json new file mode 100644 index 0000000..997c61c --- /dev/null +++ b/tests/qapi-schema/event-max.json @@ -0,0 +1,2 @@ +# FIXME: an event named 'MAX' would conflict with implicit C enum +{ 'event': 'MAX' } diff --git a/tests/qapi-schema/event-max.out b/tests/qapi-schema/event-max.out new file mode 100644 index 0000000..010c42b --- /dev/null +++ b/tests/qapi-schema/event-max.out @@ -0,0 +1,3 @@ +[OrderedDict([('event', 'MAX')])] +[] +[] diff --git a/tests/qapi-schema/redefined-builtin.err b/tests/qapi-schema/redefined-builtin.err new file mode 100644 index 0000000..e69de29 diff --git a/tests/qapi-schema/redefined-builtin.exit b/tests/qapi-schema/redefined-builtin.exit new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/qapi-schema/redefined-builtin.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/redefined-builtin.json b/tests/qapi-schema/redefined-builtin.json new file mode 100644 index 0000000..a10050d --- /dev/null +++ b/tests/qapi-schema/redefined-builtin.json @@ -0,0 +1,2 @@ +# FIXME: we should reject types that duplicate builtin names +{ 'type': 'size', 'data': { 'myint': 'size' } } diff --git a/tests/qapi-schema/redefined-builtin.out b/tests/qapi-schema/redefined-builtin.out new file mode 100644 index 0000000..b0a9aea --- /dev/null +++ b/tests/qapi-schema/redefined-builtin.out @@ -0,0 +1,3 @@ +[OrderedDict([('type', 'size'), ('data', OrderedDict([('myint', 'size')]))])] +[] +[OrderedDict([('type', 'size'), ('data', OrderedDict([('myint', 'size')]))])] diff --git a/tests/qapi-schema/redefined-command.err b/tests/qapi-schema/redefined-command.err new file mode 100644 index 0000000..e69de29 diff --git a/tests/qapi-schema/redefined-command.exit b/tests/qapi-schema/redefined-command.exit new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/qapi-schema/redefined-command.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/redefined-command.json b/tests/qapi-schema/redefined-command.json new file mode 100644 index 0000000..d8c9975 --- /dev/null +++ b/tests/qapi-schema/redefined-command.json @@ -0,0 +1,3 @@ +# FIXME: we should reject commands defined more than once +{ 'command': 'foo', 'data': { 'one': 'str' } } +{ 'command': 'foo', 'data': { '*two': 'str' } } diff --git a/tests/qapi-schema/redefined-command.out b/tests/qapi-schema/redefined-command.out new file mode 100644 index 0000000..44ddba6 --- /dev/null +++ b/tests/qapi-schema/redefined-command.out @@ -0,0 +1,4 @@ +[OrderedDict([('command', 'foo'), ('data', OrderedDict([('one', 'str')]))]), + OrderedDict([('command', 'foo'), ('data', OrderedDict([('*two', 'str')]))])] +[] +[] diff --git a/tests/qapi-schema/redefined-event.err b/tests/qapi-schema/redefined-event.err new file mode 100644 index 0000000..e69de29 diff --git a/tests/qapi-schema/redefined-event.exit b/tests/qapi-schema/redefined-event.exit new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/qapi-schema/redefined-event.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/redefined-event.json b/tests/qapi-schema/redefined-event.json new file mode 100644 index 0000000..152cce7 --- /dev/null +++ b/tests/qapi-schema/redefined-event.json @@ -0,0 +1,3 @@ +# FIXME: we should reject duplicate events +{ 'event': 'EVENT_A', 'data': { 'myint': 'int' } } +{ 'event': 'EVENT_A', 'data': { 'myint': 'int' } } diff --git a/tests/qapi-schema/redefined-event.out b/tests/qapi-schema/redefined-event.out new file mode 100644 index 0000000..261b183 --- /dev/null +++ b/tests/qapi-schema/redefined-event.out @@ -0,0 +1,4 @@ +[OrderedDict([('event', 'EVENT_A'), ('data', OrderedDict([('myint', 'int')]))]), + OrderedDict([('event', 'EVENT_A'), ('data', OrderedDict([('myint', 'int')]))])] +[] +[] diff --git a/tests/qapi-schema/redefined-type.err b/tests/qapi-schema/redefined-type.err new file mode 100644 index 0000000..e69de29 diff --git a/tests/qapi-schema/redefined-type.exit b/tests/qapi-schema/redefined-type.exit new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/qapi-schema/redefined-type.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/redefined-type.json b/tests/qapi-schema/redefined-type.json new file mode 100644 index 0000000..7972194 --- /dev/null +++ b/tests/qapi-schema/redefined-type.json @@ -0,0 +1,3 @@ +# FIXME: we should reject types defined more than once +{ 'type': 'foo', 'data': { 'one': 'str' } } +{ 'enum': 'foo', 'data': [ 'two' ] } diff --git a/tests/qapi-schema/redefined-type.out b/tests/qapi-schema/redefined-type.out new file mode 100644 index 0000000..b509e57 --- /dev/null +++ b/tests/qapi-schema/redefined-type.out @@ -0,0 +1,4 @@ +[OrderedDict([('type', 'foo'), ('data', OrderedDict([('one', 'str')]))]), + OrderedDict([('enum', 'foo'), ('data', ['two'])])] +[{'enum_name': 'foo', 'enum_values': ['two']}] +[OrderedDict([('type', 'foo'), ('data', OrderedDict([('one', 'str')]))])]