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

test: update a few tests for more modern helpers

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2021-03-15 15:40:17 +10:00
parent 3427b457ce
commit cbff56e6a2
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
test/test-touchpad.c
View file

@ -58,7 +58,6 @@ START_TEST(touchpad_1fg_motion)
struct litest_device *dev = litest_current_device(); struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput; struct libinput *li = dev->libinput;
struct libinput_event *event; struct libinput_event *event;
struct libinput_event_pointer *ptrev;
litest_disable_tap(dev->libinput_device); litest_disable_tap(dev->libinput_device);
@ -74,10 +73,9 @@ START_TEST(touchpad_1fg_motion)
ck_assert_notnull(event); ck_assert_notnull(event);
while (event) { while (event) {
ck_assert_int_eq(libinput_event_get_type(event), struct libinput_event_pointer *ptrev;
LIBINPUT_EVENT_POINTER_MOTION);
ptrev = libinput_event_get_pointer_event(event); ptrev = litest_is_motion_event(event);
ck_assert_int_ge(libinput_event_pointer_get_dx(ptrev), 0); ck_assert_int_ge(libinput_event_pointer_get_dx(ptrev), 0);
ck_assert_int_eq(libinput_event_pointer_get_dy(ptrev), 0); ck_assert_int_eq(libinput_event_pointer_get_dy(ptrev), 0);
libinput_event_destroy(event); libinput_event_destroy(event);
@ -379,7 +377,6 @@ START_TEST(touchpad_2fg_scroll_slow_distance)
struct litest_device *dev = litest_current_device(); struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput; struct libinput *li = dev->libinput;
struct libinput_event *event; struct libinput_event *event;
struct libinput_event_pointer *ptrev;
double width, height; double width, height;
double y_move = 100; double y_move = 100;
@ -407,11 +404,12 @@ START_TEST(touchpad_2fg_scroll_slow_distance)
/* last event is value 0, tested elsewhere */ /* last event is value 0, tested elsewhere */
while (libinput_next_event_type(li) != LIBINPUT_EVENT_NONE) { while (libinput_next_event_type(li) != LIBINPUT_EVENT_NONE) {
struct libinput_event_pointer *ptrev;
double axisval; double axisval;
ck_assert_int_eq(libinput_event_get_type(event),
LIBINPUT_EVENT_POINTER_AXIS);
ptrev = libinput_event_get_pointer_event(event);
ptrev = litest_is_axis_event(event,
LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
0);
axisval = libinput_event_pointer_get_axis_value(ptrev, axisval = libinput_event_pointer_get_axis_value(ptrev,
LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
ck_assert(axisval > 0.0); ck_assert(axisval > 0.0);
@ -435,7 +433,6 @@ START_TEST(touchpad_2fg_scroll_source)
struct litest_device *dev = litest_current_device(); struct litest_device *dev = litest_current_device();
struct libinput *li = dev->libinput; struct libinput *li = dev->libinput;
struct libinput_event *event; struct libinput_event *event;
struct libinput_event_pointer *ptrev;
if (!litest_has_2fg_scroll(dev)) if (!litest_has_2fg_scroll(dev))
return; return;
@ -447,11 +444,9 @@ START_TEST(touchpad_2fg_scroll_source)
litest_wait_for_event_of_type(li, LIBINPUT_EVENT_POINTER_AXIS, -1); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_POINTER_AXIS, -1);
while ((event = libinput_get_event(li))) { while ((event = libinput_get_event(li))) {
ck_assert_int_eq(libinput_event_get_type(event), litest_is_axis_event(event,
LIBINPUT_EVENT_POINTER_AXIS); LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
ptrev = libinput_event_get_pointer_event(event); LIBINPUT_POINTER_AXIS_SOURCE_FINGER);
ck_assert_int_eq(libinput_event_pointer_get_axis_source(ptrev),
LIBINPUT_POINTER_AXIS_SOURCE_FINGER);
libinput_event_destroy(event); libinput_event_destroy(event);
} }
} }
@ -3399,7 +3394,6 @@ START_TEST(touchpad_trackpoint_buttons_2fg_scroll)
struct litest_device *trackpoint; struct litest_device *trackpoint;
struct libinput *li = touchpad->libinput; struct libinput *li = touchpad->libinput;
struct libinput_event *e; struct libinput_event *e;
struct libinput_event_pointer *pev;
double val; double val;
trackpoint = litest_add_device(li, trackpoint = litest_add_device(li,
@ -3416,9 +3410,11 @@ START_TEST(touchpad_trackpoint_buttons_2fg_scroll)
/* Make sure we get scroll events but _not_ the scroll release */ /* Make sure we get scroll events but _not_ the scroll release */
while ((e = libinput_get_event(li))) { while ((e = libinput_get_event(li))) {
ck_assert_int_eq(libinput_event_get_type(e), struct libinput_event_pointer *pev;
LIBINPUT_EVENT_POINTER_AXIS);
pev = libinput_event_get_pointer_event(e); pev = litest_is_axis_event(e,
LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
0);
val = libinput_event_pointer_get_axis_value(pev, val = libinput_event_pointer_get_axis_value(pev,
LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
ck_assert(val != 0.0); ck_assert(val != 0.0);
@ -3436,9 +3432,11 @@ START_TEST(touchpad_trackpoint_buttons_2fg_scroll)
litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_AXIS); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_AXIS);
while ((e = libinput_get_event(li))) { while ((e = libinput_get_event(li))) {
ck_assert_int_eq(libinput_event_get_type(e), struct libinput_event_pointer *pev;
LIBINPUT_EVENT_POINTER_AXIS);
pev = libinput_event_get_pointer_event(e); pev = litest_is_axis_event(e,
LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL,
0);
val = libinput_event_pointer_get_axis_value(pev, val = libinput_event_pointer_get_axis_value(pev,
LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL);
ck_assert(val != 0.0); ck_assert(val != 0.0);