|
 |
ae23c9 |
From 239d3cf97ced74198ce100212e9ca2c39835b07a Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
ae23c9 |
Date: Mon, 18 Jun 2018 08:43:26 +0200
|
|
|
ae23c9 |
Subject: [PATCH 028/268] check-block-qdict: Rename qdict_flatten()'s variables
|
|
|
ae23c9 |
for clarity
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
ae23c9 |
Message-id: <20180618084330.30009-20-armbru@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 80721
|
|
|
ae23c9 |
O-Subject: [RHEL-7.6 qemu-kvm-rhev PATCH 19/23] check-block-qdict: Rename qdict_flatten()'s variables for clarity
|
|
|
ae23c9 |
Bugzilla: 1557995
|
|
|
ae23c9 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
ae23c9 |
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
(cherry picked from commit cddec036830ada5d5d45023bcfba09015b8ab394)
|
|
|
ae23c9 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
tests/check-block-qdict.c | 57 ++++++++++++++++++++++++-----------------------
|
|
|
ae23c9 |
1 file changed, 29 insertions(+), 28 deletions(-)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/tests/check-block-qdict.c b/tests/check-block-qdict.c
|
|
|
ae23c9 |
index 5b9f4d5..29f58a2 100644
|
|
|
ae23c9 |
--- a/tests/check-block-qdict.c
|
|
|
ae23c9 |
+++ b/tests/check-block-qdict.c
|
|
|
ae23c9 |
@@ -37,11 +37,11 @@ static void qdict_defaults_test(void)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
static void qdict_flatten_test(void)
|
|
|
ae23c9 |
{
|
|
|
ae23c9 |
- QList *list1 = qlist_new();
|
|
|
ae23c9 |
- QList *list2 = qlist_new();
|
|
|
ae23c9 |
- QDict *dict1 = qdict_new();
|
|
|
ae23c9 |
- QDict *dict2 = qdict_new();
|
|
|
ae23c9 |
- QDict *dict3 = qdict_new();
|
|
|
ae23c9 |
+ QList *e_1 = qlist_new();
|
|
|
ae23c9 |
+ QList *e = qlist_new();
|
|
|
ae23c9 |
+ QDict *e_1_2 = qdict_new();
|
|
|
ae23c9 |
+ QDict *f = qdict_new();
|
|
|
ae23c9 |
+ QDict *root = qdict_new();
|
|
|
ae23c9 |
|
|
|
ae23c9 |
/*
|
|
|
ae23c9 |
* Test the flattening of
|
|
|
ae23c9 |
@@ -79,35 +79,36 @@ static void qdict_flatten_test(void)
|
|
|
ae23c9 |
* }
|
|
|
ae23c9 |
*/
|
|
|
ae23c9 |
|
|
|
ae23c9 |
- qdict_put_int(dict1, "a", 0);
|
|
|
ae23c9 |
- qdict_put_int(dict1, "b", 1);
|
|
|
ae23c9 |
+ qdict_put_int(e_1_2, "a", 0);
|
|
|
ae23c9 |
+ qdict_put_int(e_1_2, "b", 1);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
- qlist_append_int(list1, 23);
|
|
|
ae23c9 |
- qlist_append_int(list1, 66);
|
|
|
ae23c9 |
- qlist_append(list1, dict1);
|
|
|
ae23c9 |
- qlist_append_int(list2, 42);
|
|
|
ae23c9 |
- qlist_append(list2, list1);
|
|
|
ae23c9 |
+ qlist_append_int(e_1, 23);
|
|
|
ae23c9 |
+ qlist_append_int(e_1, 66);
|
|
|
ae23c9 |
+ qlist_append(e_1, e_1_2);
|
|
|
ae23c9 |
+ qlist_append_int(e, 42);
|
|
|
ae23c9 |
+ qlist_append(e, e_1);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
- qdict_put_int(dict2, "c", 2);
|
|
|
ae23c9 |
- qdict_put_int(dict2, "d", 3);
|
|
|
ae23c9 |
- qdict_put(dict3, "e", list2);
|
|
|
ae23c9 |
- qdict_put(dict3, "f", dict2);
|
|
|
ae23c9 |
- qdict_put_int(dict3, "g", 4);
|
|
|
ae23c9 |
+ qdict_put_int(f, "c", 2);
|
|
|
ae23c9 |
+ qdict_put_int(f, "d", 3);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
- qdict_flatten(dict3);
|
|
|
ae23c9 |
+ qdict_put(root, "e", e);
|
|
|
ae23c9 |
+ qdict_put(root, "f", f);
|
|
|
ae23c9 |
+ qdict_put_int(root, "g", 4);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
- g_assert(qdict_get_int(dict3, "e.0") == 42);
|
|
|
ae23c9 |
- g_assert(qdict_get_int(dict3, "e.1.0") == 23);
|
|
|
ae23c9 |
- g_assert(qdict_get_int(dict3, "e.1.1") == 66);
|
|
|
ae23c9 |
- g_assert(qdict_get_int(dict3, "e.1.2.a") == 0);
|
|
|
ae23c9 |
- g_assert(qdict_get_int(dict3, "e.1.2.b") == 1);
|
|
|
ae23c9 |
- g_assert(qdict_get_int(dict3, "f.c") == 2);
|
|
|
ae23c9 |
- g_assert(qdict_get_int(dict3, "f.d") == 3);
|
|
|
ae23c9 |
- g_assert(qdict_get_int(dict3, "g") == 4);
|
|
|
ae23c9 |
+ qdict_flatten(root);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
- g_assert(qdict_size(dict3) == 8);
|
|
|
ae23c9 |
+ g_assert(qdict_get_int(root, "e.0") == 42);
|
|
|
ae23c9 |
+ g_assert(qdict_get_int(root, "e.1.0") == 23);
|
|
|
ae23c9 |
+ g_assert(qdict_get_int(root, "e.1.1") == 66);
|
|
|
ae23c9 |
+ g_assert(qdict_get_int(root, "e.1.2.a") == 0);
|
|
|
ae23c9 |
+ g_assert(qdict_get_int(root, "e.1.2.b") == 1);
|
|
|
ae23c9 |
+ g_assert(qdict_get_int(root, "f.c") == 2);
|
|
|
ae23c9 |
+ g_assert(qdict_get_int(root, "f.d") == 3);
|
|
|
ae23c9 |
+ g_assert(qdict_get_int(root, "g") == 4);
|
|
|
ae23c9 |
|
|
|
ae23c9 |
- qobject_unref(dict3);
|
|
|
ae23c9 |
+ g_assert(qdict_size(root) == 8);
|
|
|
ae23c9 |
+
|
|
|
ae23c9 |
+ qobject_unref(root);
|
|
|
ae23c9 |
}
|
|
|
ae23c9 |
|
|
|
ae23c9 |
static void qdict_array_split_test(void)
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|