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

test: force the motion test to be axis events only

Browse source 
Ignore anything before the TABLET_AXIS event but make sure we get at least one
axis event after the proximity event.

After that, in the second loop change to use tablet_motion, it's confusing to
use tablet_proximity_in here (though it technically works since we never go
out of prox).

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2015-02-10 11:07:30 +10:00
parent cd17ee44ae
commit f571ccc829
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
test/tablet.c
View file

@ -167,32 +167,36 @@ START_TEST(motion)
litest_tablet_proximity_in(dev, 5, 100, axes); litest_tablet_proximity_in(dev, 5, 100, axes);
libinput_dispatch(li); libinput_dispatch(li);
litest_wait_for_event_of_type(li,
LIBINPUT_EVENT_TABLET_AXIS,
-1);
while ((event = libinput_get_event(li))) { while ((event = libinput_get_event(li))) {
bool x_changed, y_changed;
double reported_x, reported_y;
tablet_event = libinput_event_get_tablet_event(event); tablet_event = libinput_event_get_tablet_event(event);
type = libinput_event_get_type(event); ck_assert_int_eq(libinput_event_get_type(event),
LIBINPUT_EVENT_TABLET_AXIS);
if (type == LIBINPUT_EVENT_TABLET_AXIS) {
bool x_changed, y_changed;
double reported_x, reported_y;
x_changed = libinput_event_tablet_axis_has_changed( x_changed = libinput_event_tablet_axis_has_changed(
tablet_event, LIBINPUT_TABLET_AXIS_X); tablet_event, LIBINPUT_TABLET_AXIS_X);
y_changed = libinput_event_tablet_axis_has_changed( y_changed = libinput_event_tablet_axis_has_changed(
tablet_event, LIBINPUT_TABLET_AXIS_Y); tablet_event, LIBINPUT_TABLET_AXIS_Y);
ck_assert(x_changed); ck_assert(x_changed);
ck_assert(y_changed); ck_assert(y_changed);
reported_x = libinput_event_tablet_get_axis_value( reported_x = libinput_event_tablet_get_axis_value(
tablet_event, LIBINPUT_TABLET_AXIS_X); tablet_event, LIBINPUT_TABLET_AXIS_X);
reported_y = libinput_event_tablet_get_axis_value( reported_y = libinput_event_tablet_get_axis_value(
tablet_event, LIBINPUT_TABLET_AXIS_Y); tablet_event, LIBINPUT_TABLET_AXIS_Y);
litest_assert_double_lt(reported_x, reported_y); litest_assert_double_lt(reported_x, reported_y);
last_reported_x = reported_x; last_reported_x = reported_x;
last_reported_y = reported_y; last_reported_y = reported_y;
}
libinput_event_destroy(event); libinput_event_destroy(event);
} }
@ -203,7 +207,7 @@ START_TEST(motion)
bool x_changed, y_changed; bool x_changed, y_changed;
double reported_x, reported_y; double reported_x, reported_y;
litest_tablet_proximity_in(dev, test_x, test_y, axes); litest_tablet_motion(dev, test_x, test_y, axes);
libinput_dispatch(li); libinput_dispatch(li);
while ((event = libinput_get_event(li))) { while ((event = libinput_get_event(li))) {