Rather than a random msleep() with a comment, use a helper function that describes what we're waiting for. Also makes changing the timeouts easier in the future.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> --- test/litest.c | 12 ++++++++++++ test/litest.h | 3 +++ test/touchpad.c | 42 +++++++++++++++++++++--------------------- 3 files changed, 36 insertions(+), 21 deletions(-) diff --git a/test/litest.c b/test/litest.c index cf7e692..2b356be 100644 --- a/test/litest.c +++ b/test/litest.c @@ -1084,3 +1084,15 @@ litest_assert_button_event(struct libinput *li, unsigned int button, state); libinput_event_destroy(event); } + +void +litest_timeout_tap(void) +{ + msleep(200); +} + +void +litest_timeout_softbuttons(void) +{ + msleep(300); +} diff --git a/test/litest.h b/test/litest.h index dd1386c..40d4df9 100644 --- a/test/litest.h +++ b/test/litest.h @@ -156,6 +156,9 @@ struct libevdev_uinput * litest_create_uinput_abs_device(const char *name, const struct input_absinfo *abs, ...); +void litest_timeout_tap(void); +void litest_timeout_softbuttons(void); + #ifndef ck_assert_notnull #define ck_assert_notnull(ptr) ck_assert_ptr_ne(ptr, NULL) #endif diff --git a/test/touchpad.c b/test/touchpad.c index a6e2dd7..ea02f47 100644 --- a/test/touchpad.c +++ b/test/touchpad.c @@ -107,7 +107,7 @@ START_TEST(touchpad_1fg_tap) litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_PRESSED); - msleep(300); /* tap-n-drag timeout */ + litest_timeout_tap(); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); @@ -162,7 +162,7 @@ START_TEST(touchpad_1fg_tap_n_drag) ck_assert_int_eq(libinput_next_event_type(li), LIBINPUT_EVENT_NONE); - msleep(300); /* tap-n-drag timeout */ + litest_timeout_tap(); litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); @@ -219,7 +219,7 @@ START_TEST(touchpad_2fg_tap) litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); - msleep(300); /* tap-n-drag timeout */ + litest_timeout_tap(); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_RELEASED); @@ -246,7 +246,7 @@ START_TEST(touchpad_2fg_tap_inverted) litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); - msleep(300); /* tap-n-drag timeout */ + litest_timeout_tap(); litest_assert_button_event(li, BTN_RIGHT, LIBINPUT_BUTTON_STATE_RELEASED); @@ -274,7 +274,7 @@ START_TEST(touchpad_1fg_tap_click) litest_event(dev, EV_KEY, BTN_LEFT, 0); litest_event(dev, EV_SYN, SYN_REPORT, 0); libinput_dispatch(li); - msleep(200); + litest_timeout_tap(); libinput_dispatch(li); @@ -423,7 +423,7 @@ START_TEST(touchpad_no_2fg_tap_after_timeout) */ litest_touch_down(dev, 0, 50, 50); libinput_dispatch(dev->libinput); - msleep(300); + litest_timeout_tap(); libinput_dispatch(dev->libinput); litest_drain_events(dev->libinput); @@ -577,7 +577,7 @@ START_TEST(touchpad_3fg_tap) litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_PRESSED); - msleep(300); /* tap-n-drag timeout */ + litest_timeout_tap(); litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); @@ -613,7 +613,7 @@ START_TEST(touchpad_3fg_tap_btntool) litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_PRESSED); - msleep(300); /* tap-n-drag timeout */ + litest_timeout_tap(); litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); @@ -648,7 +648,7 @@ START_TEST(touchpad_3fg_tap_btntool_inverted) litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_PRESSED); - msleep(300); /* tap-n-drag timeout */ + litest_timeout_tap(); litest_assert_button_event(li, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); @@ -750,7 +750,7 @@ START_TEST(clickpad_1fg_tap_click) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_touch_up(dev, 0); libinput_dispatch(li); - msleep(200); + litest_timeout_tap(); libinput_dispatch(li); @@ -999,7 +999,7 @@ START_TEST(clickpad_softbutton_left_1st_fg_move) /* move out of the area, then wait for softbutton timer */ litest_touch_move_to(dev, 0, 20, 90, 90, 20, 10); libinput_dispatch(li); - msleep(400); + litest_timeout_softbuttons(); libinput_dispatch(li); litest_drain_events(li); @@ -1302,13 +1302,13 @@ START_TEST(clickpad_topsoftbuttons_move_out_ignore) litest_touch_down(dev, 0, 50, 5); libinput_dispatch(li); - msleep(200); + litest_timeout_softbuttons(); libinput_dispatch(li); litest_assert_empty_queue(li); litest_touch_move_to(dev, 0, 50, 5, 80, 90, 20); libinput_dispatch(li); - msleep(400); + litest_timeout_softbuttons(); libinput_dispatch(li); litest_event(dev, EV_KEY, BTN_LEFT, 1); @@ -1323,7 +1323,7 @@ START_TEST(clickpad_topsoftbuttons_move_out_ignore) END_TEST static void -test_2fg_scroll(struct litest_device *dev, double dx, double dy, int sleep) +test_2fg_scroll(struct litest_device *dev, double dx, double dy, int want_sleep) { struct libinput *li = dev->libinput; @@ -1334,9 +1334,9 @@ test_2fg_scroll(struct litest_device *dev, double dx, double dy, int sleep) litest_touch_move_to(dev, 1, 53, 50, 53 + dx, 50 + dy, 10); /* Avoid a small scroll being seen as a tap */ - if (sleep) { + if (want_sleep) { libinput_dispatch(li); - msleep(sleep); + litest_timeout_tap(); libinput_dispatch(li); } @@ -1394,17 +1394,17 @@ START_TEST(touchpad_2fg_scroll) litest_drain_events(li); - test_2fg_scroll(dev, 0.1, 40, 0); + test_2fg_scroll(dev, 0.1, 40, false); check_2fg_scroll(dev, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 10); - test_2fg_scroll(dev, 0.1, -40, 0); + test_2fg_scroll(dev, 0.1, -40, false); check_2fg_scroll(dev, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, -10); - test_2fg_scroll(dev, 40, 0.1, 0); + test_2fg_scroll(dev, 40, 0.1, false); check_2fg_scroll(dev, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, 10); - test_2fg_scroll(dev, -40, 0.1, 0); + test_2fg_scroll(dev, -40, 0.1, false); check_2fg_scroll(dev, LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, -10); /* 2fg scroll smaller than the threshold should not generate events */ - test_2fg_scroll(dev, 0.1, 0.1, 200); + test_2fg_scroll(dev, 0.1, 0.1, true); litest_assert_empty_queue(li); } END_TEST -- 1.9.3 _______________________________________________ wayland-devel mailing list wayland-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/wayland-devel