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

test: don't use litest_is_pad_button_event for a few tests

Browse source 
That function requires us to know which button we're testing for. Because of
the upcoming libwacom changes, we don't know which button we're about to get,
especially on the bamboos. Use the standard libinput functions to get to the
libinput event instead, we don't care about the button numbers here anyway.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2017-10-23 13:33:13 +10:00
parent 6936a15558
commit 8f688be749
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
test/test-pad.c
View file

@ -84,9 +84,9 @@ START_TEST(pad_time)
}
ev = libinput_get_event(li);
pev = litest_is_pad_button_event(ev,
0,
LIBINPUT_BUTTON_STATE_PRESSED);
ck_assert_int_eq(libinput_event_get_type(ev),
LIBINPUT_EVENT_TABLET_PAD_BUTTON);
pev = libinput_event_get_tablet_pad_event(ev);
time = libinput_event_tablet_pad_get_time(pev);
time_usec = libinput_event_tablet_pad_get_time_usec(pev);
@ -103,9 +103,9 @@ START_TEST(pad_time)
libinput_dispatch(li);
ev = libinput_get_event(li);
pev = litest_is_pad_button_event(ev,
0,
LIBINPUT_BUTTON_STATE_PRESSED);
ck_assert_int_eq(libinput_event_get_type(ev),
LIBINPUT_EVENT_TABLET_PAD_BUTTON);
pev = libinput_event_get_tablet_pad_event(ev);
oldtime = time;
time = libinput_event_tablet_pad_get_time(pev);
@ -220,9 +220,9 @@ START_TEST(pad_button_mode_groups)
}
ev = libinput_get_event(li);
pev = litest_is_pad_button_event(ev,
expected_number,
LIBINPUT_BUTTON_STATE_PRESSED);
ck_assert_int_eq(libinput_event_get_type(ev),
LIBINPUT_EVENT_TABLET_PAD_BUTTON);
pev = libinput_event_get_tablet_pad_event(ev);
/* litest virtual devices don't have modes */
mode = libinput_event_tablet_pad_get_mode(pev);
@ -234,9 +234,10 @@ START_TEST(pad_button_mode_groups)
libinput_event_destroy(ev);
ev = libinput_get_event(li);
pev = litest_is_pad_button_event(ev,
expected_number,
LIBINPUT_BUTTON_STATE_RELEASED);
ck_assert_int_eq(libinput_event_get_type(ev),
LIBINPUT_EVENT_TABLET_PAD_BUTTON);
pev = libinput_event_get_tablet_pad_event(ev);
mode = libinput_event_tablet_pad_get_mode(pev);
ck_assert_int_eq(mode, 0);
group = libinput_event_tablet_pad_get_mode_group(pev);