[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 14/23] test-clone-visitor: Wean off UserDefListUnion
From: |
Markus Armbruster |
Subject: |
[PATCH v2 14/23] test-clone-visitor: Wean off UserDefListUnion |
Date: |
Fri, 17 Sep 2021 16:31:25 +0200 |
test_clone_complex1() uses simple union UserDefListUnion to cover
unions. Use UserDefFlatUnion instead. Arrays are still covered by
test_clone_complex3().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
tests/unit/test-clone-visitor.c | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/tests/unit/test-clone-visitor.c b/tests/unit/test-clone-visitor.c
index 4944b3d857..8357a90e60 100644
--- a/tests/unit/test-clone-visitor.c
+++ b/tests/unit/test-clone-visitor.c
@@ -99,18 +99,26 @@ static void test_clone_empty(void)
static void test_clone_complex1(void)
{
- UserDefListUnion *src, *dst;
+ UserDefFlatUnion *src, *dst;
- src = g_new0(UserDefListUnion, 1);
- src->type = USER_DEF_LIST_UNION_KIND_STRING;
+ src = g_new0(UserDefFlatUnion, 1);
+ src->integer = 123;
+ src->string = g_strdup("abc");
+ src->enum1 = ENUM_ONE_VALUE1;
+ src->u.value1.boolean = true;
- dst = QAPI_CLONE(UserDefListUnion, src);
+ dst = QAPI_CLONE(UserDefFlatUnion, src);
g_assert(dst);
- g_assert_cmpint(dst->type, ==, src->type);
- g_assert(!dst->u.string.data);
- qapi_free_UserDefListUnion(src);
- qapi_free_UserDefListUnion(dst);
+ g_assert_cmpint(dst->integer, ==, 123);
+ g_assert_cmpstr(dst->string, ==, "abc");
+ g_assert_cmpint(dst->enum1, ==, ENUM_ONE_VALUE1);
+ g_assert(dst->u.value1.boolean);
+ g_assert(!dst->u.value1.has_a_b);
+ g_assert_cmpint(dst->u.value1.a_b, ==, 0);
+
+ qapi_free_UserDefFlatUnion(src);
+ qapi_free_UserDefFlatUnion(dst);
}
static void test_clone_complex2(void)
--
2.31.1
- [PATCH v2 05/23] qapi: Convert simple union TpmTypeOptions to flat one, (continued)
- [PATCH v2 05/23] qapi: Convert simple union TpmTypeOptions to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 03/23] qapi: Convert simple union KeyValue to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 11/23] tests/qapi-schema: Prepare for simple union UserDefListUnion removal, Markus Armbruster, 2021/09/17
- [PATCH v2 07/23] qapi: Convert simple union ChardevBackend to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 19/23] tests/qapi-schema: Drop simple union __org.qemu_x-Union1, Markus Armbruster, 2021/09/17
- [PATCH v2 23/23] test-clone-visitor: Correct an accidental rename, Markus Armbruster, 2021/09/17
- [PATCH v2 13/23] test-qobject-output-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/17
- [PATCH v2 20/23] tests/qapi-schema: Purge simple unions from tests, Markus Armbruster, 2021/09/17
- [PATCH v2 21/23] qapi: Drop simple unions, Markus Armbruster, 2021/09/17
- [PATCH v2 08/23] qapi: Convert simple union SocketAddressLegacy to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 14/23] test-clone-visitor: Wean off UserDefListUnion,
Markus Armbruster <=
- [PATCH v2 18/23] test-clone-visitor: Wean off __org.qemu_x-Union1, Markus Armbruster, 2021/09/17
- [PATCH v2 22/23] tests/qapi-schema: Rename flat-union-* test cases to union-*, Markus Armbruster, 2021/09/17
- [PATCH v2 02/23] qapi: Stop enforcing "type name should not end in 'Kind', Markus Armbruster, 2021/09/17
- [PATCH v2 10/23] qapi: Convert simple union TransactionAction to flat one, Markus Armbruster, 2021/09/17
- [PATCH v2 17/23] tests/qapi-schema: Rewrite simple union TestIfUnion to be flat, Markus Armbruster, 2021/09/17
- [PATCH v2 12/23] test-qobject-input-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/17
- [PATCH v2 04/23] qapi: Convert simple union InputEvent to flat one, Markus Armbruster, 2021/09/17