[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 09/14] tests/qapi-schema: Improve union discriminator coverage
From: |
Markus Armbruster |
Subject: |
[PATCH 09/14] tests/qapi-schema: Improve union discriminator coverage |
Date: |
Thu, 16 Mar 2023 08:13:20 +0100 |
A union's 'discriminator' must name a 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>
---
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
- [PATCH 14/14] qapi: Require boxed for conditional command and event arguments, (continued)
- [PATCH 14/14] qapi: Require boxed for conditional command and event arguments, Markus Armbruster, 2023/03/16
- [PATCH 04/14] qapi: Split up check_type(), Markus Armbruster, 2023/03/16
- [PATCH 03/14] qapi: Clean up after removal of simple unions, Markus Armbruster, 2023/03/16
- [PATCH 06/14] qapi: Simplify code a bit after previous commit, Markus Armbruster, 2023/03/16
- [PATCH 09/14] tests/qapi-schema: Improve union discriminator coverage,
Markus Armbruster <=
- [PATCH 07/14] qapi: Fix error message when type name or array is expected, Markus Armbruster, 2023/03/16
- [PATCH 10/14] tests/qapi-schema: Rename a few conditionals, Markus Armbruster, 2023/03/16