riscv
/
qemu
mirror of https://gitea.goldendeliverer.com/riscv/qemu.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

tests/unit/test-qmp-event: Replace fixture by global variables 

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 <armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20231122072456.2518816-4-armbru@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
coverity
Markus Armbruster 2 years ago
committed by Thomas Huth
parent
5712b7e4fb
commit
17b2ecc331
1 changed files with 30 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 91
      tests/unit/test-qmp-event.c

91
tests/unit/test-qmp-event.c
View File

@ -24,18 +24,14 @@
#include "test-qapi-events.h"
#include "test-qapi-emit-events.h"
typedef struct TestEventData {
QDict *expect;
} TestEventData;
TestEventData *test_event_data;
static QDict *expected_event;
void test_qapi_event_emit(test_QAPIEvent event, QDict *d)
{
QDict *t;
int64_t s, ms;
g_assert(test_event_data->expect);
g_assert(expected_event);
/* Verify that we have timestamp, then remove it to compare other fields */
t = qdict_get_qdict(d, "timestamp");
@ -52,65 +48,38 @@ void test_qapi_event_emit(test_QAPIEvent event, QDict *d)
qdict_del(d, "timestamp");
g_assert(qobject_is_equal(QOBJECT(d), QOBJECT(test_event_data->expect)));
qobject_unref(test_event_data->expect);
test_event_data->expect = NULL;
}
static void event_prepare(TestEventData *data,
const void *unused)
{
test_event_data = data;
}
static void event_teardown(TestEventData *data,
const void *unused)
{
test_event_data = 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 = NULL;
}
/* Test cases */
static void test_event_a(TestEventData *data,
const void *unused)
static void test_event_a(void)
{
data->expect = qdict_from_jsonf_nofail("{ 'event': 'EVENT_A' }");
expected_event = qdict_from_jsonf_nofail("{ 'event': 'EVENT_A' }");
qapi_event_send_event_a();
g_assert(!data->expect);
g_assert(!expected_event);
}
static void test_event_b(TestEventData *data,
const void *unused)
static void test_event_b(void)
{
data->expect = qdict_from_jsonf_nofail("{ 'event': 'EVENT_B' }");
expected_event = qdict_from_jsonf_nofail("{ 'event': 'EVENT_B' }");
qapi_event_send_event_b();
g_assert(!data->expect);
g_assert(!expected_event);
}
static void test_event_c(TestEventData *data,
const void *unused)
static void test_event_c(void)
{
UserDefOne b = { .integer = 2, .string = (char *)"test1" };
data->expect = qdict_from_jsonf_nofail(
expected_event = 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);
}
/* Complex type */
static void test_event_d(TestEventData *data,
const void *unused)
static void test_event_d(void)
{
UserDefOne struct1 = {
.integer = 2, .string = (char *)"test1",
@ -123,43 +92,43 @@ static void test_event_d(TestEventData *data,
.enum2 = ENUM_ONE_VALUE2,
};
data->expect = qdict_from_jsonf_nofail(
expected_event = 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);
}
static void test_event_deprecated(TestEventData *data, const void *unused)
static void test_event_deprecated(void)
{
data->expect = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES1' }");
expected_event = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES1' }");
memset(&compat_policy, 0, sizeof(compat_policy));
qapi_event_send_test_event_features1();
g_assert(!data->expect);
g_assert(!expected_event);
compat_policy.has_deprecated_output = true;
compat_policy.deprecated_output = COMPAT_POLICY_OUTPUT_HIDE;
qapi_event_send_test_event_features1();
}
static void test_event_deprecated_data(TestEventData *data, const void *unused)
static void test_event_deprecated_data(void)
{
memset(&compat_policy, 0, sizeof(compat_policy));
data->expect = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES0',"
expected_event = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES0',"
" 'data': { 'foo': 42 } }");
qapi_event_send_test_event_features0(42);
g_assert(!data->expect);
g_assert(!expected_event);
compat_policy.has_deprecated_output = true;
compat_policy.deprecated_output = COMPAT_POLICY_OUTPUT_HIDE;
data->expect = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES0' }");
expected_event = qdict_from_jsonf_nofail("{ 'event': 'TEST_EVENT_FEATURES0' }");
qapi_event_send_test_event_features0(42);
}
@ -167,12 +136,12 @@ int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
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();
return 0;

Write Preview
Loading…
Cancel
Save