From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: Max Reitz <mreitz@redhat.com>
Subject: [Qemu-devel] [PULL 04/10] tests: Add QDict clone-flatten test
Date: Fri, 22 Jun 2018 17:32:22 +0200 [thread overview]
Message-ID: <20180622153228.23594-5-armbru@redhat.com> (raw)
In-Reply-To: <20180622153228.23594-1-armbru@redhat.com>
From: Max Reitz <mreitz@redhat.com>
This new test verifies that qdict_flatten() does not modify a shallow
clone of the given QDict.
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20180611205203.2624-8-mreitz@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
tests/check-block-qdict.c | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/tests/check-block-qdict.c b/tests/check-block-qdict.c
index 1d20fccbd4..478807f839 100644
--- a/tests/check-block-qdict.c
+++ b/tests/check-block-qdict.c
@@ -125,6 +125,38 @@ static void qdict_flatten_test(void)
qobject_unref(root);
}
+static void qdict_clone_flatten_test(void)
+{
+ QDict *dict1 = qdict_new();
+ QDict *dict2 = qdict_new();
+ QDict *cloned_dict1;
+
+ /*
+ * Test that we can clone and flatten
+ * { "a": { "b": 42 } }
+ * without modifying the clone.
+ */
+
+ qdict_put_int(dict2, "b", 42);
+ qdict_put(dict1, "a", dict2);
+
+ cloned_dict1 = qdict_clone_shallow(dict1);
+
+ qdict_flatten(dict1);
+
+ g_assert(qdict_size(dict1) == 1);
+ g_assert(qdict_get_int(dict1, "a.b") == 42);
+
+ g_assert(qdict_size(cloned_dict1) == 1);
+ g_assert(qdict_get_qdict(cloned_dict1, "a") == dict2);
+
+ g_assert(qdict_size(dict2) == 1);
+ g_assert(qdict_get_int(dict2, "b") == 42);
+
+ qobject_unref(dict1);
+ qobject_unref(cloned_dict1);
+}
+
static void qdict_array_split_test(void)
{
QDict *test_dict = qdict_new();
@@ -674,6 +706,7 @@ int main(int argc, char **argv)
g_test_add_func("/public/defaults", qdict_defaults_test);
g_test_add_func("/public/flatten", qdict_flatten_test);
+ g_test_add_func("/public/clone_flatten", qdict_clone_flatten_test);
g_test_add_func("/public/array_split", qdict_array_split_test);
g_test_add_func("/public/array_entries", qdict_array_entries_test);
g_test_add_func("/public/join", qdict_join_test);
--
2.17.1
next prev parent reply other threads:[~2018-06-22 15:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-22 15:32 [Qemu-devel] [PULL 00/10] QAPI patches for 2018-06-22 Markus Armbruster
2018-06-22 15:32 ` [Qemu-devel] [PULL 01/10] qapi/visit: remove useless prefix argument Markus Armbruster
2018-06-22 15:32 ` [Qemu-devel] [PULL 02/10] qapi/events: generate event enum in main module Markus Armbruster
2018-06-22 15:32 ` [Qemu-devel] [PULL 03/10] qdict: Make qdict_flatten() shallow-clone-friendly Markus Armbruster
2018-06-22 15:32 ` Markus Armbruster [this message]
2018-06-22 15:32 ` [Qemu-devel] [PULL 05/10] qapi: allow empty branches in flat unions Markus Armbruster
2018-06-22 15:32 ` [Qemu-devel] [PULL 06/10] qapi: remove empty flat union branches and types Markus Armbruster
2018-06-22 15:32 ` [Qemu-devel] [PULL 07/10] qapi: Open files with encoding='utf-8' Markus Armbruster
2018-06-22 15:32 ` [Qemu-devel] [PULL 08/10] Revert commit d4e5ec877ca Markus Armbruster
2018-06-22 15:32 ` [Qemu-devel] [PULL 09/10] qapi/introspect: Eliminate pointless variable in .visit_end() Markus Armbruster
2018-06-22 15:32 ` [Qemu-devel] [PULL 10/10] MAINTAINERS: Update QAPI stanza for commit fb0bc835e56 Markus Armbruster
2018-06-22 17:02 ` [Qemu-devel] [PULL 00/10] QAPI patches for 2018-06-22 Peter Maydell
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=20180622153228.23594-5-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=mreitz@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).