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

test: add litest_is_touch_event() helper function

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-04 13:51:39 +10:00
parent 77eb2d5445
commit cbfbede748
3 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
test/litest.c
View file

@ -1531,6 +1531,33 @@ litest_assert_button_event(struct libinput *li, unsigned int button,
libinput_event_destroy(event); libinput_event_destroy(event);
} }
struct libinput_event_touch *
litest_is_touch_event(struct libinput_event *event,
enum libinput_event_type type)
{
struct libinput_event_touch *touch;
ck_assert(event != NULL);
if (type == 0)
type = libinput_event_get_type(event);
switch (type) {
case LIBINPUT_EVENT_TOUCH_DOWN:
case LIBINPUT_EVENT_TOUCH_UP:
case LIBINPUT_EVENT_TOUCH_MOTION:
case LIBINPUT_EVENT_TOUCH_FRAME:
ck_assert_int_eq(libinput_event_get_type(event), type);
break;
default:
ck_abort_msg("%s: invalid touch type %d\n", __func__, type);
}
touch = libinput_event_get_touch_event(event);
return touch;
}
void void
litest_assert_scroll(struct libinput *li, litest_assert_scroll(struct libinput *li,
enum libinput_pointer_axis axis, enum libinput_pointer_axis axis,

3
test/litest.h
View file

@ -206,6 +206,9 @@ struct libinput_event_pointer * litest_is_axis_event(
enum libinput_pointer_axis_source source); enum libinput_pointer_axis_source source);
struct libinput_event_pointer * litest_is_motion_event( struct libinput_event_pointer * litest_is_motion_event(
struct libinput_event *event); struct libinput_event *event);
struct libinput_event_touch * litest_is_touch_event(
struct libinput_event *event,
enum libinput_event_type type);
void litest_assert_button_event(struct libinput *li, void litest_assert_button_event(struct libinput *li,
unsigned int button, unsigned int button,
enum libinput_button_state state); enum libinput_button_state state);

14
test/touch.c
View file

@ -244,9 +244,7 @@ START_TEST(touch_calibration_scale)
litest_wait_for_event(li); litest_wait_for_event(li);
ev = libinput_get_event(li); ev = libinput_get_event(li);
ck_assert_int_eq(libinput_event_get_type(ev), tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN);
LIBINPUT_EVENT_TOUCH_DOWN);
tev = libinput_event_get_touch_event(ev);
x = libinput_event_touch_get_x_transformed(tev, width); x = libinput_event_touch_get_x_transformed(tev, width);
y = libinput_event_touch_get_y_transformed(tev, height); y = libinput_event_touch_get_y_transformed(tev, height);
@ -315,9 +313,7 @@ START_TEST(touch_calibration_rotation)
litest_touch_up(dev, 0); litest_touch_up(dev, 0);
litest_wait_for_event(li); litest_wait_for_event(li);
ev = libinput_get_event(li); ev = libinput_get_event(li);
ck_assert_int_eq(libinput_event_get_type(ev), tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN);
LIBINPUT_EVENT_TOUCH_DOWN);
tev = libinput_event_get_touch_event(ev);
x = libinput_event_touch_get_x_transformed(tev, width); x = libinput_event_touch_get_x_transformed(tev, width);
y = libinput_event_touch_get_y_transformed(tev, height); y = libinput_event_touch_get_y_transformed(tev, height);
@ -381,9 +377,7 @@ START_TEST(touch_calibration_translation)
litest_wait_for_event(li); litest_wait_for_event(li);
ev = libinput_get_event(li); ev = libinput_get_event(li);
ck_assert_int_eq(libinput_event_get_type(ev), tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN);
LIBINPUT_EVENT_TOUCH_DOWN);
tev = libinput_event_get_touch_event(ev);
x = libinput_event_touch_get_x_transformed(tev, width); x = libinput_event_touch_get_x_transformed(tev, width);
y = libinput_event_touch_get_y_transformed(tev, height); y = libinput_event_touch_get_y_transformed(tev, height);
@ -499,7 +493,7 @@ START_TEST(touch_protocol_a_touch)
litest_wait_for_event_of_type(li, LIBINPUT_EVENT_TOUCH_DOWN, -1); litest_wait_for_event_of_type(li, LIBINPUT_EVENT_TOUCH_DOWN, -1);
ev = libinput_get_event(li); ev = libinput_get_event(li);
tev = libinput_event_get_touch_event(ev); tev = litest_is_touch_event(ev, LIBINPUT_EVENT_TOUCH_DOWN);
oldx = libinput_event_touch_get_x(tev); oldx = libinput_event_touch_get_x(tev);
oldy = libinput_event_touch_get_y(tev); oldy = libinput_event_touch_get_y(tev);