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

test: modernise the tablet tool serial tests a bit

Browse source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2015-12-15 12:53:00 +10:00
parent 50f4caf1b8
commit 67b92adee7
1 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
test/tablet.c
View file

@ -1613,6 +1613,7 @@ START_TEST(tools_with_serials)
struct litest_device *dev[2];
struct libinput_tablet_tool *tool[2] = {0};
struct libinput_event *event;
struct libinput_event_tablet_tool *tev;
int i;
for (i = 0; i < 2; i++) {
@ -1622,6 +1623,8 @@ START_TEST(tools_with_serials)
NULL,
NULL,
NULL);
litest_drain_events(li);
/* WARNING: this test fails if UI_GET_SYSNAME isn't
* available or isn't used by libevdev (1.3, commit 2ff45c73).
* Put a sleep(1) here and that usually fixes it.
@ -1633,17 +1636,10 @@ START_TEST(tools_with_serials)
litest_pop_event_frame(dev[i]);
libinput_dispatch(li);
while ((event = libinput_get_event(li))) {
if (libinput_event_get_type(event) ==
LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY) {
struct libinput_event_tablet_tool *t =
libinput_event_get_tablet_tool_event(event);
tool[i] = libinput_event_tablet_tool_get_tool(t);
}
libinput_event_destroy(event);
}
event = libinput_get_event(li);
tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY);
tool[i] = libinput_event_tablet_tool_get_tool(tev);
libinput_event_destroy(event);
}
/* We should get the same object for both devices */
@ -1663,6 +1659,7 @@ START_TEST(tools_without_serials)
struct litest_device *dev[2];
struct libinput_tablet_tool *tool[2] = {0};
struct libinput_event *event;
struct libinput_event_tablet_tool *tev;
int i;
for (i = 0; i < 2; i++) {
@ -1673,6 +1670,8 @@ START_TEST(tools_without_serials)
NULL,
NULL);
litest_drain_events(li);
/* WARNING: this test fails if UI_GET_SYSNAME isn't
* available or isn't used by libevdev (1.3, commit 2ff45c73).
* Put a sleep(1) here and that usually fixes it.
@ -1681,17 +1680,10 @@ START_TEST(tools_without_serials)
litest_tablet_proximity_in(dev[i], 10, 10, NULL);
libinput_dispatch(li);
while ((event = libinput_get_event(li))) {
if (libinput_event_get_type(event) ==
LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY) {
struct libinput_event_tablet_tool *t =
libinput_event_get_tablet_tool_event(event);
tool[i] = libinput_event_tablet_tool_get_tool(t);
}
libinput_event_destroy(event);
}
event = libinput_get_event(li);
tev = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY);
tool[i] = libinput_event_tablet_tool_get_tool(tev);
libinput_event_destroy(event);
}
/* We should get different tool objects for each device */