From nobody Mon Apr 7 17:55:13 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1529073979883136.05339824515102; Fri, 15 Jun 2018 07:46:19 -0700 (PDT) Received: from localhost ([::1]:47281 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTpzX-0002fC-5t for importer@patchew.org; Fri, 15 Jun 2018 10:46:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTpbf-0006FN-DD for qemu-devel@nongnu.org; Fri, 15 Jun 2018 10:21:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTpbZ-0003kh-2e for qemu-devel@nongnu.org; Fri, 15 Jun 2018 10:21:39 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:54414 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fTpbU-0003fm-MO; Fri, 15 Jun 2018 10:21:28 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 53F7A40122A1; Fri, 15 Jun 2018 14:21:28 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-117-70.ams2.redhat.com [10.36.117.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id A425C63A72; Fri, 15 Jun 2018 14:21:27 +0000 (UTC) From: Kevin Wolf To: qemu-block@nongnu.org Date: Fri, 15 Jun 2018 16:21:00 +0200 Message-Id: <20180615142108.27814-19-kwolf@redhat.com> In-Reply-To: <20180615142108.27814-1-kwolf@redhat.com> References: <20180615142108.27814-1-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 15 Jun 2018 14:21:28 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 15 Jun 2018 14:21:28 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kwolf@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 18/26] check-block-qdict: Rename qdict_flatten()'s variables for clarity X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Markus Armbruster Signed-off-by: Markus Armbruster Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- tests/check-block-qdict.c | 57 ++++++++++++++++++++++++-------------------= ---- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/tests/check-block-qdict.c b/tests/check-block-qdict.c index 5b9f4d506e..29f58a2d3d 100644 --- a/tests/check-block-qdict.c +++ b/tests/check-block-qdict.c @@ -37,11 +37,11 @@ static void qdict_defaults_test(void) =20 static void qdict_flatten_test(void) { - QList *list1 =3D qlist_new(); - QList *list2 =3D qlist_new(); - QDict *dict1 =3D qdict_new(); - QDict *dict2 =3D qdict_new(); - QDict *dict3 =3D qdict_new(); + QList *e_1 =3D qlist_new(); + QList *e =3D qlist_new(); + QDict *e_1_2 =3D qdict_new(); + QDict *f =3D qdict_new(); + QDict *root =3D qdict_new(); =20 /* * Test the flattening of @@ -79,35 +79,36 @@ static void qdict_flatten_test(void) * } */ =20 - qdict_put_int(dict1, "a", 0); - qdict_put_int(dict1, "b", 1); + qdict_put_int(e_1_2, "a", 0); + qdict_put_int(e_1_2, "b", 1); =20 - qlist_append_int(list1, 23); - qlist_append_int(list1, 66); - qlist_append(list1, dict1); - qlist_append_int(list2, 42); - qlist_append(list2, list1); + qlist_append_int(e_1, 23); + qlist_append_int(e_1, 66); + qlist_append(e_1, e_1_2); + qlist_append_int(e, 42); + qlist_append(e, e_1); =20 - qdict_put_int(dict2, "c", 2); - qdict_put_int(dict2, "d", 3); - qdict_put(dict3, "e", list2); - qdict_put(dict3, "f", dict2); - qdict_put_int(dict3, "g", 4); + qdict_put_int(f, "c", 2); + qdict_put_int(f, "d", 3); =20 - qdict_flatten(dict3); + qdict_put(root, "e", e); + qdict_put(root, "f", f); + qdict_put_int(root, "g", 4); =20 - g_assert(qdict_get_int(dict3, "e.0") =3D=3D 42); - g_assert(qdict_get_int(dict3, "e.1.0") =3D=3D 23); - g_assert(qdict_get_int(dict3, "e.1.1") =3D=3D 66); - g_assert(qdict_get_int(dict3, "e.1.2.a") =3D=3D 0); - g_assert(qdict_get_int(dict3, "e.1.2.b") =3D=3D 1); - g_assert(qdict_get_int(dict3, "f.c") =3D=3D 2); - g_assert(qdict_get_int(dict3, "f.d") =3D=3D 3); - g_assert(qdict_get_int(dict3, "g") =3D=3D 4); + qdict_flatten(root); =20 - g_assert(qdict_size(dict3) =3D=3D 8); + g_assert(qdict_get_int(root, "e.0") =3D=3D 42); + g_assert(qdict_get_int(root, "e.1.0") =3D=3D 23); + g_assert(qdict_get_int(root, "e.1.1") =3D=3D 66); + g_assert(qdict_get_int(root, "e.1.2.a") =3D=3D 0); + g_assert(qdict_get_int(root, "e.1.2.b") =3D=3D 1); + g_assert(qdict_get_int(root, "f.c") =3D=3D 2); + g_assert(qdict_get_int(root, "f.d") =3D=3D 3); + g_assert(qdict_get_int(root, "g") =3D=3D 4); =20 - qobject_unref(dict3); + g_assert(qdict_size(root) =3D=3D 8); + + qobject_unref(root); } =20 static void qdict_array_split_test(void) --=20 2.13.6