[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.9 36/47] tests/qapi-schema: Improve coverage o
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH for-2.9 36/47] tests/qapi-schema: Improve coverage of bogus member docs |
Date: |
Mon, 13 Mar 2017 07:18:36 +0100 |
New test doc-bad-union-member.json shows we can fail to reject
documentation for nonexistent members.
Signed-off-by: Markus Armbruster <address@hidden>
---
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
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
--
2.7.4
- Re: [Qemu-devel] [PATCH for-2.9 37/47] qapi: Fix detection of bogus member documentation, (continued)
- [Qemu-devel] [PATCH for-2.9 03/47] qapi: Back out doc comments added just to please qapi.py, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 42/47] qapi: enum_types is a list used like a dict, make it one, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 45/47] qapi: Drop unused .check_clash() parameter schema, Markus Armbruster, 2017/03/13
- [Qemu-devel] [PATCH for-2.9 36/47] tests/qapi-schema: Improve coverage of bogus member docs,
Markus Armbruster <=
- Re: [Qemu-devel] [PATCH for-2.9 00/47] qapi: Put type information back into QMP documentation, Marc-André Lureau, 2017/03/13
- Re: [Qemu-devel] [PATCH for-2.9 00/47] qapi: Put type information back into QMP documentation, Markus Armbruster, 2017/03/13
- Re: [Qemu-devel] [PATCH for-2.9 00/47] qapi: Put type information back into QMP documentation, Marc-André Lureau, 2017/03/13
- Re: [Qemu-devel] [PATCH for-2.9 00/47] qapi: Put type information back into QMP documentation, Markus Armbruster, 2017/03/13
- Re: [Qemu-devel] [PATCH for-2.9 00/47] qapi: Put type information back into QMP documentation, Marc-André Lureau, 2017/03/14
- Re: [Qemu-devel] [PATCH for-2.9 00/47] qapi: Put type information back into QMP documentation, Markus Armbruster, 2017/03/14
- Re: [Qemu-devel] [PATCH for-2.9 00/47] qapi: Put type information back into QMP documentation, Marc-André Lureau, 2017/03/15
Re: [Qemu-devel] [PATCH for-2.9 00/47] qapi: Put type information back into QMP documentation, Marc-André Lureau, 2017/03/14