qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: jsnow@redhat.com, eblake@redhat.com, marcandre.lureau@redhat.com
Subject: [PATCH 14/22] test-clone-visitor: Wean off UserDefListUnion
Date: Mon, 13 Sep 2021 14:39:24 +0200	[thread overview]
Message-ID: <20210913123932.3306639-15-armbru@redhat.com> (raw)
In-Reply-To: <20210913123932.3306639-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>
---
 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-13 12:54 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-13 12:39 [PATCH 00/22] qapi: Remove simple unions from the schema language Markus Armbruster
2021-09-13 12:39 ` [PATCH 01/22] qapi: Tidy up unusual line breaks Markus Armbruster
2021-09-13 13:29   ` Marc-André Lureau
2021-09-13 13:54     ` Markus Armbruster
2021-09-13 13:59       ` Marc-André Lureau
2021-09-13 12:39 ` [PATCH 02/22] qapi: Stop enforcing "type name should not end in 'Kind' Markus Armbruster
2021-09-13 14:40   ` Eric Blake
2021-09-13 12:39 ` [PATCH 03/22] qapi: Convert simple union KeyValue to flat one Markus Armbruster
2021-09-13 14:45   ` Eric Blake
2021-09-14  4:54     ` Markus Armbruster
2021-09-14  7:15   ` Gerd Hoffmann
2021-09-13 12:39 ` [PATCH 04/22] qapi: Convert simple union InputEvent " Markus Armbruster
2021-09-13 14:46   ` Eric Blake
2021-09-14  4:55     ` Markus Armbruster
2021-09-14  7:15   ` Gerd Hoffmann
2021-09-13 12:39 ` [PATCH 05/22] qapi: Convert simple union TpmTypeOptions " Markus Armbruster
2021-09-13 16:32   ` Stefan Berger
2021-09-13 12:39 ` [PATCH 06/22] qapi: Convert simple union MemoryDeviceInfo " Markus Armbruster
2021-09-13 12:39 ` [PATCH 07/22] qapi: Convert simple union ChardevBackend " Markus Armbruster
2021-09-13 12:39 ` [PATCH 08/22] qapi: Convert simple union SocketAddressLegacy " Markus Armbruster
2021-09-13 12:39 ` [PATCH 09/22] qapi: Convert simple union ImageInfoSpecific " Markus Armbruster
2021-09-16 15:01   ` Hanna Reitz
2021-09-13 12:39 ` [PATCH 10/22] qapi: Convert simple union TransactionAction " Markus Armbruster
2021-09-13 14:53   ` Eric Blake
2021-09-14  5:25     ` Markus Armbruster
2021-09-16 15:01   ` Hanna Reitz
2021-09-13 12:39 ` [PATCH 11/22] tests/qapi-schema: Prepare for simple union UserDefListUnion removal Markus Armbruster
2021-09-13 15:01   ` Eric Blake
2021-09-13 12:39 ` [PATCH 12/22] test-qobject-input-visitor: Wean off UserDefListUnion Markus Armbruster
2021-09-13 15:06   ` Eric Blake
2021-09-14  5:50     ` Markus Armbruster
2021-09-13 12:39 ` [PATCH 13/22] test-qobject-output-visitor: " Markus Armbruster
2021-09-13 15:09   ` Eric Blake
2021-09-13 12:39 ` Markus Armbruster [this message]
2021-09-13 15:10   ` [PATCH 14/22] test-clone-visitor: " Eric Blake
2021-09-13 12:39 ` [PATCH 15/22] tests/qapi-schema: " Markus Armbruster
2021-09-13 15:26   ` Eric Blake
2021-09-13 12:39 ` [PATCH 16/22] tests/qapi-schema: Simple union UserDefListUnion is now unused, drop Markus Armbruster
2021-09-13 15:27   ` Eric Blake
2021-09-13 12:39 ` [PATCH 17/22] tests/qapi-schema: Rewrite simple union TestIfUnion to be flat Markus Armbruster
2021-09-13 15:28   ` Eric Blake
2021-09-13 12:39 ` [PATCH 18/22] test-clone-visitor: Wean off __org.qemu_x-Union1 Markus Armbruster
2021-09-13 15:32   ` Eric Blake
2021-09-13 12:39 ` [PATCH 19/22] tests/qapi-schema: Drop simple union __org.qemu_x-Union1 Markus Armbruster
2021-09-13 15:35   ` Eric Blake
2021-09-14  5:55     ` Markus Armbruster
2021-09-13 12:39 ` [PATCH 20/22] tests/qapi-schema: Purge simple unions from tests Markus Armbruster
2021-09-13 15:37   ` Eric Blake
2021-09-13 12:39 ` [PATCH 21/22] qapi: Drop simple unions Markus Armbruster
2021-09-13 18:38   ` Eric Blake
2021-09-14  5:57     ` Markus Armbruster
2021-09-13 12:39 ` [PATCH 22/22] test-clone-visitor: Correct an accidental rename Markus Armbruster
2021-09-13 18:40   ` Eric Blake
2021-09-13 12:49 ` [PATCH 00/22] qapi: Remove simple unions from the schema language 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=20210913123932.3306639-15-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).