fdo-mirrors/libei
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libei.git synced 2025-12-22 03:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: use the event fetching helpers

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-09-23 11:17:36 +10:00
parent 4c80b3df03
commit b21bb04c4c
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
test/test-ei.c
View file

@ -129,9 +129,8 @@ MUNIT_TEST(test_ei_disconnect_after_add_after_received)
with_server(peck) { with_server(peck) {
eis_dispatch(eis); eis_dispatch(eis);
_cleanup_eis_event_ struct eis_event *e = eis_get_event(eis); _cleanup_eis_event_ struct eis_event *e =
munit_assert_ptr_not_null(e); peck_eis_next_event(eis, EIS_EVENT_CLIENT_CONNECT);
munit_assert_int(eis_event_get_type(e), ==, EIS_EVENT_CLIENT_CONNECT);
client = eis_client_ref(eis_event_get_client(e)); client = eis_client_ref(eis_event_get_client(e));
eis_client_connect(client); eis_client_connect(client);
} }
@ -173,9 +172,8 @@ MUNIT_TEST(test_ei_disconnect_after_remove_before_received)
with_server(peck) { with_server(peck) {
eis_dispatch(eis); eis_dispatch(eis);
_cleanup_eis_event_ struct eis_event *e = eis_get_event(eis); _cleanup_eis_event_ struct eis_event *e =
munit_assert_ptr_not_null(e); peck_eis_next_event(eis, EIS_EVENT_CLIENT_CONNECT);
munit_assert_int(eis_event_get_type(e), ==, EIS_EVENT_CLIENT_CONNECT);
client = eis_client_ref(eis_event_get_client(e)); client = eis_client_ref(eis_event_get_client(e));
eis_client_connect(client); eis_client_connect(client);
} }
@ -228,9 +226,8 @@ MUNIT_TEST(test_ei_disconnect_after_remove_after_received)
with_server(peck) { with_server(peck) {
eis_dispatch(eis); eis_dispatch(eis);
_cleanup_eis_event_ struct eis_event *e = eis_get_event(eis); _cleanup_eis_event_ struct eis_event *e =
munit_assert_ptr_not_null(e); peck_eis_next_event(eis, EIS_EVENT_CLIENT_CONNECT);
munit_assert_int(eis_event_get_type(e), ==, EIS_EVENT_CLIENT_CONNECT);
client = eis_client_ref(eis_event_get_client(e)); client = eis_client_ref(eis_event_get_client(e));
eis_client_connect(client); eis_client_connect(client);
} }
@ -345,9 +342,8 @@ MUNIT_TEST(test_ei_device_add)
peck_dispatch_until_stable(peck); peck_dispatch_until_stable(peck);
with_client(peck) { with_client(peck) {
_cleanup_ei_event_ struct ei_event *event = ei_get_event(ei); _cleanup_ei_event_ struct ei_event *event =
munit_assert_ptr_not_null(event); peck_ei_next_event(ei, EI_EVENT_DEVICE_ADDED);
munit_assert_int(ei_event_get_type(event), ==, EI_EVENT_DEVICE_ADDED);
struct ei_device *added = ei_event_get_device(event); struct ei_device *added = ei_event_get_device(event);
munit_assert_ptr_equal(device, added); munit_assert_ptr_equal(device, added);
@ -382,9 +378,8 @@ MUNIT_TEST(test_ei_device_add_drop_caps)
with_client(peck) { with_client(peck) {
ei_dispatch(ei); ei_dispatch(ei);
_cleanup_ei_event_ struct ei_event *event = ei_get_event(ei); _cleanup_ei_event_ struct ei_event *event =
munit_assert_ptr_not_null(event); peck_ei_next_event(ei, EI_EVENT_DEVICE_ADDED);
munit_assert_int(ei_event_get_type(event), ==, EI_EVENT_DEVICE_ADDED);
struct ei_device *d = ei_event_get_device(event); struct ei_device *d = ei_event_get_device(event);
munit_assert_ptr_equal(d, device); munit_assert_ptr_equal(d, device);
@ -420,9 +415,8 @@ MUNIT_TEST(test_ei_device_add_zero_caps)
with_client(peck) { with_client(peck) {
ei_dispatch(ei); ei_dispatch(ei);
_cleanup_ei_event_ struct ei_event *event = ei_get_event(ei); _cleanup_ei_event_ struct ei_event *event =
munit_assert_ptr_not_null(event); peck_ei_next_event(ei, EI_EVENT_DEVICE_REMOVED);
munit_assert_int(ei_event_get_type(event), ==, EI_EVENT_DEVICE_REMOVED);
} }
return MUNIT_OK; return MUNIT_OK;