All of lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, Eric Blake <eblake@redhat.com>
Subject: [PULL 14/25] test-clone-visitor: Wean off UserDefListUnion
Date: Sat, 25 Sep 2021 08:25:14 +0200	[thread overview]
Message-ID: <20210925062525.988405-15-armbru@redhat.com> (raw)
In-Reply-To: <20210925062525.988405-1-armbru@redhat.com>

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>
Message-Id: <20210917143134.412106-15-armbru@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



  parent reply	other threads:[~2021-09-25  6:37 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-25  6:25 [PULL 00/25] QAPI patches patches for 2021-09-25 Markus Armbruster
2021-09-25  6:25 ` [PULL 01/25] qapi: Tidy up unusual line breaks Markus Armbruster
2021-09-25  6:25 ` [PULL 02/25] qapi: Stop enforcing "type name should not end in 'Kind' Markus Armbruster
2021-09-25  6:25 ` [PULL 03/25] qapi: Convert simple union KeyValue to flat one Markus Armbruster
2021-09-25  6:25 ` [PULL 04/25] qapi: Convert simple union InputEvent " Markus Armbruster
2021-09-25  6:25 ` [PULL 05/25] qapi: Convert simple union TpmTypeOptions " Markus Armbruster
2021-09-25  6:25 ` [PULL 06/25] qapi: Convert simple union MemoryDeviceInfo " Markus Armbruster
2021-09-25  6:25 ` [PULL 07/25] qapi: Convert simple union ChardevBackend " Markus Armbruster
2021-09-25  6:25 ` [PULL 08/25] qapi: Convert simple union SocketAddressLegacy " Markus Armbruster
2021-09-25  6:25 ` [PULL 09/25] qapi: Convert simple union ImageInfoSpecific " Markus Armbruster
2021-09-25  6:25 ` [PULL 10/25] qapi: Convert simple union TransactionAction " Markus Armbruster
2021-09-25  6:25 ` [PULL 11/25] tests/qapi-schema: Prepare for simple union UserDefListUnion removal Markus Armbruster
2021-09-25  6:25 ` [PULL 12/25] test-qobject-input-visitor: Wean off UserDefListUnion Markus Armbruster
2021-09-25  6:25 ` [PULL 13/25] test-qobject-output-visitor: " Markus Armbruster
2021-09-25  6:25 ` Markus Armbruster [this message]
2021-09-25  6:25 ` [PULL 15/25] tests/qapi-schema: " Markus Armbruster
2021-09-25  6:25 ` [PULL 16/25] tests/qapi-schema: Simple union UserDefListUnion is now unused, drop Markus Armbruster
2021-09-25  6:25 ` [PULL 17/25] tests/qapi-schema: Rewrite simple union TestIfUnion to be flat Markus Armbruster
2021-09-25  6:25 ` [PULL 18/25] test-clone-visitor: Wean off __org.qemu_x-Union1 Markus Armbruster
2021-09-25  6:25 ` [PULL 19/25] tests/qapi-schema: Drop simple union __org.qemu_x-Union1 Markus Armbruster
2021-09-25  6:25 ` [PULL 20/25] tests/qapi-schema: Purge simple unions from tests Markus Armbruster
2021-09-25  6:25 ` [PULL 21/25] qapi: Drop simple unions Markus Armbruster
2021-09-25  6:25 ` [PULL 22/25] tests/qapi-schema: Rename flat-union-* test cases to union-* Markus Armbruster
2021-09-25  6:25 ` [PULL 23/25] test-clone-visitor: Correct an accidental rename Markus Armbruster
2021-09-25  6:25 ` [PULL 24/25] tests/qapi-schema: Use Python OSError instead of outmoded IOError Markus Armbruster
2021-09-25  6:25 ` [PULL 25/25] tests/qapi-schema: Make test-qapi.py -u work when files are absent Markus Armbruster
2021-09-25  8:44 ` [PULL 00/25] QAPI patches patches for 2021-09-25 Peter Maydell
2021-09-27 12:41   ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210925062525.988405-15-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.