From nobody Wed Nov 27 00:46:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1703065474; cv=none; d=zohomail.com; s=zohoarc; b=HYSp9RAACQyitEQZ4RPMHFlZjUF+HGYCPQyhcPV8zd4bIhHKtOu/apbP6eNGiTOV41cFkTBhMBcvdpzjgHvBADlHXe/dPIXBK51uj0AF1UQ6cg729dsLSbHerUtGd+Ibnj/4pb3YYVrkD2Tm4WzL4cNE/eOQVm3wSR5fEi/r/TA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703065474; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=4DpZlBho/nC9bkYJSXc+Br/82Oo1xDZt5/eDlvKX4I8=; b=Ng6/Da5K59TEdRStuORa4XcVMM1WpOCeSOh4hw37HRIKRi6TEs6ha40p0WDzmXxnvopZ3bdI5s+yN5tFSHccZ/2L5dP48E84Gw1ZfrZinHXcUds6K/1rwosIvFoBq464hhD8ym3/sMQ++2m6LbUD8LtecZnxXZ0w2QJ7TQRvcjw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17030654742381018.5105601441638; Wed, 20 Dec 2023 01:44:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFt5P-0002do-Vs; Wed, 20 Dec 2023 04:41:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFt5O-0002dd-9c for qemu-devel@nongnu.org; Wed, 20 Dec 2023 04:41:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rFt5J-0005nZ-Ck for qemu-devel@nongnu.org; Wed, 20 Dec 2023 04:41:54 -0500 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-689-SAwW8E9eM96TfRgiw1Xg1Q-1; Wed, 20 Dec 2023 04:41:45 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0A5253C00086; Wed, 20 Dec 2023 09:41:45 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.194.167]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70BDE2166B31; Wed, 20 Dec 2023 09:41:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703065308; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4DpZlBho/nC9bkYJSXc+Br/82Oo1xDZt5/eDlvKX4I8=; b=LpI8lvfL86rT8sTm/i74A7cxK1U7CaK2Hb59IMlusmB91YxCWQvH/2jGqKtrx+i0A3m8s+ lEw8QUL8lfC/MD7xs/R68HIcajBYgoQCy9DXIptUg4TDd34kPoJHWczNPdrJBgMkTsAZqB 8EBsNLP9pHqYu3wGeS2qeheROzlm3AM= X-MC-Unique: SAwW8E9eM96TfRgiw1Xg1Q-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , Peter Maydell , Markus Armbruster Subject: [PULL 19/19] tests/unit/test-qmp-event: Replace fixture by global variables Date: Wed, 20 Dec 2023 10:41:05 +0100 Message-ID: <20231220094105.6588-20-thuth@redhat.com> In-Reply-To: <20231220094105.6588-1-thuth@redhat.com> References: <20231220094105.6588-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.066, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1703065475072100005 Content-Type: text/plain; charset="utf-8" From: Markus Armbruster The fixture buys us exactly nothing, as we need a global variable anyway, for test_qapi_event_emit(). Drop it. Signed-off-by: Markus Armbruster Reviewed-by: Thomas Huth Message-ID: <20231122072456.2518816-4-armbru@redhat.com> Signed-off-by: Thomas Huth --- tests/unit/test-qmp-event.c | 91 ++++++++++++------------------------- 1 file changed, 30 insertions(+), 61 deletions(-) diff --git a/tests/unit/test-qmp-event.c b/tests/unit/test-qmp-event.c index 5c9837e849..08e95a382b 100644 --- a/tests/unit/test-qmp-event.c +++ b/tests/unit/test-qmp-event.c @@ -24,18 +24,14 @@ #include "test-qapi-events.h" #include "test-qapi-emit-events.h" =20 -typedef struct TestEventData { - QDict *expect; -} TestEventData; - -TestEventData *test_event_data; +static QDict *expected_event; =20 void test_qapi_event_emit(test_QAPIEvent event, QDict *d) { QDict *t; int64_t s, ms; =20 - g_assert(test_event_data->expect); + g_assert(expected_event); =20 /* Verify that we have timestamp, then remove it to compare other fiel= ds */ t =3D qdict_get_qdict(d, "timestamp"); @@ -52,65 +48,38 @@ void test_qapi_event_emit(test_QAPIEvent event, QDict *= d) =20 qdict_del(d, "timestamp"); =20 - g_assert(qobject_is_equal(QOBJECT(d), QOBJECT(test_event_data->expect)= )); - qobject_unref(test_event_data->expect); - test_event_data->expect =3D NULL; -} - -static void event_prepare(TestEventData *data, - const void *unused) -{ - test_event_data =3D data; -} - -static void event_teardown(TestEventData *data, - const void *unused) -{ - test_event_data =3D NULL; -} - -static void event_test_add(const char *testpath, - void (*test_func)(TestEventData *data, - const void *user_data)) -{ - g_test_add(testpath, TestEventData, NULL, event_prepare, test_func, - event_teardown); + g_assert(qobject_is_equal(QOBJECT(d), QOBJECT(expected_event))); + qobject_unref(expected_event); + expected_event =3D NULL; } =20 - -/* Test cases */ - -static void test_event_a(TestEventData *data, - const void *unused) +static void test_event_a(void) { - data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_A' }"); + expected_event =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_A' }"); qapi_event_send_event_a(); - g_assert(!data->expect); + g_assert(!expected_event); } =20 -static void test_event_b(TestEventData *data, - const void *unused) +static void test_event_b(void) { - data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_B' }"); + expected_event =3D qdict_from_jsonf_nofail("{ 'event': 'EVENT_B' }"); qapi_event_send_event_b(); - g_assert(!data->expect); + g_assert(!expected_event); } =20 -static void test_event_c(TestEventData *data, - const void *unused) +static void test_event_c(void) { UserDefOne b =3D { .integer =3D 2, .string =3D (char *)"test1" }; =20 - data->expect =3D qdict_from_jsonf_nofail( + expected_event =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, &b, "test2"); - g_assert(!data->expect); + g_assert(!expected_event); } =20 /* Complex type */ -static void test_event_d(TestEventData *data, - const void *unused) +static void test_event_d(void) { UserDefOne struct1 =3D { .integer =3D 2, .string =3D (char *)"test1", @@ -123,43 +92,43 @@ static void test_event_d(TestEventData *data, .enum2 =3D ENUM_ONE_VALUE2, }; =20 - data->expect =3D qdict_from_jsonf_nofail( + expected_event =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", NULL, true, ENUM_ONE_VALUE3); - g_assert(!data->expect); + g_assert(!expected_event); } =20 -static void test_event_deprecated(TestEventData *data, const void *unused) +static void test_event_deprecated(void) { - data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATU= RES1' }"); + expected_event =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEA= TURES1' }"); =20 memset(&compat_policy, 0, sizeof(compat_policy)); =20 qapi_event_send_test_event_features1(); - g_assert(!data->expect); + g_assert(!expected_event); =20 compat_policy.has_deprecated_output =3D true; compat_policy.deprecated_output =3D COMPAT_POLICY_OUTPUT_HIDE; qapi_event_send_test_event_features1(); } =20 -static void test_event_deprecated_data(TestEventData *data, const void *un= used) +static void test_event_deprecated_data(void) { memset(&compat_policy, 0, sizeof(compat_policy)); =20 - data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATU= RES0'," + expected_event =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEA= TURES0'," " 'data': { 'foo': 42 } }"); qapi_event_send_test_event_features0(42); - g_assert(!data->expect); + g_assert(!expected_event); =20 =20 compat_policy.has_deprecated_output =3D true; compat_policy.deprecated_output =3D COMPAT_POLICY_OUTPUT_HIDE; - data->expect =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATU= RES0' }"); + expected_event =3D qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEA= TURES0' }"); qapi_event_send_test_event_features0(42); } =20 @@ -167,12 +136,12 @@ int main(int argc, char **argv) { g_test_init(&argc, &argv, NULL); =20 - event_test_add("/event/event_a", test_event_a); - event_test_add("/event/event_b", test_event_b); - event_test_add("/event/event_c", test_event_c); - event_test_add("/event/event_d", test_event_d); - event_test_add("/event/deprecated", test_event_deprecated); - event_test_add("/event/deprecated_data", test_event_deprecated_data); + g_test_add_func("/event/event_a", test_event_a); + g_test_add_func("/event/event_b", test_event_b); + g_test_add_func("/event/event_c", test_event_c); + g_test_add_func("/event/event_d", test_event_d); + g_test_add_func("/event/deprecated", test_event_deprecated); + g_test_add_func("/event/deprecated_data", test_event_deprecated_data); g_test_run(); =20 return 0; --=20 2.43.0