[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 29/31] tests/qapi-schema: Cover non-string, non-dict
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 29/31] tests/qapi-schema: Cover non-string, non-dictionary members |
Date: |
Mon, 31 Aug 2015 17:55:31 +0200 |
We always report "should be a dictionary" then. This is misleading:
when allow_dict, it can be a dictionary or a type name string, else it
can only be a type name.
Signed-off-by: Markus Armbruster <address@hidden>
---
tests/Makefile | 2 ++
tests/qapi-schema/args-invalid.err | 1 +
tests/qapi-schema/args-invalid.exit | 1 +
tests/qapi-schema/args-invalid.json | 3 +++
tests/qapi-schema/args-invalid.out | 0
tests/qapi-schema/struct-data-invalid.err | 1 +
tests/qapi-schema/struct-data-invalid.exit | 1 +
tests/qapi-schema/struct-data-invalid.json | 3 +++
tests/qapi-schema/struct-data-invalid.out | 0
tests/qapi-schema/struct-member-invalid.err | 1 +
tests/qapi-schema/struct-member-invalid.exit | 1 +
tests/qapi-schema/struct-member-invalid.json | 3 +++
tests/qapi-schema/struct-member-invalid.out | 0
13 files changed, 17 insertions(+)
create mode 100644 tests/qapi-schema/args-invalid.err
create mode 100644 tests/qapi-schema/args-invalid.exit
create mode 100644 tests/qapi-schema/args-invalid.json
create mode 100644 tests/qapi-schema/args-invalid.out
create mode 100644 tests/qapi-schema/struct-data-invalid.err
create mode 100644 tests/qapi-schema/struct-data-invalid.exit
create mode 100644 tests/qapi-schema/struct-data-invalid.json
create mode 100644 tests/qapi-schema/struct-data-invalid.out
create mode 100644 tests/qapi-schema/struct-member-invalid.err
create mode 100644 tests/qapi-schema/struct-member-invalid.exit
create mode 100644 tests/qapi-schema/struct-member-invalid.json
create mode 100644 tests/qapi-schema/struct-member-invalid.out
diff --git a/tests/Makefile b/tests/Makefile
index 597ca90..b128e28 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -229,12 +229,14 @@ check-qapi-schema-y := $(addprefix tests/qapi-schema/, \
redefined-type.json redefined-command.json redefined-builtin.json \
redefined-event.json command-int.json bad-data.json event-max.json \
type-bypass.json type-bypass-no-gen.json type-bypass-bad-gen.json \
+ args-invalid.json \
args-array-empty.json args-array-unknown.json args-int.json \
args-unknown.json args-member-unknown.json args-member-array.json \
args-member-array-bad.json args-alternate.json args-union.json \
returns-array-bad.json returns-int.json returns-dict.json \
returns-unknown.json returns-alternate.json returns-whitelist.json \
missing-colon.json missing-comma-list.json missing-comma-object.json \
+ struct-data-invalid.json struct-member-invalid.json \
nested-struct-data.json non-objects.json \
qapi-schema-test.json quoted-structural-chars.json \
leading-comma-list.json leading-comma-object.json \
diff --git a/tests/qapi-schema/args-invalid.err
b/tests/qapi-schema/args-invalid.err
new file mode 100644
index 0000000..6d0fa05
--- /dev/null
+++ b/tests/qapi-schema/args-invalid.err
@@ -0,0 +1 @@
+tests/qapi-schema/args-invalid.json:2: 'data' for command 'foo' should be a
dictionary
diff --git a/tests/qapi-schema/args-invalid.exit
b/tests/qapi-schema/args-invalid.exit
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/qapi-schema/args-invalid.exit
@@ -0,0 +1 @@
+1
diff --git a/tests/qapi-schema/args-invalid.json
b/tests/qapi-schema/args-invalid.json
new file mode 100644
index 0000000..4a64135
--- /dev/null
+++ b/tests/qapi-schema/args-invalid.json
@@ -0,0 +1,3 @@
+# FIXME error "should be a dictionary" is misleading, type name is also fine
+{ 'command': 'foo',
+ 'data': false }
diff --git a/tests/qapi-schema/args-invalid.out
b/tests/qapi-schema/args-invalid.out
new file mode 100644
index 0000000..e69de29
diff --git a/tests/qapi-schema/struct-data-invalid.err
b/tests/qapi-schema/struct-data-invalid.err
new file mode 100644
index 0000000..a40e23a
--- /dev/null
+++ b/tests/qapi-schema/struct-data-invalid.err
@@ -0,0 +1 @@
+tests/qapi-schema/struct-data-invalid.json:2: 'data' for struct 'foo' should
be a dictionary
diff --git a/tests/qapi-schema/struct-data-invalid.exit
b/tests/qapi-schema/struct-data-invalid.exit
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/qapi-schema/struct-data-invalid.exit
@@ -0,0 +1 @@
+1
diff --git a/tests/qapi-schema/struct-data-invalid.json
b/tests/qapi-schema/struct-data-invalid.json
new file mode 100644
index 0000000..b76de82
--- /dev/null
+++ b/tests/qapi-schema/struct-data-invalid.json
@@ -0,0 +1,3 @@
+# FIXME error "should be a dictionary" is misleading, type name is also fine
+{ 'struct': 'foo',
+ 'data': false }
diff --git a/tests/qapi-schema/struct-data-invalid.out
b/tests/qapi-schema/struct-data-invalid.out
new file mode 100644
index 0000000..e69de29
diff --git a/tests/qapi-schema/struct-member-invalid.err
b/tests/qapi-schema/struct-member-invalid.err
new file mode 100644
index 0000000..9e4c7b8
--- /dev/null
+++ b/tests/qapi-schema/struct-member-invalid.err
@@ -0,0 +1 @@
+tests/qapi-schema/struct-member-invalid.json:2: Member 'a' of 'data' for
struct 'foo' should be a dictionary
diff --git a/tests/qapi-schema/struct-member-invalid.exit
b/tests/qapi-schema/struct-member-invalid.exit
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/tests/qapi-schema/struct-member-invalid.exit
@@ -0,0 +1 @@
+1
diff --git a/tests/qapi-schema/struct-member-invalid.json
b/tests/qapi-schema/struct-member-invalid.json
new file mode 100644
index 0000000..968e63c
--- /dev/null
+++ b/tests/qapi-schema/struct-member-invalid.json
@@ -0,0 +1,3 @@
+# FIXME error message "should be a dictionary" is wrong, must be type name
+{ 'struct': 'foo',
+ 'data': { 'a': false } }
diff --git a/tests/qapi-schema/struct-member-invalid.out
b/tests/qapi-schema/struct-member-invalid.out
new file mode 100644
index 0000000..e69de29
--
2.4.3
- [Qemu-devel] [PATCH v2 20/26] qapi: Fix to reject union command and event arguments, (continued)
- [Qemu-devel] [PATCH v2 20/26] qapi: Fix to reject union command and event arguments, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 24/26] qapi-commands: Don't feed output of mcgen() to mcgen() again, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH 27/31] qapi: Drop one of two "simple union must not have base" checks, Markus Armbruster, 2015/08/31
- [Qemu-devel] [PATCH 31/31] qapi: Simplify error reporting for array types, Markus Armbruster, 2015/08/31
- [Qemu-devel] [PATCH 28/31] tests/qapi-schema: Cover two more syntax errors, Markus Armbruster, 2015/08/31
- [Qemu-devel] [PATCH 30/31] qapi: Fix errors for non-string, non-dictionary members, Markus Armbruster, 2015/08/31
- [Qemu-devel] [PATCH 29/31] tests/qapi-schema: Cover non-string, non-dictionary members,
Markus Armbruster <=
- Re: [Qemu-devel] [PATCH v2 00/26] qapi: Another round of fixes and cleanups, Markus Armbruster, 2015/08/31