fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-05-09 07:08:01 +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

62
test/touchpad.c
View file

@ -189,16 +189,15 @@ 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++) {
for (ntaps = 0; ntaps <= i; ntaps++) {
litest_touch_down(dev, 0, 50, 50); litest_touch_down(dev, 0, 50, 50);
litest_touch_up(dev, 0); litest_touch_up(dev, 0);
libinput_dispatch(li); libinput_dispatch(li);
@ -208,7 +207,7 @@ START_TEST(touchpad_1fg_multitap)
litest_timeout_tap(); litest_timeout_tap();
libinput_dispatch(li); libinput_dispatch(li);
for (ntaps = 0; ntaps <= i; ntaps++) { 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,
@ -229,7 +228,6 @@ START_TEST(touchpad_1fg_multitap)
litest_timeout_tap(); litest_timeout_tap();
litest_assert_empty_queue(li); litest_assert_empty_queue(li);
} }
}
END_TEST END_TEST
START_TEST(touchpad_1fg_multitap_n_drag_move) START_TEST(touchpad_1fg_multitap_n_drag_move)
@ -240,16 +238,15 @@ 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_down(dev, 0, 50, 50);
litest_touch_up(dev, 0); litest_touch_up(dev, 0);
libinput_dispatch(li); libinput_dispatch(li);
@ -261,7 +258,7 @@ START_TEST(touchpad_1fg_multitap_n_drag_move)
litest_touch_move_to(dev, 0, 50, 50, 70, 50, 10, 4); litest_touch_move_to(dev, 0, 50, 50, 70, 50, 10, 4);
libinput_dispatch(li); libinput_dispatch(li);
for (ntaps = 0; ntaps <= i; ntaps++) { 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,
@ -298,7 +295,6 @@ START_TEST(touchpad_1fg_multitap_n_drag_move)
litest_assert_empty_queue(li); litest_assert_empty_queue(li);
} }
}
END_TEST END_TEST
START_TEST(touchpad_1fg_multitap_n_drag_2fg) START_TEST(touchpad_1fg_multitap_n_drag_2fg)
@ -309,16 +305,15 @@ 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_down(dev, 0, 50, 50);
litest_touch_up(dev, 0); litest_touch_up(dev, 0);
libinput_dispatch(li); libinput_dispatch(li);
@ -331,7 +326,7 @@ START_TEST(touchpad_1fg_multitap_n_drag_2fg)
litest_touch_down(dev, 1, 70, 50); litest_touch_down(dev, 1, 70, 50);
libinput_dispatch(li); libinput_dispatch(li);
for (ntaps = 0; ntaps <= i; ntaps++) { 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,
@ -372,7 +367,6 @@ START_TEST(touchpad_1fg_multitap_n_drag_2fg)
litest_assert_empty_queue(li); litest_assert_empty_queue(li);
} }
}
END_TEST END_TEST
START_TEST(touchpad_1fg_multitap_n_drag_click) START_TEST(touchpad_1fg_multitap_n_drag_click)
@ -383,16 +377,15 @@ 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_down(dev, 0, 50, 50);
litest_touch_up(dev, 0); litest_touch_up(dev, 0);
libinput_dispatch(li); libinput_dispatch(li);
@ -405,7 +398,7 @@ START_TEST(touchpad_1fg_multitap_n_drag_click)
litest_button_click(dev, BTN_LEFT, false); litest_button_click(dev, BTN_LEFT, false);
libinput_dispatch(li); libinput_dispatch(li);
for (ntaps = 0; ntaps <= i; ntaps++) { 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,
@ -435,7 +428,6 @@ START_TEST(touchpad_1fg_multitap_n_drag_click)
litest_assert_empty_queue(li); litest_assert_empty_queue(li);
} }
}
END_TEST END_TEST
START_TEST(touchpad_1fg_multitap_n_drag_timeout) START_TEST(touchpad_1fg_multitap_n_drag_timeout)
@ -446,16 +438,15 @@ 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_down(dev, 0, 50, 50);
litest_touch_up(dev, 0); litest_touch_up(dev, 0);
libinput_dispatch(li); libinput_dispatch(li);
@ -469,7 +460,7 @@ START_TEST(touchpad_1fg_multitap_n_drag_timeout)
litest_timeout_tap(); litest_timeout_tap();
libinput_dispatch(li); libinput_dispatch(li);
for (ntaps = 0; ntaps <= i; ntaps++) { 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,
@ -508,7 +499,6 @@ START_TEST(touchpad_1fg_multitap_n_drag_timeout)
litest_assert_empty_queue(li); litest_assert_empty_queue(li);
} }
}
END_TEST END_TEST
START_TEST(touchpad_1fg_tap_n_drag) START_TEST(touchpad_1fg_tap_n_drag)
@ -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);