fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-20 18:30:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test: parametrize a test instead of in-test looping

Browse source 
Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1260>
This commit is contained in:
Peter Hutterer 2025-07-03 13:50:17 +10:00 • committed by Marge Bot
parent 9a9466b6a9
commit a635176632
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
test/test-pointer.c
View file

@ -765,17 +765,13 @@ test_hi_res_wheel_event(struct litest_device *dev, int which, int v120_amount)
START_TEST(pointer_scroll_wheel_hires) START_TEST(pointer_scroll_wheel_hires)
{ {
struct litest_device *dev = litest_current_device(); struct litest_device *dev = litest_current_device();
unsigned int axis = litest_test_param_get_i32(test_env->params, "axis");
if (!libevdev_has_event_code(dev->evdev, EV_REL, REL_WHEEL_HI_RES) && if (!libevdev_has_event_code(dev->evdev, EV_REL, axis))
!libevdev_has_event_code(dev->evdev, EV_REL, REL_HWHEEL_HI_RES))
return LITEST_NOT_APPLICABLE; return LITEST_NOT_APPLICABLE;
litest_drain_events(dev->libinput); litest_drain_events(dev->libinput);
for (int axis = REL_WHEEL_HI_RES; axis <= REL_HWHEEL_HI_RES; axis++) {
if (!libevdev_has_event_code(dev->evdev, EV_REL, axis))
continue;
test_hi_res_wheel_event(dev, axis, -120); test_hi_res_wheel_event(dev, axis, -120);
test_hi_res_wheel_event(dev, axis, 120); test_hi_res_wheel_event(dev, axis, 120);
@ -787,7 +783,6 @@ START_TEST(pointer_scroll_wheel_hires)
test_hi_res_wheel_event(dev, axis, -40); test_hi_res_wheel_event(dev, axis, -40);
test_hi_res_wheel_event(dev, axis, 180); test_hi_res_wheel_event(dev, axis, 180);
} }
}
END_TEST END_TEST
START_TEST(pointer_scroll_wheel_hires_send_only_lores) START_TEST(pointer_scroll_wheel_hires_send_only_lores)
@ -3643,7 +3638,10 @@ TEST_COLLECTION(pointer)
litest_add_for_device(pointer_button_has_no_button, LITEST_KEYBOARD); litest_add_for_device(pointer_button_has_no_button, LITEST_KEYBOARD);
litest_add(pointer_recover_from_lost_button_count, LITEST_BUTTON, LITEST_CLICKPAD); litest_add(pointer_recover_from_lost_button_count, LITEST_BUTTON, LITEST_CLICKPAD);
litest_add(pointer_scroll_wheel, LITEST_WHEEL, LITEST_TABLET); litest_add(pointer_scroll_wheel, LITEST_WHEEL, LITEST_TABLET);
litest_add(pointer_scroll_wheel_hires, LITEST_WHEEL, LITEST_TABLET); litest_with_parameters(params, "axis", 'I', 2, litest_named_i32(REL_WHEEL_HI_RES, "vertical"),
litest_named_i32(REL_HWHEEL_HI_RES, "horizontal")) {
litest_add_parametrized(pointer_scroll_wheel_hires, LITEST_WHEEL, LITEST_TABLET, params);
}
litest_with_parameters(params, "axis", 'I', 2, litest_named_i32(LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, "vertical"), litest_with_parameters(params, "axis", 'I', 2, litest_named_i32(LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, "vertical"),
litest_named_i32(LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, "horizontal")) { litest_named_i32(LIBINPUT_POINTER_AXIS_SCROLL_HORIZONTAL, "horizontal")) {
litest_add_parametrized(pointer_scroll_wheel_hires_send_only_lores, LITEST_WHEEL, LITEST_TABLET, params); litest_add_parametrized(pointer_scroll_wheel_hires_send_only_lores, LITEST_WHEEL, LITEST_TABLET, params);