From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGwFe-0000Uj-CW for qemu-devel@nongnu.org; Fri, 21 Feb 2014 14:59:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGwFY-0007es-0x for qemu-devel@nongnu.org; Fri, 21 Feb 2014 14:59:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:2733) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGwFX-0007ee-Ob for qemu-devel@nongnu.org; Fri, 21 Feb 2014 14:59:07 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s1LJx622003609 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 21 Feb 2014 14:59:06 -0500 From: Max Reitz Date: Fri, 21 Feb 2014 21:01:46 +0100 Message-Id: <1393012906-24647-1-git-send-email-mreitz@redhat.com> Subject: [Qemu-devel] [PATCH] check-qdict: Test termination of qdict_array_split() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi , Max Reitz qdict_array_split() should terminate if it encounters both an entry with a key of "%u" and entries with keys prefixed "%u." for the same index. This patch adds a test for this case. Signed-off-by: Max Reitz --- This is a followup to my "Extract non-QDicts in qdict_array_split()" series. --- tests/check-qdict.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/tests/check-qdict.c b/tests/check-qdict.c index 680e3c3..9f7023e 100644 --- a/tests/check-qdict.c +++ b/tests/check-qdict.c @@ -389,6 +389,57 @@ static void qdict_array_split_test(void) g_assert(qdict_size(test_dict) == 2); QDECREF(test_dict); + + + /* + * Test the split of + * + * { + * "0": 42, + * "1": 23, + * "1.x": 84 + * } + * + * to + * + * [ + * 42 + * ] + * + * and + * + * { + * "1": 23, + * "1.x": 84 + * } + * + * That is, test whether splitting stops if there is both an entry with key + * of "%u" and other entries with keys prefixed "%u." for the same index. + */ + + test_dict = qdict_new(); + + qdict_put(test_dict, "0", qint_from_int(42)); + qdict_put(test_dict, "1", qint_from_int(23)); + qdict_put(test_dict, "1.x", qint_from_int(84)); + + qdict_array_split(test_dict, &test_list); + + int1 = qobject_to_qint(qlist_pop(test_list)); + + g_assert(int1); + g_assert(qlist_empty(test_list)); + + QDECREF(test_list); + + g_assert(qint_get_int(int1) == 42); + + g_assert(qdict_get_int(test_dict, "1") == 23); + g_assert(qdict_get_int(test_dict, "1.x") == 84); + + g_assert(qdict_size(test_dict) == 2); + + QDECREF(test_dict); } /* -- 1.9.0