[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/17] tests/qapi-schema: Improve union discriminator coverage
From: |
Markus Armbruster |
Subject: |
[PULL 09/17] tests/qapi-schema: Improve union discriminator coverage |
Date: |
Wed, 26 Apr 2023 07:57:36 +0200 |
A union's 'discriminator' must name one of the common members.
QAPISchemaVariants.check() looks it up by its c_name(), then checks
the name matches exactly (because c_name() is not injective).
Tests union-base-empty and union-invalid-discriminator both cover the
case where lookup fails. Repurpose the latter to cover the case where
it succeeds and the name check fails.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230316071325.492471-10-armbru@redhat.com
Reviewed-by: Eric Blake <eblake@redhat.com>
[Commit message typo fixed]
---
tests/qapi-schema/union-invalid-discriminator.err | 2 +-
tests/qapi-schema/union-invalid-discriminator.json | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qapi-schema/union-invalid-discriminator.err
b/tests/qapi-schema/union-invalid-discriminator.err
index 38efb24b98..6bd774c156 100644
--- a/tests/qapi-schema/union-invalid-discriminator.err
+++ b/tests/qapi-schema/union-invalid-discriminator.err
@@ -1,2 +1,2 @@
union-invalid-discriminator.json: In union 'TestUnion':
-union-invalid-discriminator.json:10: discriminator 'enum_wrong' is not a
member of 'base'
+union-invalid-discriminator.json:10: discriminator 'type_tag' is not a member
of 'base'
diff --git a/tests/qapi-schema/union-invalid-discriminator.json
b/tests/qapi-schema/union-invalid-discriminator.json
index c4fce97362..f315f36e37 100644
--- a/tests/qapi-schema/union-invalid-discriminator.json
+++ b/tests/qapi-schema/union-invalid-discriminator.json
@@ -8,7 +8,7 @@
'data': { 'integer': 'int' } }
{ 'union': 'TestUnion',
- 'base': { 'enum1': 'TestEnum' },
- 'discriminator': 'enum_wrong',
+ 'base': { 'type-tag': 'TestEnum' },
+ 'discriminator': 'type_tag',
'data': { 'value1': 'TestTypeA',
'value2': 'TestTypeB' } }
--
2.39.2
- [PULL 16/17] qapi: Improve specificity of type/member descriptions, (continued)
- [PULL 16/17] qapi: Improve specificity of type/member descriptions, Markus Armbruster, 2023/04/26
- [PULL 14/17] qapi: Require boxed for conditional command and event arguments, Markus Armbruster, 2023/04/26
- [PULL 07/17] qapi: Fix error message when type name or array is expected, Markus Armbruster, 2023/04/26
- [PULL 11/17] tests/qapi-schema: Clean up positive test for conditionals, Markus Armbruster, 2023/04/26
- [PULL 06/17] qapi: Simplify code a bit after previous commits, Markus Armbruster, 2023/04/26
- [PULL 04/17] qapi: Split up check_type(), Markus Armbruster, 2023/04/26
- [PULL 15/17] qapi: support updating expected test output via make, Markus Armbruster, 2023/04/26
- [PULL 05/17] qapi: Improve error message for unexpected array types, Markus Armbruster, 2023/04/26
- [PULL 12/17] tests/qapi-schema: Cover optional conditional struct member, Markus Armbruster, 2023/04/26
- [PULL 10/17] tests/qapi-schema: Rename a few conditionals, Markus Armbruster, 2023/04/26
- [PULL 09/17] tests/qapi-schema: Improve union discriminator coverage,
Markus Armbruster <=
- [PULL 17/17] qapi: allow unions to contain further unions, Markus Armbruster, 2023/04/26
- Re: [PULL 00/17] QAPI patches patches for 2023-04-26, Richard Henderson, 2023/04/26