From nobody Wed Nov 5 13:00:27 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 1534519208622827.8568084151099; Fri, 17 Aug 2018 08:20:08 -0700 (PDT) Received: from localhost ([::1]:34701 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqgXn-0002VG-FM for importer@patchew.org; Fri, 17 Aug 2018 11:20:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqgKG-000344-6k for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqgKC-0001hg-Tr for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:07 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:56208 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 1fqgKC-0001gg-Jy for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:04 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3A87C5A759; Fri, 17 Aug 2018 15:06:04 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 11D6C10D18E0; Fri, 17 Aug 2018 15:06:04 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 0B656110E7CE; Fri, 17 Aug 2018 17:06:00 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 17 Aug 2018 17:05:09 +0200 Message-Id: <20180817150559.16243-11-armbru@redhat.com> In-Reply-To: <20180817150559.16243-1-armbru@redhat.com> References: <20180817150559.16243-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 17 Aug 2018 15:06:04 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 17 Aug 2018 15:06:04 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.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] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 10/60] check-qjson: Consolidate partly redundant string tests 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" simple_string() and single_quote_string() have become redundant with escaped_string(), except fot embedded single and double quotes. Replace them by a test that covers just that. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- tests/check-qjson.c | 64 ++++++++++----------------------------------- 1 file changed, 14 insertions(+), 50 deletions(-) diff --git a/tests/check-qjson.c b/tests/check-qjson.c index ce843283eb..e35942d922 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -126,59 +126,24 @@ static void escaped_string(void) } } =20 -static void simple_string(void) +static void string_with_quotes(void) { - int i; - struct { - const char *encoded; - const char *decoded; - } test_cases[] =3D { - { "\"hello world\"", "hello world" }, - { "\"the quick brown fox jumped over the fence\"", - "the quick brown fox jumped over the fence" }, - {} + const char *test_cases[] =3D { + "\"the bee's knees\"", + "'double quote \"'", + NULL }; - - 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(strcmp(qstring_get_str(str), test_cases[i].decoded) =3D= =3D 0); - - str =3D qobject_to_json(obj); - g_assert(strcmp(qstring_get_str(str), test_cases[i].encoded) =3D= =3D 0); - - qobject_unref(obj); - =20 - qobject_unref(str); - } -} - -static void single_quote_string(void) -{ int i; - struct { - const char *encoded; - const char *decoded; - } test_cases[] =3D { - { "'hello world'", "hello world" }, - { "'the quick brown fox \\' jumped over the fence'", - "the quick brown fox ' jumped over the fence" }, - {} - }; + QString *str; + char *cstr; =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); + for (i =3D 0; test_cases[i]; i++) { + str =3D qobject_to(QString, + qobject_from_json(test_cases[i], &error_abort)); g_assert(str); - g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) =3D= =3D 0); - + cstr =3D g_strndup(test_cases[i] + 1, strlen(test_cases[i]) - 2); + g_assert_cmpstr(qstring_get_str(str), =3D=3D, cstr); + g_free(cstr); qobject_unref(str); } } @@ -1525,10 +1490,9 @@ int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); =20 - g_test_add_func("/literals/string/simple", simple_string); g_test_add_func("/literals/string/escaped", escaped_string); + g_test_add_func("/literals/string/quotes", string_with_quotes); g_test_add_func("/literals/string/utf8", utf8_string); - g_test_add_func("/literals/string/single_quote", single_quote_string); g_test_add_func("/literals/string/vararg", vararg_string); =20 g_test_add_func("/literals/number/simple", simple_number); --=20 2.17.1