From 88d1a526706c208c8ec435382e225bd84c5a218a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 16 Apr 2015 10:42:16 +1000 Subject: [PATCH] test: add litest_is_button_event Makes it easier from a caller to check for common things without all the other boilerplate code. Signed-off-by: Peter Hutterer Reviewed-by: Hans de Goede --- test/litest.c | 26 +++++++++++++++++++------- test/litest.h | 4 ++++ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/test/litest.c b/test/litest.c index 12851071..2481f690 100644 --- a/test/litest.c +++ b/test/litest.c @@ -1321,16 +1321,13 @@ litest_create_uinput_device(const char *name, struct input_id *id, ...) return uinput; } -void -litest_assert_button_event(struct libinput *li, unsigned int button, - enum libinput_button_state state) +struct libinput_event_pointer* +litest_is_button_event(struct libinput_event *event, + int button, + enum libinput_button_state state) { - struct libinput_event *event; struct libinput_event_pointer *ptrev; - litest_wait_for_event(li); - event = libinput_get_event(li); - ck_assert(event != NULL); ck_assert_int_eq(libinput_event_get_type(event), LIBINPUT_EVENT_POINTER_BUTTON); @@ -1339,6 +1336,21 @@ litest_assert_button_event(struct libinput *li, unsigned int button, button); ck_assert_int_eq(libinput_event_pointer_get_button_state(ptrev), state); + + return ptrev; +} + +void +litest_assert_button_event(struct libinput *li, unsigned int button, + enum libinput_button_state state) +{ + struct libinput_event *event; + + litest_wait_for_event(li); + event = libinput_get_event(li); + + litest_is_button_event(event, button, state); + libinput_event_destroy(event); } diff --git a/test/litest.h b/test/litest.h index 8cb11214..ca679836 100644 --- a/test/litest.h +++ b/test/litest.h @@ -172,6 +172,10 @@ void litest_wait_for_event(struct libinput *li); void litest_wait_for_event_of_type(struct libinput *li, ...); void litest_drain_events(struct libinput *li); void litest_assert_empty_queue(struct libinput *li); +struct libinput_event_pointer * litest_is_button_event( + struct libinput_event *event, + int button, + enum libinput_button_state state); void litest_assert_button_event(struct libinput *li, unsigned int button, enum libinput_button_state state);