From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60511) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNqPl-00082e-VI for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNqPf-0008UE-47 for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:13 -0400 Received: from cantor2.suse.de ([195.135.220.15]:45529 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNqPe-0008Sy-MJ for qemu-devel@nongnu.org; Wed, 12 Mar 2014 17:10:06 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 12 Mar 2014 22:09:44 +0100 Message-Id: <1394658603-13650-13-git-send-email-afaerber@suse.de> In-Reply-To: <1394658603-13650-1-git-send-email-afaerber@suse.de> References: <1394658603-13650-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL for-2.0-rc0 12/31] qdev-monitor-test: Simplify using g_assert_cmpstr() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Markus Armbruster , Stefan Hajnoczi , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Stefan Hajnoczi Use g_assert_cmpstr() instead of combining g_assert() and strcmp(3). This simplifies the code since we no longer have to play games to distinguish NULL from "" using "(null)". gcc extension haters will also be happy that ?: was dropped. Suggested-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Stefan Hajnoczi Signed-off-by: Andreas F=C3=A4rber --- tests/qdev-monitor-test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/qdev-monitor-test.c b/tests/qdev-monitor-test.c index ba7f9cc..eefaab8 100644 --- a/tests/qdev-monitor-test.c +++ b/tests/qdev-monitor-test.c @@ -32,8 +32,9 @@ static void test_device_add(void) "}}"); g_assert(response); error =3D qdict_get_qdict(response, "error"); - g_assert(!strcmp(qdict_get_try_str(error, "desc") ?: "", - "Device needs media, but drive is empty")); + g_assert_cmpstr(qdict_get_try_str(error, "desc"), + =3D=3D, + "Device needs media, but drive is empty"); QDECREF(response); =20 /* Delete the drive */ @@ -42,7 +43,7 @@ static void test_device_add(void) " \"command-line\": \"drive_del drive0\"" "}}"); g_assert(response); - g_assert(!strcmp(qdict_get_try_str(response, "return") ?: "(null)", = "")); + g_assert_cmpstr(qdict_get_try_str(response, "return"), =3D=3D, ""); QDECREF(response); =20 /* Try to re-add the drive. This fails with duplicate IDs if a leak= ed @@ -53,8 +54,7 @@ static void test_device_add(void) " \"command-line\": \"drive_add pci-addr=3Dauto if=3D= none,id=3Ddrive0\"" "}}"); g_assert(response); - g_assert(!strcmp(qdict_get_try_str(response, "return") ?: "", - "OK\r\n")); + g_assert_cmpstr(qdict_get_try_str(response, "return"), =3D=3D, "OK\r= \n"); QDECREF(response); =20 qtest_end(); --=20 1.8.4.5