fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-28 00:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests: optionally hold in gesture test functions

Browse source 
Add an extra parameter to the common gesture test functions to allow to hold
before performing the gesture.

This parameter will be used by the hold tests allowing to share the code.

Signed-off-by: José Expósito <jose.exposito89@gmail.com>
This commit is contained in:
José Expósito 2021-05-27 19:20:23 +02:00 • committed by Peter Hutterer
parent c99b24e5a3
commit a18d9d3de4
3 changed files with 114 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/litest.c
View file

@ -4143,6 +4143,12 @@ litest_timeout_gesture_scroll(void)
msleep(180);
}
void
litest_timeout_gesture_hold(void)
{
msleep(300);
}
void
litest_timeout_trackpoint(void)
{

3
test/litest.h
View file

@ -893,6 +893,9 @@ litest_timeout_gesture(void);
void
litest_timeout_gesture_scroll(void);
void
litest_timeout_gesture_hold(void);
void
litest_timeout_trackpoint(void);

119
test/test-gestures.c
View file

@ -34,8 +34,13 @@ enum cardinal {
N, NE, E, SE, S, SW, W, NW, NCARDINALS
};
enum hold_gesture_behaviour {
HOLD_GESTURE_IGNORE,
HOLD_GESTURE_REQUIRE,
};
static void
test_gesture_swipe_3fg(int cardinal)
test_gesture_swipe_3fg(int cardinal, enum hold_gesture_behaviour hold)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
@ -66,10 +71,23 @@ test_gesture_swipe_3fg(int cardinal)
litest_touch_down(dev, 1, 50, 40);
litest_touch_down(dev, 2, 60, 40);
libinput_dispatch(li);
if (hold == HOLD_GESTURE_REQUIRE)
litest_timeout_gesture_hold();
litest_touch_move_three_touches(dev, 40, 40, 50, 40, 60, 40, dir_x,
dir_y, 10);
libinput_dispatch(li);
if (hold == HOLD_GESTURE_REQUIRE) {
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_BEGIN,
3);
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_END,
3);
}
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN,
@ -133,7 +151,7 @@ test_gesture_swipe_3fg(int cardinal)
}
static void
test_gesture_swipe_4fg(int cardinal)
test_gesture_swipe_4fg(int cardinal, enum hold_gesture_behaviour hold)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
@ -167,6 +185,9 @@ test_gesture_swipe_4fg(int cardinal)
litest_touch_down(dev, 3, 70, 40);
libinput_dispatch(li);
if (hold == HOLD_GESTURE_REQUIRE)
litest_timeout_gesture_hold();
for (i = 0; i < 8; i++) {
litest_push_event_frame(dev);
@ -195,6 +216,15 @@ test_gesture_swipe_4fg(int cardinal)
libinput_dispatch(li);
if (hold == HOLD_GESTURE_REQUIRE) {
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_BEGIN,
4);
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_END,
4);
}
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_SWIPE_BEGIN,
@ -259,7 +289,7 @@ test_gesture_swipe_4fg(int cardinal)
}
static void
test_gesture_pinch_2fg(int cardinal)
test_gesture_pinch_2fg(int cardinal, enum hold_gesture_behaviour hold)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
@ -306,6 +336,9 @@ test_gesture_pinch_2fg(int cardinal)
litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y);
libinput_dispatch(li);
if (hold == HOLD_GESTURE_REQUIRE)
litest_timeout_gesture_hold();
for (i = 0; i < 8; i++) {
litest_push_event_frame(dev);
if (dir_x > 0.0)
@ -328,6 +361,15 @@ test_gesture_pinch_2fg(int cardinal)
libinput_dispatch(li);
}
if (hold == HOLD_GESTURE_REQUIRE) {
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_BEGIN,
2);
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_END,
2);
}
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_BEGIN,
@ -370,7 +412,7 @@ test_gesture_pinch_2fg(int cardinal)
}
static void
test_gesture_pinch_3fg(int cardinal)
test_gesture_pinch_3fg(int cardinal, enum hold_gesture_behaviour hold)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
@ -405,6 +447,9 @@ test_gesture_pinch_3fg(int cardinal)
litest_touch_down(dev, 2, 51 - dir_x, 51 - dir_y);
libinput_dispatch(li);
if (hold == HOLD_GESTURE_REQUIRE)
litest_timeout_gesture_hold();
for (i = 0; i < 8; i++) {
litest_push_event_frame(dev);
if (dir_x > 0.0)
@ -431,6 +476,14 @@ test_gesture_pinch_3fg(int cardinal)
libinput_dispatch(li);
}
if (hold == HOLD_GESTURE_REQUIRE) {
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_BEGIN,
3);
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_END,
3);
}
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_BEGIN,
@ -474,7 +527,7 @@ test_gesture_pinch_3fg(int cardinal)
}
static void
test_gesture_pinch_4fg(int cardinal)
test_gesture_pinch_4fg(int cardinal, enum hold_gesture_behaviour hold)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
@ -510,6 +563,9 @@ test_gesture_pinch_4fg(int cardinal)
litest_touch_down(dev, 3, 52 - dir_x, 52 - dir_y);
libinput_dispatch(li);
if (hold == HOLD_GESTURE_REQUIRE)
litest_timeout_gesture_hold();
for (i = 0; i < 7; i++) {
litest_push_event_frame(dev);
if (dir_x > 0.0)
@ -540,6 +596,15 @@ test_gesture_pinch_4fg(int cardinal)
libinput_dispatch(li);
}
if (hold == HOLD_GESTURE_REQUIRE) {
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_BEGIN,
4);
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_END,
4);
}
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_BEGIN,
@ -584,7 +649,7 @@ test_gesture_pinch_4fg(int cardinal)
}
static void
test_gesture_spread(int cardinal)
test_gesture_spread(int cardinal, enum hold_gesture_behaviour hold)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
@ -631,6 +696,9 @@ test_gesture_spread(int cardinal)
litest_touch_down(dev, 1, 50 - dir_x, 50 - dir_y);
libinput_dispatch(li);
if (hold == HOLD_GESTURE_REQUIRE)
litest_timeout_gesture_hold();
for (i = 0; i < 15; i++) {
litest_push_event_frame(dev);
if (dir_x > 0.0)
@ -653,6 +721,15 @@ test_gesture_spread(int cardinal)
libinput_dispatch(li);
}
if (hold == HOLD_GESTURE_REQUIRE) {
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_BEGIN,
2);
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_END,
2);
}
event = libinput_get_event(li);
gevent = litest_is_gesture_event(event,
LIBINPUT_EVENT_GESTURE_PINCH_BEGIN,
@ -693,7 +770,7 @@ test_gesture_spread(int cardinal)
}
static void
test_gesture_3fg_buttonarea_scroll(void)
test_gesture_3fg_buttonarea_scroll(enum hold_gesture_behaviour hold)
{
struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput;
@ -710,11 +787,25 @@ test_gesture_3fg_buttonarea_scroll(void)
/* third finger in btnarea */
litest_touch_down(dev, 2, 50, 99);
libinput_dispatch(li);
if (hold == HOLD_GESTURE_REQUIRE)
litest_timeout_gesture_hold();
litest_touch_move_two_touches(dev, 40, 20, 30, 20, 0, 40, 10);
litest_touch_up(dev, 0);
litest_touch_up(dev, 1);
libinput_dispatch(li);
if (hold == HOLD_GESTURE_REQUIRE) {
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_BEGIN,
2);
litest_assert_gesture_event(li,
LIBINPUT_EVENT_GESTURE_HOLD_END,
2);
}
litest_assert_scroll(li, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, 4);
}
@ -745,7 +836,7 @@ END_TEST
START_TEST(gestures_swipe_3fg)
{
int cardinal = _i; /* ranged test */
test_gesture_swipe_3fg(cardinal);
test_gesture_swipe_3fg(cardinal, HOLD_GESTURE_IGNORE);
}
END_TEST
@ -905,7 +996,7 @@ END_TEST
START_TEST(gestures_swipe_4fg)
{
int cardinal = _i; /* ranged test */
test_gesture_swipe_4fg(cardinal);
test_gesture_swipe_4fg(cardinal, HOLD_GESTURE_IGNORE);
}
END_TEST
@ -1015,28 +1106,28 @@ END_TEST
START_TEST(gestures_pinch)
{
int cardinal = _i; /* ranged test */
test_gesture_pinch_2fg(cardinal);
test_gesture_pinch_2fg(cardinal, HOLD_GESTURE_IGNORE);
}
END_TEST
START_TEST(gestures_pinch_3fg)
{
int cardinal = _i; /* ranged test */
test_gesture_pinch_3fg(cardinal);
test_gesture_pinch_3fg(cardinal, HOLD_GESTURE_IGNORE);
}
END_TEST
START_TEST(gestures_pinch_4fg)
{
int cardinal = _i; /* ranged test */
test_gesture_pinch_4fg(cardinal);
test_gesture_pinch_4fg(cardinal, HOLD_GESTURE_IGNORE);
}
END_TEST
START_TEST(gestures_spread)
{
int cardinal = _i; /* ranged test */
test_gesture_spread(cardinal);
test_gesture_spread(cardinal, HOLD_GESTURE_IGNORE);
}
END_TEST
@ -1074,7 +1165,7 @@ END_TEST
START_TEST(gestures_3fg_buttonarea_scroll)
{
test_gesture_3fg_buttonarea_scroll();
test_gesture_3fg_buttonarea_scroll(HOLD_GESTURE_IGNORE);
}
END_TEST