test: use litest_wait_for_event instead of a NONE event check

Technically we're not really waiting here since we expect the
event to already be there but for these tests the distinction doesn't
matter.

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1050>

diff --git a/test/test-touch.c b/test/test-touch.c
index 3973f8d702658504ba47de88f22d8b89eb4d2eb4..42da25921cdf03243e4c57a7f2c51fe16f3c0932 100644 (file)
--- a/test/test-touch.c
+++ b/test/test-touch.c
@@ -687,8 +687,7 @@ START_TEST(touch_protocol_a_init)
        struct libinput *li = dev->libinput;
        struct libinput_device *device = dev->libinput_device;
 
-       ck_assert_int_ne(libinput_next_event_type(li),
-                        LIBINPUT_EVENT_NONE);
+       litest_wait_for_event(li);
 
        ck_assert(libinput_device_has_capability(device,
                                                 LIBINPUT_DEVICE_CAP_TOUCH));

diff --git a/test/test-touchpad.c b/test/test-touchpad.c
index 3b25391514a01f90de3b706248df56d5fbba4edd..b2a4ae4185bb9cf02163f393e36d36c5f1264918 100644 (file)
--- a/test/test-touchpad.c
+++ b/test/test-touchpad.c
@@ -2859,8 +2859,7 @@ START_TEST(touchpad_semi_mt_hover_down)
 
        litest_dispatch(li);
 
-       ck_assert_int_ne(libinput_next_event_type(li),
-                        LIBINPUT_EVENT_NONE);
+       litest_wait_for_event(li);
        while ((event = libinput_get_event(li)) != NULL) {
                ck_assert_int_eq(libinput_event_get_type(event),
                                 LIBINPUT_EVENT_POINTER_MOTION);