From 6060abc3b3f3c13acdbfcb4cb16878d9aa434bec Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 5 Jul 2017 13:51:29 +1000 Subject: [PATCH] test: fix some tap palm detection tests Without the timeout we're not guaranteed that the tap button event triggers Signed-off-by: Peter Hutterer --- test/test-touchpad.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/test/test-touchpad.c b/test/test-touchpad.c index 089cbc6a..913fad64 100644 --- a/test/test-touchpad.c +++ b/test/test-touchpad.c @@ -1172,18 +1172,30 @@ START_TEST(touchpad_palm_detect_tap_hardbuttons) litest_touch_down(dev, 0, 95, 5); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 5, 5); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 5, 99); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 95, 99); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_empty_queue(li); } END_TEST @@ -1203,14 +1215,23 @@ START_TEST(touchpad_palm_detect_tap_softbuttons) litest_touch_down(dev, 0, 99, 99); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 1, 99); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 10, 99); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1221,6 +1242,9 @@ START_TEST(touchpad_palm_detect_tap_softbuttons) litest_touch_down(dev, 0, 90, 99); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); @@ -1246,18 +1270,30 @@ START_TEST(touchpad_palm_detect_tap_clickfinger) litest_touch_down(dev, 0, 95, 5); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 5, 5); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 5, 99); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_empty_queue(li); litest_touch_down(dev, 0, 95, 99); litest_touch_up(dev, 0); + libinput_dispatch(li); + + litest_timeout_tap(); litest_assert_empty_queue(li); } END_TEST