[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 25/28] tests/qapi-schema: Switch member name clash test to struct
From: |
Markus Armbruster |
Subject: |
[PATCH 25/28] tests/qapi-schema: Switch member name clash test to struct |
Date: |
Tue, 23 Mar 2021 10:40:22 +0100 |
Test args-name-clash covers command parameter name clash. This
effectively covers struct member name clash as well. The next commit
will make paramater name clash impossible. Convert args-name-clash
from testing command to testing a struct, and rename it to
struct-member-name-clash.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/qapi-schema/args-name-clash.err | 2 --
tests/qapi-schema/meson.build | 2 +-
tests/qapi-schema/struct-member-name-clash.err | 2 ++
.../{args-name-clash.json => struct-member-name-clash.json} | 2 +-
.../{args-name-clash.out => struct-member-name-clash.out} | 0
5 files changed, 4 insertions(+), 4 deletions(-)
delete mode 100644 tests/qapi-schema/args-name-clash.err
create mode 100644 tests/qapi-schema/struct-member-name-clash.err
rename tests/qapi-schema/{args-name-clash.json =>
struct-member-name-clash.json} (64%)
rename tests/qapi-schema/{args-name-clash.out => struct-member-name-clash.out}
(100%)
diff --git a/tests/qapi-schema/args-name-clash.err
b/tests/qapi-schema/args-name-clash.err
deleted file mode 100644
index 3e04817bc0..0000000000
--- a/tests/qapi-schema/args-name-clash.err
+++ /dev/null
@@ -1,2 +0,0 @@
-args-name-clash.json: In command 'oops':
-args-name-clash.json:4: parameter 'a_b' collides with parameter 'a-b'
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index 4e7635f0a8..8ba6917132 100644
--- a/tests/qapi-schema/meson.build
+++ b/tests/qapi-schema/meson.build
@@ -30,7 +30,6 @@ schemas = [
'args-member-array-bad.json',
'args-member-case.json',
'args-member-unknown.json',
- 'args-name-clash.json',
'args-union.json',
'args-unknown.json',
'bad-base.json',
@@ -177,6 +176,7 @@ schemas = [
'struct-member-if-invalid.json',
'struct-member-invalid-dict.json',
'struct-member-invalid.json',
+ 'struct-member-name-clash.json',
'trailing-comma-list.json',
'trailing-comma-object.json',
'type-bypass-bad-gen.json',
diff --git a/tests/qapi-schema/struct-member-name-clash.err
b/tests/qapi-schema/struct-member-name-clash.err
new file mode 100644
index 0000000000..6ac042d59d
--- /dev/null
+++ b/tests/qapi-schema/struct-member-name-clash.err
@@ -0,0 +1,2 @@
+struct-member-name-clash.json: In struct 'Oops':
+struct-member-name-clash.json:4: member 'a_b' collides with member 'a-b'
diff --git a/tests/qapi-schema/args-name-clash.json
b/tests/qapi-schema/struct-member-name-clash.json
similarity index 64%
rename from tests/qapi-schema/args-name-clash.json
rename to tests/qapi-schema/struct-member-name-clash.json
index 61423cb893..3fb69cc2ce 100644
--- a/tests/qapi-schema/args-name-clash.json
+++ b/tests/qapi-schema/struct-member-name-clash.json
@@ -1,4 +1,4 @@
# C member name collision
# Reject members that clash when mapped to C names (we would have two 'a_b'
# members).
-{ 'command': 'oops', 'data': { 'a-b': 'str', 'a_b': 'str' } }
+{ 'struct': 'Oops', 'data': { 'a-b': 'str', 'a_b': 'str' } }
diff --git a/tests/qapi-schema/args-name-clash.out
b/tests/qapi-schema/struct-member-name-clash.out
similarity index 100%
rename from tests/qapi-schema/args-name-clash.out
rename to tests/qapi-schema/struct-member-name-clash.out
--
2.26.3
- Re: [PATCH 06/28] tests/qapi-schema: Tweak to demonstrate buggy member name check, (continued)
[PATCH 05/28] tests/qapi-schema: Drop TODO comment on simple unions, Markus Armbruster, 2021/03/23
[PATCH 04/28] tests/qapi-schema: Belatedly update comment on alternate clash, Markus Armbruster, 2021/03/23
[PATCH 24/28] qapi: Enforce command naming rules, Markus Armbruster, 2021/03/23
[PATCH 25/28] tests/qapi-schema: Switch member name clash test to struct,
Markus Armbruster <=
[PATCH 16/28] qapi: Factor out QAPISchemaParser._check_pragma_list_of_str(), Markus Armbruster, 2021/03/23
[PATCH 27/28] qapi: Enforce enum member naming rules, Markus Armbruster, 2021/03/23
[PATCH 23/28] qapi: Enforce feature naming rules, Markus Armbruster, 2021/03/23
[PATCH 21/28] tests-qmp-cmds: Drop unused and incorrect qmp_TestIfCmd(), Markus Armbruster, 2021/03/23
[PATCH 18/28] tests/qapi-schema: Rename returns-whitelist to returns-bad-type, Markus Armbruster, 2021/03/23