Browse Source

tests/qapi-schema: Improve doc / expression mismatch coverage

New tests doc-before-include.json and doc-before-pragma.json show we
fail to reject a misplaced expression comment.

New test doc-no-symbol.json shows a bad error message.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1489582656-31133-31-git-send-email-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
pull/48/head
Markus Armbruster 9 years ago
parent
commit
2028be8eea
  1. 3
      tests/Makefile.include
  2. 0
      tests/qapi-schema/doc-before-include.err
  3. 1
      tests/qapi-schema/doc-before-include.exit
  4. 8
      tests/qapi-schema/doc-before-include.json
  5. 4
      tests/qapi-schema/doc-before-include.out
  6. 0
      tests/qapi-schema/doc-before-pragma.err
  7. 1
      tests/qapi-schema/doc-before-pragma.exit
  8. 8
      tests/qapi-schema/doc-before-pragma.json
  9. 4
      tests/qapi-schema/doc-before-pragma.out
  10. 1
      tests/qapi-schema/doc-no-symbol.err
  11. 1
      tests/qapi-schema/doc-no-symbol.exit
  12. 7
      tests/qapi-schema/doc-no-symbol.json
  13. 0
      tests/qapi-schema/doc-no-symbol.out

3
tests/Makefile.include

@ -369,6 +369,8 @@ qapi-schema += command-int.json
qapi-schema += comments.json
qapi-schema += doc-bad-args.json
qapi-schema += doc-bad-symbol.json
qapi-schema += doc-before-include.json
qapi-schema += doc-before-pragma.json
qapi-schema += doc-duplicated-arg.json
qapi-schema += doc-duplicated-return.json
qapi-schema += doc-duplicated-since.json
@ -385,6 +387,7 @@ qapi-schema += doc-missing.json
qapi-schema += doc-missing-colon.json
qapi-schema += doc-missing-expr.json
qapi-schema += doc-missing-space.json
qapi-schema += doc-no-symbol.json
qapi-schema += double-data.json
qapi-schema += double-type.json
qapi-schema += duplicate-key.json

0
tests/qapi-schema/doc-before-include.err

1
tests/qapi-schema/doc-before-include.exit

@ -0,0 +1 @@
0

8
tests/qapi-schema/doc-before-include.json

@ -0,0 +1,8 @@
# Doc comment separated from defining expression by non-defining expression
# BUG: not rejected
##
# @foo:
##
{ 'include': 'empty.json' }
{ 'struct': 'foo', 'data': {} }

4
tests/qapi-schema/doc-before-include.out

@ -0,0 +1,4 @@
enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
prefix QTYPE
object foo
object q_empty

0
tests/qapi-schema/doc-before-pragma.err

1
tests/qapi-schema/doc-before-pragma.exit

@ -0,0 +1 @@
0

8
tests/qapi-schema/doc-before-pragma.json

@ -0,0 +1,8 @@
# Doc comment separated from defining expression by non-defining expression
# BUG: not rejected
##
# @foo:
##
{ 'pragma': {} }
{ 'struct': 'foo', 'data': {} }

4
tests/qapi-schema/doc-before-pragma.out

@ -0,0 +1,4 @@
enum QType ['none', 'qnull', 'qint', 'qstring', 'qdict', 'qlist', 'qfloat', 'qbool']
prefix QTYPE
object foo
object q_empty

1
tests/qapi-schema/doc-no-symbol.err

@ -0,0 +1 @@
tests/qapi-schema/doc-no-symbol.json:4: Definition of 'foo' follows documentation for 'None'

1
tests/qapi-schema/doc-no-symbol.exit

@ -0,0 +1 @@
1

7
tests/qapi-schema/doc-no-symbol.json

@ -0,0 +1,7 @@
# Documentation for expression lacks symbol
# BUG: Error message claims it has symbol 'None'
##
# foo:
##
{ 'command': 'foo', 'data': {'a': 'int'} }

0
tests/qapi-schema/doc-no-symbol.out

Loading…
Cancel
Save