From patchwork Sat Oct 17 13:36:11 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 36312 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E4A86B70B3 for ; Sun, 18 Oct 2009 00:57:29 +1100 (EST) Received: from localhost ([127.0.0.1]:56616 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mz9me-0006iL-JG for incoming@patchwork.ozlabs.org; Sat, 17 Oct 2009 09:57:24 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mz9SQ-0005qM-Ja for qemu-devel@nongnu.org; Sat, 17 Oct 2009 09:36:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mz9SI-0005ll-25 for qemu-devel@nongnu.org; Sat, 17 Oct 2009 09:36:27 -0400 Received: from [199.232.76.173] (port=58969 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mz9SH-0005lR-MP for qemu-devel@nongnu.org; Sat, 17 Oct 2009 09:36:21 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:52917) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mz9SH-0000Oz-7x for qemu-devel@nongnu.org; Sat, 17 Oct 2009 09:36:21 -0400 Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e36.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id n9HDYEvd006504 for ; Sat, 17 Oct 2009 07:34:14 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay04.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n9HDaG4h216864 for ; Sat, 17 Oct 2009 07:36:16 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n9HDaFFH021705 for ; Sat, 17 Oct 2009 07:36:15 -0600 Received: from localhost.localdomain (sig-9-65-54-101.mts.ibm.com [9.65.54.101]) by d03av04.boulder.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n9HDaBJL021369; Sat, 17 Oct 2009 07:36:15 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Sat, 17 Oct 2009 08:36:11 -0500 Message-Id: <1255786571-3528-12-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.2.5 In-Reply-To: <1255786571-3528-1-git-send-email-aliguori@us.ibm.com> References: <1255786571-3528-1-git-send-email-aliguori@us.ibm.com> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH 11/11] qjson: add unit test to check %p format X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Anthony Liguori --- check-qjson.c | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/check-qjson.c b/check-qjson.c index 8760941..9be1448 100644 --- a/check-qjson.c +++ b/check-qjson.c @@ -551,11 +551,38 @@ START_TEST(simple_whitespace) } END_TEST +START_TEST(simple_varargs) +{ + QObject *embedded_obj; + QObject *obj; + LiteralQObject decoded = QLIT_QLIST(((LiteralQObject[]){ + QLIT_QINT(1), + QLIT_QINT(2), + QLIT_QLIST(((LiteralQObject[]){ + QLIT_QINT(32), + QLIT_QINT(42), + {}})), + {}})); + + embedded_obj = qobject_from_json("[32, 42]", NULL); + fail_unless(embedded_obj != NULL); + + obj = qobject_from_jsonf("[%d, 2, %p]", NULL, 1, embedded_obj); + fail_unless(obj != NULL); + + qobject_decref(embedded_obj); + + fail_unless(compare_litqobj_to_qobj(&decoded, obj) == 1); + + qobject_decref(obj); +} +END_TEST + static Suite *qjson_suite(void) { Suite *suite; TCase *string_literals, *number_literals, *keyword_literals; - TCase *dicts, *lists, *whitespace; + TCase *dicts, *lists, *whitespace, *varargs; string_literals = tcase_create("String Literals"); tcase_add_test(string_literals, simple_string); @@ -580,6 +607,9 @@ static Suite *qjson_suite(void) whitespace = tcase_create("Whitespace"); tcase_add_test(whitespace, simple_whitespace); + varargs = tcase_create("Varargs"); + tcase_add_test(varargs, simple_varargs); + suite = suite_create("QJSON test-suite"); suite_add_tcase(suite, string_literals); suite_add_tcase(suite, number_literals); @@ -587,6 +617,7 @@ static Suite *qjson_suite(void) suite_add_tcase(suite, dicts); suite_add_tcase(suite, lists); suite_add_tcase(suite, whitespace); + suite_add_tcase(suite, varargs); return suite; }