From fffae6fb27a5537beb64d0ec7cb99f96c177dea4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 17 Jul 2017 14:26:34 +1000 Subject: [PATCH] test: when testing for a touch sequence, assert it's the same slot's sequence Signed-off-by: Peter Hutterer --- test/litest.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/test/litest.c b/test/litest.c index 6f9d309..5fa4bfb 100644 --- a/test/litest.c +++ b/test/litest.c @@ -3367,9 +3367,12 @@ void litest_assert_touch_sequence(struct libinput *li) { struct libinput_event *event; + struct libinput_event_touch *tev; + int slot; event = libinput_get_event(li); - litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_DOWN); + tev = litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_DOWN); + slot = libinput_event_touch_get_slot(tev); libinput_event_destroy(event); event = libinput_get_event(li); @@ -3378,7 +3381,8 @@ litest_assert_touch_sequence(struct libinput *li) event = libinput_get_event(li); do { - litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_MOTION); + tev = litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_MOTION); + litest_assert_int_eq(slot, libinput_event_touch_get_slot(tev)); libinput_event_destroy(event); event = libinput_get_event(li); @@ -3389,7 +3393,8 @@ litest_assert_touch_sequence(struct libinput *li) litest_assert_notnull(event); } while (libinput_event_get_type(event) != LIBINPUT_EVENT_TOUCH_UP); - litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_UP); + tev = litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_UP); + litest_assert_int_eq(slot, libinput_event_touch_get_slot(tev)); libinput_event_destroy(event); event = libinput_get_event(li); litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_FRAME); -- 2.7.4