From nobody Wed Nov 5 10:43:15 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 1533730264970555.3951948968954; Wed, 8 Aug 2018 05:11:04 -0700 (PDT) Received: from localhost ([::1]:43163 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnNIp-0004Fg-4Q for importer@patchew.org; Wed, 08 Aug 2018 08:10:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnNBk-0006eD-9A for qemu-devel@nongnu.org; Wed, 08 Aug 2018 08:03:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnNBi-0008Qi-4S for qemu-devel@nongnu.org; Wed, 08 Aug 2018 08:03:40 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:45366 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 1fnNBh-0008PM-UN for qemu-devel@nongnu.org; Wed, 08 Aug 2018 08:03:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A8C981663D8; Wed, 8 Aug 2018 12:03:37 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-62.ams2.redhat.com [10.36.117.62]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 84C2621568A1; Wed, 8 Aug 2018 12:03:36 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 2303B1138663; Wed, 8 Aug 2018 14:03:34 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 8 Aug 2018 14:02:45 +0200 Message-Id: <20180808120334.10970-8-armbru@redhat.com> In-Reply-To: <20180808120334.10970-1-armbru@redhat.com> References: <20180808120334.10970-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 08 Aug 2018 12:03:37 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 08 Aug 2018 12:03:37 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@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] [PATCH 07/56] check-qjson: Cover escaped characters more thoroughly, part 1 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: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" escaped_string() first tests double quoted strings, then repeats a few tests with single quotes. Repeat all of them: store the strings to test without quotes, and wrap them in either kind of quote for testing. Signed-off-by: Markus Armbruster --- tests/check-qjson.c | 94 ++++++++++++++++++++++++++------------------- 1 file changed, 55 insertions(+), 39 deletions(-) diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 0a9a054c7b..1c7f24bc4d 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -22,55 +22,71 @@ #include "qapi/qmp/qstring.h" #include "qemu-common.h" =20 +static QString *from_json_str(const char *jstr, Error **errp, bool single) +{ + char quote =3D single ? '\'' : '"'; + char *qjstr =3D g_strdup_printf("%c%s%c", quote, jstr, quote); + + return qobject_to(QString, qobject_from_json(qjstr, errp)); +} + +static char *to_json_str(QString *str) +{ + QString *json =3D qobject_to_json(QOBJECT(str)); + char *jstr; + + if (!json) { + return NULL; + } + /* peel off double quotes */ + jstr =3D g_strndup(qstring_get_str(json) + 1, + qstring_get_length(json) - 2); + qobject_unref(json); + return jstr; +} + static void escaped_string(void) { - int i; struct { - const char *encoded; - const char *decoded; + /* Content of JSON string to parse with qobject_from_json() */ + const char *json_in; + /* Expected parse output; to unparse with qobject_to_json() */ + const char *utf8_out; int skip; } test_cases[] =3D { - { "\"\\b\"", "\b" }, - { "\"\\f\"", "\f" }, - { "\"\\n\"", "\n" }, - { "\"\\r\"", "\r" }, - { "\"\\t\"", "\t" }, - { "\"/\"", "/" }, - { "\"\\/\"", "/", .skip =3D 1 }, - { "\"\\\\\"", "\\" }, - { "\"\\\"\"", "\"" }, - { "\"hello world \\\"embedded string\\\"\"", + { "\\b", "\b" }, + { "\\f", "\f" }, + { "\\n", "\n" }, + { "\\r", "\r" }, + { "\\t", "\t" }, + { "/", "/" }, + { "\\/", "/", .skip =3D 1 }, + { "\\\\", "\\" }, + { "\\\"", "\"" }, + { "hello world \\\"embedded string\\\"", "hello world \"embedded string\"" }, - { "\"hello world\\nwith new line\"", "hello world\nwith new line" = }, - { "\"single byte utf-8 \\u0020\"", "single byte utf-8 ", .skip = =3D 1 }, - { "\"double byte utf-8 \\u00A2\"", "double byte utf-8 \xc2\xa2" }, - { "\"triple byte utf-8 \\u20AC\"", "triple byte utf-8 \xe2\x82\xac= " }, - { "'\\b'", "\b", .skip =3D 1 }, - { "'\\f'", "\f", .skip =3D 1 }, - { "'\\n'", "\n", .skip =3D 1 }, - { "'\\r'", "\r", .skip =3D 1 }, - { "'\\t'", "\t", .skip =3D 1 }, - { "'\\/'", "/", .skip =3D 1 }, - { "'\\\\'", "\\", .skip =3D 1 }, + { "hello world\\nwith new line", "hello world\nwith new line" }, + { "single byte utf-8 \\u0020", "single byte utf-8 ", .skip =3D 1 = }, + { "double byte utf-8 \\u00A2", "double byte utf-8 \xc2\xa2" }, + { "triple byte utf-8 \\u20AC", "triple byte utf-8 \xe2\x82\xac" }, {} }; + int i, j; + QString *cstr; + char *jstr; =20 - for (i =3D 0; test_cases[i].encoded; i++) { - QObject *obj; - QString *str; - - obj =3D qobject_from_json(test_cases[i].encoded, &error_abort); - str =3D qobject_to(QString, obj); - g_assert(str); - g_assert_cmpstr(qstring_get_str(str), =3D=3D, test_cases[i].decode= d); - - if (test_cases[i].skip =3D=3D 0) { - str =3D qobject_to_json(obj); - g_assert_cmpstr(qstring_get_str(str), =3D=3D, test_cases[i].en= coded); - qobject_unref(obj); + for (i =3D 0; test_cases[i].json_in; i++) { + for (j =3D 0; j < 2; j++) { + cstr =3D from_json_str(test_cases[i].json_in, &error_abort, j); + g_assert_cmpstr(qstring_get_try_str(cstr), + =3D=3D, test_cases[i].utf8_out); + if (test_cases[i].skip =3D=3D 0) { + jstr =3D to_json_str(cstr); + g_assert_cmpstr(jstr, =3D=3D, test_cases[i].json_in); + g_free(jstr); + } + qobject_unref(cstr); } - - qobject_unref(str); } } =20 --=20 2.17.1