fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-03-21 23:50:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: fix the tablet motion test

Browse source 
This test had a loop around the proximity events, so in theory we could've
sent two proximity-in events and still get a positive test.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2019-02-12 11:36:20 +10:00
parent 1f90378421
commit 626b5bd00f
1 changed files with 14 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
test/test-tablet.c
View file

@ -1484,6 +1484,8 @@ START_TEST(motion)
{ ABS_PRESSURE, 0 },
{ -1, -1 }
};
bool x_changed, y_changed;
double reported_x, reported_y;
litest_drain_events(li);
@ -1491,34 +1493,22 @@ START_TEST(motion)
libinput_dispatch(li);
event = libinput_get_event(li);
tablet_event = litest_is_tablet_event(event,
LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY);
x_changed = libinput_event_tablet_tool_x_has_changed(tablet_event);
y_changed = libinput_event_tablet_tool_y_has_changed(tablet_event);
ck_assert(x_changed);
ck_assert(y_changed);
do {
bool x_changed, y_changed;
double reported_x, reported_y;
reported_x = libinput_event_tablet_tool_get_x(tablet_event);
reported_y = libinput_event_tablet_tool_get_y(tablet_event);
tablet_event = libinput_event_get_tablet_tool_event(event);
ck_assert_int_eq(libinput_event_get_type(event),
LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY);
litest_assert_double_lt(reported_x, reported_y);
x_changed = libinput_event_tablet_tool_x_has_changed(
tablet_event);
y_changed = libinput_event_tablet_tool_y_has_changed(
tablet_event);
last_reported_x = reported_x;
last_reported_y = reported_y;
ck_assert(x_changed);
ck_assert(y_changed);
reported_x = libinput_event_tablet_tool_get_x(tablet_event);
reported_y = libinput_event_tablet_tool_get_y(tablet_event);
litest_assert_double_lt(reported_x, reported_y);
last_reported_x = reported_x;
last_reported_y = reported_y;
libinput_event_destroy(event);
event = libinput_get_event(li);
} while (event != NULL);
libinput_event_destroy(event);
for (test_x = 10, test_y = 90;
test_x <= 100;