From nobody Thu Nov 13 23:22:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1583253356; cv=none; d=zohomail.com; s=zohoarc; b=V5LSfPmO+7JWvf7q6uFjGbDqOY2AotumTiG5pNBzoBsnQcvm6KAaaC2kQlH1GCehoew7chsVIaTJznghz20MRKaAtgCot5dSFVaiSR3RknbcQbe01lo2EKt3qVf4HoEprHJE8KRx/l3kpOupBfooc9sFEuGanrkFQseGgcZ0pjA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583253356; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=txscctFiVA2U4b7jVQ1yKyvWF3aho58FNzAJU1Evot4=; b=Bu883rBG+Ew+Rn0YaaYVLjvH2KQv+zHJzgxGNLsR9ssGDOoXrev3ujOx+8uQO8mjY0tehjfgbd3/0bUA11eogsTSlAQ5lF/FSazuYatpO0NgFfSYTHlqXGD6LqPCwBtmYbfPkXLq4wNfBS6nzZ2OqR5OY6TtmRvjuLU8rTd8NBo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1583253356849390.2688371449615; Tue, 3 Mar 2020 08:35:56 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-292-s5gl7cUMMrK9Qqo9kJw1aw-1; Tue, 03 Mar 2020 11:35:52 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6524E8017CC; Tue, 3 Mar 2020 16:35:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37BD45DA76; Tue, 3 Mar 2020 16:35:46 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id DD8E6180880B; Tue, 3 Mar 2020 16:35:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 023GZDNM001219 for ; Tue, 3 Mar 2020 11:35:13 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5899391D70; Tue, 3 Mar 2020 16:35:13 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-129.ams2.redhat.com [10.36.116.129]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 972D291D63; Tue, 3 Mar 2020 16:35:11 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id C905A113525C; Tue, 3 Mar 2020 17:35:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583253354; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=txscctFiVA2U4b7jVQ1yKyvWF3aho58FNzAJU1Evot4=; b=X9MZ2UMXTSlmilL/Of+8CugnKpC9ubudcfc7eBGiaDCdG2gHHBFQ1IHPzJRis1+adZaVAW 4f9anndVbXsKgf/O/1GslxLnEPIO6EKmUS5jPHzVdttxUfhB9bf9AHnV26IgaqPdx8LWp5 /yOihRhlWe7b2DmiweNayuzMqGsaSEk= X-MC-Unique: s5gl7cUMMrK9Qqo9kJw1aw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 08/30] tests/test-qmp-event: Simplify test data setup Date: Tue, 3 Mar 2020 17:34:43 +0100 Message-Id: <20200303163505.32041-9-armbru@redhat.com> In-Reply-To: <20200303163505.32041-1-armbru@redhat.com> References: <20200303163505.32041-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Cc: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Building expected data with qdict_put() & friends is tedious to write and hard to read. Parse them from string literals with qdict_from_jsonf_nofail() instead. While there, use initializers instead of assignments for initializing aggregate event arguments. Signed-off-by: Markus Armbruster --- tests/test-qmp-event.c | 93 ++++++++++++------------------------------ 1 file changed, 27 insertions(+), 66 deletions(-) diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c index eee7e08ab6..430001e622 100644 --- a/tests/test-qmp-event.c +++ b/tests/test-qmp-event.c @@ -17,6 +17,7 @@ #include "qapi/error.h" #include "qapi/qmp/qbool.h" #include "qapi/qmp/qdict.h" +#include "qapi/qmp/qjson.h" #include "qapi/qmp/qnum.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp-event.h" @@ -124,17 +125,13 @@ static void event_prepare(TestEventData *data, /* Global variable test_event_data was used to pass the expectation, so test cases can't be executed at same time. */ g_mutex_lock(&test_event_lock); - - data->expect =3D qdict_new(); test_event_data =3D data; } =20 static void event_teardown(TestEventData *data, const void *unused) { - qobject_unref(data->expect); test_event_data =3D NULL; - g_mutex_unlock(&test_event_lock); } =20 @@ -152,90 +149,54 @@ static void event_test_add(const char *testpath, static void test_event_a(TestEventData *data, const void *unused) { - QDict *d; - d =3D data->expect; - qdict_put_str(d, "event", "EVENT_A"); + data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_A' }"); qapi_event_send_event_a(); + qobject_unref(data->expect); } =20 static void test_event_b(TestEventData *data, const void *unused) { - QDict *d; - d =3D data->expect; - qdict_put_str(d, "event", "EVENT_B"); + data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_B' }"); qapi_event_send_event_b(); + qobject_unref(data->expect); } =20 static void test_event_c(TestEventData *data, const void *unused) { - QDict *d, *d_data, *d_b; - - UserDefOne b; - b.integer =3D 2; - b.string =3D g_strdup("test1"); - b.has_enum1 =3D false; - - d_b =3D qdict_new(); - qdict_put_int(d_b, "integer", 2); - qdict_put_str(d_b, "string", "test1"); - - d_data =3D qdict_new(); - qdict_put_int(d_data, "a", 1); - qdict_put(d_data, "b", d_b); - qdict_put_str(d_data, "c", "test2"); - - d =3D data->expect; - qdict_put_str(d, "event", "EVENT_C"); - qdict_put(d, "data", d_data); + UserDefOne b =3D { .integer =3D 2, .string =3D (char *)"test1" }; =20 + data->expect =3D qdict_from_jsonf_nofail( + "{ 'event': 'EVENT_C', 'data': {" + " 'a': 1, 'b': { 'integer': 2, 'string': 'test1' }, 'c': 'test2' }= }"); qapi_event_send_event_c(true, 1, true, &b, "test2"); - - g_free(b.string); + qobject_unref(data->expect); } =20 /* Complex type */ static void test_event_d(TestEventData *data, const void *unused) { - UserDefOne struct1; - EventStructOne a; - QDict *d, *d_data, *d_a, *d_struct1; - - struct1.integer =3D 2; - struct1.string =3D g_strdup("test1"); - struct1.has_enum1 =3D true; - struct1.enum1 =3D ENUM_ONE_VALUE1; - - a.struct1 =3D &struct1; - a.string =3D g_strdup("test2"); - a.has_enum2 =3D true; - a.enum2 =3D ENUM_ONE_VALUE2; - - d_struct1 =3D qdict_new(); - qdict_put_int(d_struct1, "integer", 2); - qdict_put_str(d_struct1, "string", "test1"); - qdict_put_str(d_struct1, "enum1", "value1"); - - d_a =3D qdict_new(); - qdict_put(d_a, "struct1", d_struct1); - qdict_put_str(d_a, "string", "test2"); - qdict_put_str(d_a, "enum2", "value2"); - - d_data =3D qdict_new(); - qdict_put(d_data, "a", d_a); - qdict_put_str(d_data, "b", "test3"); - qdict_put_str(d_data, "enum3", "value3"); - - d =3D data->expect; - qdict_put_str(d, "event", "EVENT_D"); - qdict_put(d, "data", d_data); + UserDefOne struct1 =3D { + .integer =3D 2, .string =3D (char *)"test1", + .has_enum1 =3D true, .enum1 =3D ENUM_ONE_VALUE1, + }; + EventStructOne a =3D { + .struct1 =3D &struct1, + .string =3D (char *)"test2", + .has_enum2 =3D true, + .enum2 =3D ENUM_ONE_VALUE2, + }; =20 + data->expect =3D qdict_from_jsonf_nofail( + "{ 'event': 'EVENT_D', 'data': {" + " 'a': {" + " 'struct1': { 'integer': 2, 'string': 'test1', 'enum1': 'value1'= }," + " 'string': 'test2', 'enum2': 'value2' }," + " 'b': 'test3', 'enum3': 'value3' } }"); qapi_event_send_event_d(&a, "test3", false, NULL, true, ENUM_ONE_VALUE= 3); - - g_free(struct1.string); - g_free(a.string); + qobject_unref(data->expect); } =20 int main(int argc, char **argv) --=20 2.21.1