fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-09 04:48:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: switch the touchpad multitap tests over to ranged tests

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Peter Hutterer 2015-05-06 08:33:06 +10:00
parent ca10fc2be7
commit 893fdf9b83
1 changed files with 197 additions and 205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

402
test/touchpad.c
View file

@ -189,46 +189,44 @@ START_TEST(touchpad_1fg_multitap)
struct libinput_event_pointer *ptrev; struct libinput_event_pointer *ptrev;
uint32_t oldtime = 0, uint32_t oldtime = 0,
curtime; curtime;
int i, ntaps; int range = _i, /* looped test */
ntaps;
libinput_device_config_tap_set_enabled(dev->libinput_device, libinput_device_config_tap_set_enabled(dev->libinput_device,
LIBINPUT_CONFIG_TAP_ENABLED); LIBINPUT_CONFIG_TAP_ENABLED);
litest_drain_events(li); litest_drain_events(li);
for (i = 3; i < 8; i++) { for (ntaps = 0; ntaps <= range; ntaps++) {
litest_touch_down(dev, 0, 50, 50);
for (ntaps = 0; ntaps <= i; ntaps++) { litest_touch_up(dev, 0);
litest_touch_down(dev, 0, 50, 50);
litest_touch_up(dev, 0);
libinput_dispatch(li);
msleep(10);
}
litest_timeout_tap();
libinput_dispatch(li); libinput_dispatch(li);
msleep(10);
for (ntaps = 0; ntaps <= i; ntaps++) {
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime);
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_ge(curtime, oldtime);
oldtime = curtime;
}
litest_timeout_tap();
litest_assert_empty_queue(li);
} }
litest_timeout_tap();
libinput_dispatch(li);
for (ntaps = 0; ntaps <= range; ntaps++) {
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime);
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_ge(curtime, oldtime);
oldtime = curtime;
}
litest_timeout_tap();
litest_assert_empty_queue(li);
} }
END_TEST END_TEST
@ -240,46 +238,27 @@ START_TEST(touchpad_1fg_multitap_n_drag_move)
struct libinput_event_pointer *ptrev; struct libinput_event_pointer *ptrev;
uint32_t oldtime = 0, uint32_t oldtime = 0,
curtime; curtime;
int i, ntaps; int range = _i, /* looped test */
ntaps;
libinput_device_config_tap_set_enabled(dev->libinput_device, libinput_device_config_tap_set_enabled(dev->libinput_device,
LIBINPUT_CONFIG_TAP_ENABLED); LIBINPUT_CONFIG_TAP_ENABLED);
litest_drain_events(li); litest_drain_events(li);
for (i = 3; i < 8; i++) { for (ntaps = 0; ntaps <= range; ntaps++) {
for (ntaps = 0; ntaps <= i; ntaps++) {
litest_touch_down(dev, 0, 50, 50);
litest_touch_up(dev, 0);
libinput_dispatch(li);
msleep(10);
}
libinput_dispatch(li);
litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 0, 50, 50);
litest_touch_move_to(dev, 0, 50, 50, 70, 50, 10, 4); litest_touch_up(dev, 0);
libinput_dispatch(li); libinput_dispatch(li);
msleep(10);
}
for (ntaps = 0; ntaps <= i; ntaps++) { libinput_dispatch(li);
event = libinput_get_event(li); litest_touch_down(dev, 0, 50, 50);
ptrev = litest_is_button_event(event, litest_touch_move_to(dev, 0, 50, 50, 70, 50, 10, 4);
BTN_LEFT, libinput_dispatch(li);
LIBINPUT_BUTTON_STATE_PRESSED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime);
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_ge(curtime, oldtime);
oldtime = curtime;
}
for (ntaps = 0; ntaps <= range; ntaps++) {
event = libinput_get_event(li); event = libinput_get_event(li);
ptrev = litest_is_button_event(event, ptrev = litest_is_button_event(event,
BTN_LEFT, BTN_LEFT,
@ -288,16 +267,33 @@ START_TEST(touchpad_1fg_multitap_n_drag_move)
libinput_event_destroy(event); libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime); ck_assert_int_gt(curtime, oldtime);
litest_assert_only_typed_events(li, event = libinput_get_event(li);
LIBINPUT_EVENT_POINTER_MOTION); ptrev = litest_is_button_event(event,
BTN_LEFT,
litest_touch_up(dev, 0); LIBINPUT_BUTTON_STATE_RELEASED);
litest_assert_button_event(li, curtime = libinput_event_pointer_get_time(ptrev);
BTN_LEFT, libinput_event_destroy(event);
LIBINPUT_BUTTON_STATE_RELEASED); ck_assert_int_ge(curtime, oldtime);
oldtime = curtime;
litest_assert_empty_queue(li);
} }
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime);
litest_assert_only_typed_events(li,
LIBINPUT_EVENT_POINTER_MOTION);
litest_touch_up(dev, 0);
litest_assert_button_event(li,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
litest_assert_empty_queue(li);
} }
END_TEST END_TEST
@ -309,47 +305,28 @@ START_TEST(touchpad_1fg_multitap_n_drag_2fg)
struct libinput_event_pointer *ptrev; struct libinput_event_pointer *ptrev;
uint32_t oldtime = 0, uint32_t oldtime = 0,
curtime; curtime;
int i, ntaps; int range = _i,
ntaps;
libinput_device_config_tap_set_enabled(dev->libinput_device, libinput_device_config_tap_set_enabled(dev->libinput_device,
LIBINPUT_CONFIG_TAP_ENABLED); LIBINPUT_CONFIG_TAP_ENABLED);
litest_drain_events(li); litest_drain_events(li);
for (i = 3; i < 8; i++) { for (ntaps = 0; ntaps <= range; ntaps++) {
for (ntaps = 0; ntaps <= i; ntaps++) {
litest_touch_down(dev, 0, 50, 50);
litest_touch_up(dev, 0);
libinput_dispatch(li);
msleep(10);
}
libinput_dispatch(li);
litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 0, 50, 50);
msleep(10); litest_touch_up(dev, 0);
litest_touch_down(dev, 1, 70, 50);
libinput_dispatch(li); libinput_dispatch(li);
msleep(10);
}
for (ntaps = 0; ntaps <= i; ntaps++) { libinput_dispatch(li);
event = libinput_get_event(li); litest_touch_down(dev, 0, 50, 50);
ptrev = litest_is_button_event(event, msleep(10);
BTN_LEFT, litest_touch_down(dev, 1, 70, 50);
LIBINPUT_BUTTON_STATE_PRESSED); libinput_dispatch(li);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime);
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_ge(curtime, oldtime);
oldtime = curtime;
}
for (ntaps = 0; ntaps <= range; ntaps++) {
event = libinput_get_event(li); event = libinput_get_event(li);
ptrev = litest_is_button_event(event, ptrev = litest_is_button_event(event,
BTN_LEFT, BTN_LEFT,
@ -358,20 +335,37 @@ START_TEST(touchpad_1fg_multitap_n_drag_2fg)
libinput_event_destroy(event); libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime); ck_assert_int_gt(curtime, oldtime);
litest_touch_move_to(dev, 1, 70, 50, 90, 50, 10, 4); event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
litest_assert_only_typed_events(li, BTN_LEFT,
LIBINPUT_EVENT_POINTER_MOTION); LIBINPUT_BUTTON_STATE_RELEASED);
curtime = libinput_event_pointer_get_time(ptrev);
litest_touch_up(dev, 1); libinput_event_destroy(event);
litest_touch_up(dev, 0); ck_assert_int_ge(curtime, oldtime);
litest_timeout_tap(); oldtime = curtime;
litest_assert_button_event(li,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
litest_assert_empty_queue(li);
} }
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime);
litest_touch_move_to(dev, 1, 70, 50, 90, 50, 10, 4);
litest_assert_only_typed_events(li,
LIBINPUT_EVENT_POINTER_MOTION);
litest_touch_up(dev, 1);
litest_touch_up(dev, 0);
litest_timeout_tap();
litest_assert_button_event(li,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
litest_assert_empty_queue(li);
} }
END_TEST END_TEST
@ -383,58 +377,56 @@ START_TEST(touchpad_1fg_multitap_n_drag_click)
struct libinput_event_pointer *ptrev; struct libinput_event_pointer *ptrev;
uint32_t oldtime = 0, uint32_t oldtime = 0,
curtime; curtime;
int i, ntaps; int range = _i, /* looped test */
ntaps;
libinput_device_config_tap_set_enabled(dev->libinput_device, libinput_device_config_tap_set_enabled(dev->libinput_device,
LIBINPUT_CONFIG_TAP_ENABLED); LIBINPUT_CONFIG_TAP_ENABLED);
litest_drain_events(li); litest_drain_events(li);
for (i = 3; i < 5; i++) { for (ntaps = 0; ntaps <= range; ntaps++) {
for (ntaps = 0; ntaps <= i; ntaps++) {
litest_touch_down(dev, 0, 50, 50);
litest_touch_up(dev, 0);
libinput_dispatch(li);
msleep(10);
}
litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 0, 50, 50);
libinput_dispatch(li);
litest_button_click(dev, BTN_LEFT, true);
litest_button_click(dev, BTN_LEFT, false);
libinput_dispatch(li);
for (ntaps = 0; ntaps <= i; ntaps++) {
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime);
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_ge(curtime, oldtime);
oldtime = curtime;
}
litest_assert_button_event(li,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED);
litest_assert_button_event(li,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
litest_touch_up(dev, 0); litest_touch_up(dev, 0);
litest_timeout_tap(); libinput_dispatch(li);
msleep(10);
litest_assert_empty_queue(li);
} }
litest_touch_down(dev, 0, 50, 50);
libinput_dispatch(li);
litest_button_click(dev, BTN_LEFT, true);
litest_button_click(dev, BTN_LEFT, false);
libinput_dispatch(li);
for (ntaps = 0; ntaps <= range; ntaps++) {
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime);
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_ge(curtime, oldtime);
oldtime = curtime;
}
litest_assert_button_event(li,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED);
litest_assert_button_event(li,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
litest_touch_up(dev, 0);
litest_timeout_tap();
litest_assert_empty_queue(li);
} }
END_TEST END_TEST
@ -446,48 +438,29 @@ START_TEST(touchpad_1fg_multitap_n_drag_timeout)
struct libinput_event_pointer *ptrev; struct libinput_event_pointer *ptrev;
uint32_t oldtime = 0, uint32_t oldtime = 0,
curtime; curtime;
int i, ntaps; int range = _i, /* looped test */
ntaps;
libinput_device_config_tap_set_enabled(dev->libinput_device, libinput_device_config_tap_set_enabled(dev->libinput_device,
LIBINPUT_CONFIG_TAP_ENABLED); LIBINPUT_CONFIG_TAP_ENABLED);
litest_drain_events(li); litest_drain_events(li);
for (i = 3; i < 5; i++) { for (ntaps = 0; ntaps <= range; ntaps++) {
for (ntaps = 0; ntaps <= i; ntaps++) {
litest_touch_down(dev, 0, 50, 50);
litest_touch_up(dev, 0);
libinput_dispatch(li);
msleep(10);
}
libinput_dispatch(li);
litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 0, 50, 50);
litest_touch_up(dev, 0);
libinput_dispatch(li); libinput_dispatch(li);
msleep(10);
}
litest_timeout_tap(); libinput_dispatch(li);
libinput_dispatch(li); litest_touch_down(dev, 0, 50, 50);
libinput_dispatch(li);
for (ntaps = 0; ntaps <= i; ntaps++) { litest_timeout_tap();
event = libinput_get_event(li); libinput_dispatch(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime);
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_ge(curtime, oldtime);
oldtime = curtime;
}
for (ntaps = 0; ntaps <= range; ntaps++) {
event = libinput_get_event(li); event = libinput_get_event(li);
ptrev = litest_is_button_event(event, ptrev = litest_is_button_event(event,
BTN_LEFT, BTN_LEFT,
@ -496,18 +469,35 @@ START_TEST(touchpad_1fg_multitap_n_drag_timeout)
libinput_event_destroy(event); libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime); ck_assert_int_gt(curtime, oldtime);
litest_touch_move_to(dev, 0, 50, 50, 70, 50, 10, 4); event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
litest_assert_only_typed_events(li, BTN_LEFT,
LIBINPUT_EVENT_POINTER_MOTION); LIBINPUT_BUTTON_STATE_RELEASED);
curtime = libinput_event_pointer_get_time(ptrev);
litest_touch_up(dev, 0); libinput_event_destroy(event);
litest_assert_button_event(li, ck_assert_int_ge(curtime, oldtime);
BTN_LEFT, oldtime = curtime;
LIBINPUT_BUTTON_STATE_RELEASED);
litest_assert_empty_queue(li);
} }
event = libinput_get_event(li);
ptrev = litest_is_button_event(event,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_PRESSED);
curtime = libinput_event_pointer_get_time(ptrev);
libinput_event_destroy(event);
ck_assert_int_gt(curtime, oldtime);
litest_touch_move_to(dev, 0, 50, 50, 70, 50, 10, 4);
litest_assert_only_typed_events(li,
LIBINPUT_EVENT_POINTER_MOTION);
litest_touch_up(dev, 0);
litest_assert_button_event(li,
BTN_LEFT,
LIBINPUT_BUTTON_STATE_RELEASED);
litest_assert_empty_queue(li);
} }
END_TEST END_TEST
@ -4284,16 +4274,18 @@ END_TEST
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
struct range multitap_range = {3, 8};
litest_add("touchpad:motion", touchpad_1fg_motion, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:motion", touchpad_1fg_motion, LITEST_TOUCHPAD, LITEST_ANY);
litest_add("touchpad:motion", touchpad_2fg_no_motion, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); litest_add("touchpad:motion", touchpad_2fg_no_motion, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);
litest_add("touchpad:tap", touchpad_1fg_tap, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:tap", touchpad_1fg_tap, LITEST_TOUCHPAD, LITEST_ANY);
litest_add("touchpad:tap", touchpad_1fg_doubletap, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:tap", touchpad_1fg_doubletap, LITEST_TOUCHPAD, LITEST_ANY);
litest_add("touchpad:tap", touchpad_1fg_multitap, LITEST_TOUCHPAD, LITEST_ANY); litest_add_ranged("touchpad:tap", touchpad_1fg_multitap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range);
litest_add("touchpad:tap", touchpad_1fg_multitap_n_drag_timeout, LITEST_TOUCHPAD, LITEST_ANY); litest_add_ranged("touchpad:tap", touchpad_1fg_multitap_n_drag_timeout, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range);
litest_add("touchpad:tap", touchpad_1fg_multitap_n_drag_move, LITEST_TOUCHPAD, LITEST_ANY); litest_add_ranged("touchpad:tap", touchpad_1fg_multitap_n_drag_move, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range);
litest_add("touchpad:tap", touchpad_1fg_multitap_n_drag_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); litest_add_ranged("touchpad:tap", touchpad_1fg_multitap_n_drag_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &multitap_range);
litest_add("touchpad:tap", touchpad_1fg_multitap_n_drag_click, LITEST_CLICKPAD, LITEST_ANY); litest_add_ranged("touchpad:tap", touchpad_1fg_multitap_n_drag_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range);
litest_add("touchpad:tap", touchpad_1fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:tap", touchpad_1fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY);
litest_add("touchpad:tap", touchpad_1fg_tap_n_drag_timeout, LITEST_TOUCHPAD, LITEST_ANY); litest_add("touchpad:tap", touchpad_1fg_tap_n_drag_timeout, LITEST_TOUCHPAD, LITEST_ANY);
litest_add("touchpad:tap", touchpad_2fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); litest_add("touchpad:tap", touchpad_2fg_tap_n_drag, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH);