From nobody Thu Nov 6 20:37:03 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.zoho.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; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487792249262178.16446879965508; Wed, 22 Feb 2017 11:37:29 -0800 (PST) Received: from localhost ([::1]:54968 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgcj9-0007v1-V7 for importer@patchew.org; Wed, 22 Feb 2017 14:37:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cgcNV-0004dI-6M for qemu-devel@nongnu.org; Wed, 22 Feb 2017 14:15:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cgcNT-0000fJ-5d for qemu-devel@nongnu.org; Wed, 22 Feb 2017 14:15:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45770) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cgcNS-0000eD-TC for qemu-devel@nongnu.org; Wed, 22 Feb 2017 14:15:03 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0DF5D80B20 for ; Wed, 22 Feb 2017 19:15:03 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1MJF1Gw023304 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 22 Feb 2017 14:15:02 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 6DFDE11385FC; Wed, 22 Feb 2017 20:14:58 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Wed, 22 Feb 2017 20:14:53 +0100 Message-Id: <1487790898-24921-12-git-send-email-armbru@redhat.com> In-Reply-To: <1487790898-24921-1-git-send-email-armbru@redhat.com> References: <1487790898-24921-1-git-send-email-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 22 Feb 2017 19:15:03 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 11/16] tests: Don't check qobject_type() before qobject_to_qstring() 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: , 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" qobject_to_qstring(obj) returns NULL when obj isn't a QString. Check that instead of qobject_type(obj) =3D=3D QTYPE_QSTRING. Signed-off-by: Markus Armbruster Message-Id: <1487363905-9480-10-git-send-email-armbru@redhat.com> Reviewed-by: Eric Blake --- tests/check-qjson.c | 31 ++++++++----------------------- tests/test-qobject-output-visitor.c | 37 +++++++++++++++++----------------= ---- 2 files changed, 25 insertions(+), 43 deletions(-) diff --git a/tests/check-qjson.c b/tests/check-qjson.c index 49e02591..dd080a8 100644 --- a/tests/check-qjson.c +++ b/tests/check-qjson.c @@ -54,11 +54,8 @@ static void escaped_string(void) QString *str; =20 obj =3D qobject_from_json(test_cases[i].encoded); - - g_assert(obj !=3D NULL); - g_assert(qobject_type(obj) =3D=3D QTYPE_QSTRING); - =20 str =3D qobject_to_qstring(obj); + g_assert(str); g_assert_cmpstr(qstring_get_str(str), =3D=3D, test_cases[i].decode= d); =20 if (test_cases[i].skip =3D=3D 0) { @@ -89,11 +86,8 @@ static void simple_string(void) QString *str; =20 obj =3D qobject_from_json(test_cases[i].encoded); - - g_assert(obj !=3D NULL); - g_assert(qobject_type(obj) =3D=3D QTYPE_QSTRING); - =20 str =3D qobject_to_qstring(obj); + g_assert(str); g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) =3D= =3D 0); =20 str =3D qobject_to_json(obj); @@ -123,11 +117,8 @@ static void single_quote_string(void) QString *str; =20 obj =3D qobject_from_json(test_cases[i].encoded); - - g_assert(obj !=3D NULL); - g_assert(qobject_type(obj) =3D=3D QTYPE_QSTRING); - =20 str =3D qobject_to_qstring(obj); + g_assert(str); g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) =3D= =3D 0); =20 QDECREF(str); @@ -820,9 +811,8 @@ static void utf8_string(void) =20 obj =3D qobject_from_json(json_in); if (utf8_out) { - g_assert(obj); - g_assert(qobject_type(obj) =3D=3D QTYPE_QSTRING); str =3D qobject_to_qstring(obj); + g_assert(str); g_assert_cmpstr(qstring_get_str(str), =3D=3D, utf8_out); } else { g_assert(!obj); @@ -847,9 +837,8 @@ static void utf8_string(void) */ if (0 && json_out !=3D json_in) { obj =3D qobject_from_json(json_out); - g_assert(obj); - g_assert(qobject_type(obj) =3D=3D QTYPE_QSTRING); str =3D qobject_to_qstring(obj); + g_assert(str); g_assert_cmpstr(qstring_get_str(str), =3D=3D, utf8_out); } } @@ -867,15 +856,11 @@ static void vararg_string(void) }; =20 for (i =3D 0; test_cases[i].decoded; i++) { - QObject *obj; QString *str; =20 - obj =3D qobject_from_jsonf("%s", test_cases[i].decoded); - - g_assert(obj !=3D NULL); - g_assert(qobject_type(obj) =3D=3D QTYPE_QSTRING); - =20 - str =3D qobject_to_qstring(obj); + str =3D qobject_to_qstring(qobject_from_jsonf("%s", + test_cases[i].decoded)= ); + g_assert(str); g_assert(strcmp(qstring_get_str(str), test_cases[i].decoded) =3D= =3D 0); =20 QDECREF(str); diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-outpu= t-visitor.c index 13a0a9b..3e34aa5 100644 --- a/tests/test-qobject-output-visitor.c +++ b/tests/test-qobject-output-visitor.c @@ -97,42 +97,41 @@ static void test_visitor_out_string(TestOutputVisitorDa= ta *data, const void *unused) { char *string =3D (char *) "Q E M U"; - QObject *obj; + QString *qstr; =20 visit_type_str(data->ov, NULL, &string, &error_abort); =20 - obj =3D visitor_get(data); - g_assert(qobject_type(obj) =3D=3D QTYPE_QSTRING); - g_assert_cmpstr(qstring_get_str(qobject_to_qstring(obj)), =3D=3D, stri= ng); + qstr =3D qobject_to_qstring(visitor_get(data)); + g_assert(qstr); + g_assert_cmpstr(qstring_get_str(qstr), =3D=3D, string); } =20 static void test_visitor_out_no_string(TestOutputVisitorData *data, const void *unused) { char *string =3D NULL; - QObject *obj; + QString *qstr; =20 /* A null string should return "" */ visit_type_str(data->ov, NULL, &string, &error_abort); =20 - obj =3D visitor_get(data); - g_assert(qobject_type(obj) =3D=3D QTYPE_QSTRING); - g_assert_cmpstr(qstring_get_str(qobject_to_qstring(obj)), =3D=3D, ""); + qstr =3D qobject_to_qstring(visitor_get(data)); + g_assert(qstr); + g_assert_cmpstr(qstring_get_str(qstr), =3D=3D, ""); } =20 static void test_visitor_out_enum(TestOutputVisitorData *data, const void *unused) { - QObject *obj; EnumOne i; + QString *qstr; =20 for (i =3D 0; i < ENUM_ONE__MAX; i++) { visit_type_EnumOne(data->ov, "unused", &i, &error_abort); =20 - obj =3D visitor_get(data); - g_assert(qobject_type(obj) =3D=3D QTYPE_QSTRING); - g_assert_cmpstr(qstring_get_str(qobject_to_qstring(obj)), =3D=3D, - EnumOne_lookup[i]); + qstr =3D qobject_to_qstring(visitor_get(data)); + g_assert(qstr); + g_assert_cmpstr(qstring_get_str(qstr), =3D=3D, EnumOne_lookup[i]); visitor_reset(data); } } @@ -365,9 +364,7 @@ static void test_visitor_out_any(TestOutputVisitorData = *data, qbool =3D qobject_to_qbool(qobj); g_assert(qbool); g_assert(qbool_get_bool(qbool) =3D=3D true); - qobj =3D qdict_get(qdict, "string"); - g_assert(qobj); - qstring =3D qobject_to_qstring(qobj); + qstring =3D qobject_to_qstring(qdict_get(qdict, "string")); g_assert(qstring); g_assert_cmpstr(qstring_get_str(qstring), =3D=3D, "foo"); } @@ -399,6 +396,7 @@ static void test_visitor_out_alternate(TestOutputVisito= rData *data, { QObject *arg; UserDefAlternate *tmp; + QString *qstr; QDict *qdict; =20 tmp =3D g_new0(UserDefAlternate, 1); @@ -419,10 +417,9 @@ static void test_visitor_out_alternate(TestOutputVisit= orData *data, tmp->u.s =3D g_strdup("hello"); =20 visit_type_UserDefAlternate(data->ov, NULL, &tmp, &error_abort); - arg =3D visitor_get(data); - - g_assert(qobject_type(arg) =3D=3D QTYPE_QSTRING); - g_assert_cmpstr(qstring_get_str(qobject_to_qstring(arg)), =3D=3D, "hel= lo"); + qstr =3D qobject_to_qstring(visitor_get(data)); + g_assert(qstr); + g_assert_cmpstr(qstring_get_str(qstr), =3D=3D, "hello"); =20 qapi_free_UserDefAlternate(tmp); =20 --=20 2.7.4