| Message ID | 1489385927-6735-37-git-send-email-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 03/13/2017 01:18 AM, Markus Armbruster wrote: > New test doc-bad-union-member.json shows we can fail to reject > documentation for nonexistent members. > > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- Reviewed-by: Eric Blake <eblake@redhat.com>
diff --git a/tests/Makefile.include b/tests/Makefile.include index 8ce9d3d..5edf3fa 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -367,9 +367,11 @@ qapi-schema += base-cycle-direct.json qapi-schema += base-cycle-indirect.json qapi-schema += command-int.json qapi-schema += comments.json +qapi-schema += doc-bad-alternate-member.json qapi-schema += doc-bad-command-arg.json qapi-schema += doc-bad-expr.json qapi-schema += doc-bad-symbol.json +qapi-schema += doc-bad-union-member.json qapi-schema += doc-duplicated-arg.json qapi-schema += doc-duplicated-return.json qapi-schema += doc-duplicated-since.json diff --git a/tests/qapi-schema/doc-bad-alternate-member.err b/tests/qapi-schema/doc-bad-alternate-member.err new file mode 100644 index 0000000..387f782 --- /dev/null +++ b/tests/qapi-schema/doc-bad-alternate-member.err @@ -0,0 +1 @@ +tests/qapi-schema/doc-bad-alternate-member.json:3: The following documented members are not in the declaration: aa, bb diff --git a/tests/qapi-schema/doc-bad-alternate-member.exit b/tests/qapi-schema/doc-bad-alternate-member.exit new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/qapi-schema/doc-bad-alternate-member.exit @@ -0,0 +1 @@ +1 diff --git a/tests/qapi-schema/doc-bad-alternate-member.json b/tests/qapi-schema/doc-bad-alternate-member.json new file mode 100644 index 0000000..738635c --- /dev/null +++ b/tests/qapi-schema/doc-bad-alternate-member.json @@ -0,0 +1,9 @@ +# Arguments listed in the doc comment must exist in the actual schema + +## +# @AorB: +# @aa: a +# @bb: b +## +{ 'alternate': 'AorB', + 'data': { 'a': 'str', 'b': 'int' } } diff --git a/tests/qapi-schema/doc-bad-alternate-member.out b/tests/qapi-schema/doc-bad-alternate-member.out new file mode 100644 index 0000000..e69de29 diff --git a/tests/qapi-schema/doc-bad-union-member.err b/tests/qapi-schema/doc-bad-union-member.err new file mode 100644 index 0000000..e69de29 diff --git a/tests/qapi-schema/doc-bad-union-member.exit b/tests/qapi-schema/doc-bad-union-member.exit new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/qapi-schema/doc-bad-union-member.exit @@ -0,0 +1 @@ +0 diff --git a/tests/qapi-schema/doc-bad-union-member.json b/tests/qapi-schema/doc-bad-union-member.json new file mode 100644 index 0000000..d611435 --- /dev/null +++ b/tests/qapi-schema/doc-bad-union-member.json @@ -0,0 +1,19 @@ +# Arguments listed in the doc comment must exist in the actual schema + +## +# @Frob: +# @a: a +# @b: b +## +{ 'union': 'Frob', + 'base': 'Base', + 'discriminator': 'type', + 'data': { 'nothing': 'Empty' } } + +{ 'struct': 'Base', + 'data': { 'type': 'T' } } + +{ 'struct': 'Empty', + 'data': { } } + +{ 'enum': 'T', 'data': ['nothing'] } diff --git a/tests/qapi-schema/doc-bad-union-member.out b/tests/qapi-schema/doc-bad-union-member.out new file mode 100644 index 0000000..2576ecd --- /dev/null +++ b/tests/qapi-schema/doc-bad-union-member.out @@ -0,0 +1,11 @@ +object Base + member type: T optional=False +object Empty +object Frob + base Base + tag type + case nothing: Empty +enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool'] + prefix QTYPE +enum T ['nothing'] +object q_empty
New test doc-bad-union-member.json shows we can fail to reject documentation for nonexistent members. Signed-off-by: Markus Armbruster <armbru@redhat.com> --- tests/Makefile.include | 2 ++ tests/qapi-schema/doc-bad-alternate-member.err | 1 + tests/qapi-schema/doc-bad-alternate-member.exit | 1 + tests/qapi-schema/doc-bad-alternate-member.json | 9 +++++++++ tests/qapi-schema/doc-bad-alternate-member.out | 0 tests/qapi-schema/doc-bad-union-member.err | 0 tests/qapi-schema/doc-bad-union-member.exit | 1 + tests/qapi-schema/doc-bad-union-member.json | 19 +++++++++++++++++++ tests/qapi-schema/doc-bad-union-member.out | 11 +++++++++++ 9 files changed, 44 insertions(+) create mode 100644 tests/qapi-schema/doc-bad-alternate-member.err create mode 100644 tests/qapi-schema/doc-bad-alternate-member.exit create mode 100644 tests/qapi-schema/doc-bad-alternate-member.json create mode 100644 tests/qapi-schema/doc-bad-alternate-member.out create mode 100644 tests/qapi-schema/doc-bad-union-member.err create mode 100644 tests/qapi-schema/doc-bad-union-member.exit create mode 100644 tests/qapi-schema/doc-bad-union-member.json create mode 100644 tests/qapi-schema/doc-bad-union-member.out