diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fc9da650..51e10490 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -535,7 +535,7 @@ vm-tap: extends: - .fedora:33@test-suite-vm variables: - SUITE_NAMES: 'tap' + SUITE_NAMES: 'touchpad-tap' vm-tap-no-libwacom: extends: @@ -543,6 +543,18 @@ vm-tap-no-libwacom: variables: MESON_ARGS: '-Dlibwacom=false' +vm-touchpad-buttons: + extends: + - .fedora:33@test-suite-vm + variables: + SUITE_NAMES: 'touchpad-buttons' + +vm-touchpad-buttons-no-libwacom: + extends: + - vm-touchpad-buttons + variables: + MESON_ARGS: '-Dlibwacom=false' + vm-tablet: extends: - .fedora:33@test-suite-vm @@ -567,15 +579,39 @@ vm-gestures-device-no-libwacom: variables: MESON_ARGS: '-Dlibwacom=false' -vm-others: +vm-backends: extends: - .fedora:33@test-suite-vm variables: - SUITE_NAMES: 'context config misc events totem udev lid log timer tablet-mode quirks trackball pad path keyboard switch touch trackpoint' + SUITE_NAMES: 'path udev' -vm-others-no-libwacom: +vm-backends-no-libwacom: extends: - - vm-others + - vm-backends + variables: + MESON_ARGS: '-Dlibwacom=false' + +vm-misc: + extends: + - .fedora:33@test-suite-vm + variables: + SUITE_NAMES: 'log misc quirks' + +vm-misc-no-libwacom: + extends: + - vm-misc + variables: + MESON_ARGS: '-Dlibwacom=false' + +vm-other devices: + extends: + - .fedora:33@test-suite-vm + variables: + SUITE_NAMES: 'keyboard pad switch trackball trackpoint totem touch' + +vm-other devices-no-libwacom: + extends: + - vm-other devices variables: MESON_ARGS: '-Dlibwacom=false' @@ -606,6 +642,13 @@ vm-valgrind-tap: variables: MESON_TEST_ARGS: '--setup=valgrind' +vm-valgrind-touchpad-buttons: + stage: valgrind + extends: + - vm-touchpad-buttons + variables: + MESON_TEST_ARGS: '--setup=valgrind' + vm-valgrind-tablet: stage: valgrind extends: @@ -620,10 +663,24 @@ vm-valgrind-gestures-device: variables: MESON_TEST_ARGS: '--setup=valgrind' -vm-valgrind-others: +vm-valgrind-backends: stage: valgrind extends: - - vm-others + - vm-backends + variables: + MESON_TEST_ARGS: '--setup=valgrind' + +vm-valgrind-misc: + stage: valgrind + extends: + - vm-misc + variables: + MESON_TEST_ARGS: '--setup=valgrind' + +vm-valgrind-other devices: + stage: valgrind + extends: + - vm-other devices variables: MESON_TEST_ARGS: '--setup=valgrind' diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml index bf1132ba..c3569cbb 100644 --- a/.gitlab-ci/config.yml +++ b/.gitlab-ci/config.yml @@ -148,7 +148,10 @@ test_suites: - touchpad - name: tap suites: - - tap + - touchpad-tap + - name: touchpad-buttons + suites: + - touchpad-buttons - name: tablet suites: - tablet @@ -156,26 +159,24 @@ test_suites: suites: - gestures - device - - name: others + - name: backends suites: - - context - - config - - misc - - events - - totem - - udev - - lid - - log - - timer - - tablet-mode - - quirks - - trackball - - pad - path + - udev + - name: misc + suites: + - log + - misc + - quirks + - name: other devices + suites: - keyboard + - pad - switch - - touch + - trackball - trackpoint + - totem + - touch - name: pointer suites: - pointer diff --git a/meson.build b/meson.build index ad87594b..e34af6ec 100644 --- a/meson.build +++ b/meson.build @@ -922,8 +922,8 @@ if get_option('tests') test_utils, suite : ['all']) - libinput_test_runner_sources = litest_sources + [ - 'src/libinput-util.h', + # When adding new files to this list, update the CI + tests_sources = [ 'test/test-udev.c', 'test/test-path.c', 'test/test-pointer.c', @@ -944,6 +944,9 @@ if get_option('tests') 'test/test-switch.c', 'test/test-quirks.c', ] + libinput_test_runner_sources = litest_sources + tests_sources + [ + 'src/libinput-util.h', + ] libinput_test_runner = executable('libinput-test-suite', libinput_test_runner_sources, include_directories : [includes_src, includes_include], @@ -956,19 +959,13 @@ if get_option('tests') install_dir : dir_man1, ) - # Update this list and the one in litest.c when new group names are - # required - groups = [ - 'config', 'context', 'device', 'events', 'gestures', 'keyboard', 'lid', - 'log', 'misc', 'pad', 'path', 'pointer', 'quirks', 'switch', 'tablet', - 'tablet-mode', 'tap', 'timer', 'totem', 'touch', 'touchpad', 'trackball', - 'trackpoint', 'udev', - ] - foreach group : groups + foreach testfile : tests_sources + tfile = testfile.split('test/test-')[1] + group = tfile.split('.c')[0] test('libinput-test-suite-@0@'.format(group), libinput_test_runner, suite : ['all', 'valgrind', 'root', 'hardware'], - args : ['--filter-group=@0@:*'.format(group), + args : ['--filter-group=@0@'.format(group), '--xml-output=junit-@0@-XXXXXX.xml'.format(group)], is_parallel : false, timeout : 1200) diff --git a/test/litest.c b/test/litest.c index 6fccf491..326a2415 100644 --- a/test/litest.c +++ b/test/litest.c @@ -429,25 +429,6 @@ static struct suite * get_suite(const char *name) { struct suite *s; - /* this is the list meson calls, ensure we don't miss out on tests */ - const char * allowed_suites[] = { - "config:", "context:", "device:", "events:", "gestures:", - "keyboard:", "lid:", "log:", "misc:", "pad:", "path:", - "pointer:", "quirks:", "switch:", "tablet:", "tablet-mode:", - "tap:", "timer:", "totem:", "touch:", "touchpad:", - "trackball:", "trackpoint:", "udev:", - }; - const char **allowed; - bool found = false; - - ARRAY_FOR_EACH(allowed_suites, allowed) { - if (strstartswith(name, *allowed)) { - found = true; - break; - } - } - if (!found) - litest_abort_msg("Suite name '%s' is not allowed\n", name); list_for_each(s, &all_tests, node) { if (streq(s->name, name)) @@ -464,13 +445,28 @@ get_suite(const char *name) } static void -litest_add_tcase(const char *suite_name, +create_suite_name(const char *filename, char suitename[64]) +{ + char *trunk = trunkname(filename); + char *p = trunk; + + /* strip the test- prefix */ + if (strstartswith(trunk, "test-")) + p += 5; + + snprintf(suitename, 64, "%s", p); + free(trunk); +} + +static void +litest_add_tcase(const char *filename, const char *funcname, const void *func, int64_t required, int64_t excluded, const struct range *range) { + char suite_name[65]; struct suite *suite; bool added = false; @@ -482,9 +478,9 @@ litest_add_tcase(const char *suite_name, fnmatch(filter_test, funcname, 0) != 0) return; - if (filter_group && - strstr(suite_name, filter_group) == NULL && - fnmatch(filter_group, suite_name, 0) != 0) + create_suite_name(filename, suite_name); + + if (filter_group && fnmatch(filter_group, suite_name, 0) != 0) return; suite = get_suite(suite_name); @@ -618,7 +614,7 @@ _litest_add_for_device(const char *name, } void -_litest_add_ranged_for_device(const char *name, +_litest_add_ranged_for_device(const char *filename, const char *funcname, const void *func, enum litest_device_type type, @@ -627,6 +623,7 @@ _litest_add_ranged_for_device(const char *name, struct suite *s; struct litest_test_device *dev; bool device_filtered = false; + char suite_name[64]; litest_assert(type < LITEST_NO_DEVICE); @@ -635,12 +632,11 @@ _litest_add_ranged_for_device(const char *name, fnmatch(filter_test, funcname, 0) != 0) return; - if (filter_group && - strstr(name, filter_group) == NULL && - fnmatch(filter_group, name, 0) != 0) + create_suite_name(filename, suite_name); + if (filter_group && fnmatch(filter_group, suite_name, 0) != 0) return; - s = get_suite(name); + s = get_suite(suite_name); list_for_each(dev, &devices, node) { if (filter_device && strstr(dev->shortname, filter_device) == NULL && diff --git a/test/litest.h b/test/litest.h index 5c618c0b..0d81b352 100644 --- a/test/litest.h +++ b/test/litest.h @@ -440,20 +440,20 @@ void litest_disable_log_handler(struct libinput *libinput); void litest_restore_log_handler(struct libinput *libinput); void litest_set_log_handler_bug(struct libinput *libinput); -#define litest_add(name_, func_, ...) \ - _litest_add(name_, #func_, func_, __VA_ARGS__) -#define litest_add_ranged(name_, func_, ...) \ - _litest_add_ranged(name_, #func_, func_, __VA_ARGS__) -#define litest_add_for_device(name_, func_, ...) \ - _litest_add_for_device(name_, #func_, func_, __VA_ARGS__) -#define litest_add_ranged_for_device(name_, func_, ...) \ - _litest_add_ranged_for_device(name_, #func_, func_, __VA_ARGS__) -#define litest_add_no_device(name_, func_) \ - _litest_add_no_device(name_, #func_, func_) -#define litest_add_ranged_no_device(name_, func_, ...) \ - _litest_add_ranged_no_device(name_, #func_, func_, __VA_ARGS__) -#define litest_add_deviceless(name_, func_) \ - _litest_add_deviceless(name_, #func_, func_) +#define litest_add(func_, ...) \ + _litest_add(__FILE__, #func_, func_, __VA_ARGS__) +#define litest_add_ranged(func_, ...) \ + _litest_add_ranged(__FILE__, #func_, func_, __VA_ARGS__) +#define litest_add_for_device(func_, ...) \ + _litest_add_for_device(__FILE__, #func_, func_, __VA_ARGS__) +#define litest_add_ranged_for_device(func_, ...) \ + _litest_add_ranged_for_device(__FILE__, #func_, func_, __VA_ARGS__) +#define litest_add_no_device(func_) \ + _litest_add_no_device(__FILE__, #func_, func_) +#define litest_add_ranged_no_device(func_, ...) \ + _litest_add_ranged_no_device(__FILE__, #func_, func_, __VA_ARGS__) +#define litest_add_deviceless(func_) \ + _litest_add_deviceless(__FILE__, #func_, func_) void _litest_add(const char *name, diff --git a/test/test-device.c b/test/test-device.c index bb667499..2d7ed71e 100644 --- a/test/test-device.c +++ b/test/test-device.c @@ -1702,79 +1702,79 @@ TEST_COLLECTION(device) struct range abs_range = { 0, ABS_MISC }; struct range abs_mt_range = { ABS_MT_SLOT + 1, ABS_CNT }; - litest_add("device:sendevents", device_sendevents_config, LITEST_ANY, LITEST_TOUCHPAD|LITEST_TABLET); - litest_add("device:sendevents", device_sendevents_config_invalid, LITEST_ANY, LITEST_TABLET); - litest_add("device:sendevents", device_sendevents_config_touchpad, LITEST_TOUCHPAD, LITEST_TABLET); - litest_add("device:sendevents", device_sendevents_config_touchpad_superset, LITEST_TOUCHPAD, LITEST_TABLET); - litest_add("device:sendevents", device_sendevents_config_default, LITEST_ANY, LITEST_TABLET); - litest_add("device:sendevents", device_disable, LITEST_RELATIVE, LITEST_TABLET); - litest_add("device:sendevents", device_disable_tablet, LITEST_TABLET, LITEST_ANY); - litest_add("device:sendevents", device_disable_touchpad, LITEST_TOUCHPAD, LITEST_TABLET); - litest_add("device:sendevents", device_disable_touch, LITEST_TOUCH, LITEST_ANY); - litest_add("device:sendevents", device_disable_touch_during_touch, LITEST_TOUCH, LITEST_ANY); - litest_add("device:sendevents", device_disable_touch, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); - litest_add("device:sendevents", device_disable_touch_during_touch, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); - litest_add("device:sendevents", device_disable_events_pending, LITEST_RELATIVE, LITEST_TOUCHPAD|LITEST_TABLET); - litest_add("device:sendevents", device_double_disable, LITEST_ANY, LITEST_TABLET); - litest_add("device:sendevents", device_double_enable, LITEST_ANY, LITEST_TABLET); - litest_add_no_device("device:sendevents", device_reenable_syspath_changed); - litest_add_no_device("device:sendevents", device_reenable_device_removed); - litest_add_for_device("device:sendevents", device_disable_release_buttons, LITEST_MOUSE); - litest_add_for_device("device:sendevents", device_disable_release_keys, LITEST_KEYBOARD); - litest_add("device:sendevents", device_disable_release_tap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("device:sendevents", device_disable_release_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("device:sendevents", device_disable_release_softbutton, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("device:sendevents", device_disable_topsoftbutton, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("device:id", device_ids, LITEST_ANY, LITEST_ANY); - litest_add_for_device("device:context", device_context, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("device:context", device_user_data, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add(device_sendevents_config, LITEST_ANY, LITEST_TOUCHPAD|LITEST_TABLET); + litest_add(device_sendevents_config_invalid, LITEST_ANY, LITEST_TABLET); + litest_add(device_sendevents_config_touchpad, LITEST_TOUCHPAD, LITEST_TABLET); + litest_add(device_sendevents_config_touchpad_superset, LITEST_TOUCHPAD, LITEST_TABLET); + litest_add(device_sendevents_config_default, LITEST_ANY, LITEST_TABLET); + litest_add(device_disable, LITEST_RELATIVE, LITEST_TABLET); + litest_add(device_disable_tablet, LITEST_TABLET, LITEST_ANY); + litest_add(device_disable_touchpad, LITEST_TOUCHPAD, LITEST_TABLET); + litest_add(device_disable_touch, LITEST_TOUCH, LITEST_ANY); + litest_add(device_disable_touch_during_touch, LITEST_TOUCH, LITEST_ANY); + litest_add(device_disable_touch, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); + litest_add(device_disable_touch_during_touch, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); + litest_add(device_disable_events_pending, LITEST_RELATIVE, LITEST_TOUCHPAD|LITEST_TABLET); + litest_add(device_double_disable, LITEST_ANY, LITEST_TABLET); + litest_add(device_double_enable, LITEST_ANY, LITEST_TABLET); + litest_add_no_device(device_reenable_syspath_changed); + litest_add_no_device(device_reenable_device_removed); + litest_add_for_device(device_disable_release_buttons, LITEST_MOUSE); + litest_add_for_device(device_disable_release_keys, LITEST_KEYBOARD); + litest_add(device_disable_release_tap, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(device_disable_release_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(device_disable_release_softbutton, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(device_disable_topsoftbutton, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(device_ids, LITEST_ANY, LITEST_ANY); + litest_add_for_device(device_context, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(device_user_data, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add("device:udev", device_get_udev_handle, LITEST_ANY, LITEST_ANY); + litest_add(device_get_udev_handle, LITEST_ANY, LITEST_ANY); - litest_add("device:group", device_group_get, LITEST_ANY, LITEST_ANY); - litest_add_no_device("device:group", device_group_ref); - litest_add_no_device("device:group", device_group_leak); + litest_add(device_group_get, LITEST_ANY, LITEST_ANY); + litest_add_no_device(device_group_ref); + litest_add_no_device(device_group_leak); - litest_add_no_device("device:invalid devices", abs_device_no_absx); - litest_add_no_device("device:invalid devices", abs_device_no_absy); - litest_add_no_device("device:invalid devices", abs_mt_device_no_absx); - litest_add_no_device("device:invalid devices", abs_mt_device_no_absy); - litest_add_ranged_no_device("device:invalid devices", abs_device_no_range, &abs_range); - litest_add_ranged_no_device("device:invalid devices", abs_mt_device_no_range, &abs_mt_range); - litest_add_no_device("device:invalid devices", abs_device_missing_res); - litest_add_no_device("device:invalid devices", abs_mt_device_missing_res); - litest_add_no_device("device:invalid devices", ignore_joystick); + litest_add_no_device(abs_device_no_absx); + litest_add_no_device(abs_device_no_absy); + litest_add_no_device(abs_mt_device_no_absx); + litest_add_no_device(abs_mt_device_no_absy); + litest_add_ranged_no_device(abs_device_no_range, &abs_range); + litest_add_ranged_no_device(abs_mt_device_no_range, &abs_mt_range); + litest_add_no_device(abs_device_missing_res); + litest_add_no_device(abs_mt_device_missing_res); + litest_add_no_device(ignore_joystick); - litest_add("device:wheel", device_wheel_only, LITEST_WHEEL, LITEST_RELATIVE|LITEST_ABSOLUTE|LITEST_TABLET); - litest_add_no_device("device:accelerometer", device_accelerometer); + litest_add(device_wheel_only, LITEST_WHEEL, LITEST_RELATIVE|LITEST_ABSOLUTE|LITEST_TABLET); + litest_add_no_device(device_accelerometer); - litest_add("device:udev tags", device_udev_tag_wacom_tablet, LITEST_TABLET, LITEST_TOTEM); + litest_add(device_udev_tag_wacom_tablet, LITEST_TABLET, LITEST_TOTEM); - litest_add_no_device("device:invalid rel events", device_nonpointer_rel); - litest_add_no_device("device:invalid rel events", device_touchpad_rel); - litest_add_no_device("device:invalid rel events", device_touch_rel); - litest_add_no_device("device:invalid rel events", device_abs_rel); + litest_add_no_device(device_nonpointer_rel); + litest_add_no_device(device_touchpad_rel); + litest_add_no_device(device_touch_rel); + litest_add_no_device(device_abs_rel); - litest_add_for_device("device:quirks", device_quirks_no_abs_mt_y, LITEST_ANKER_MOUSE_KBD); - litest_add_for_device("device:quirks", device_quirks_cyborg_rat_mode_button, LITEST_CYBORG_RAT); - litest_add_for_device("device:quirks", device_quirks_apple_magicmouse, LITEST_MAGICMOUSE); - litest_add_for_device("device:quirks", device_quirks_logitech_marble_mouse, LITEST_LOGITECH_TRACKBALL); - litest_add_no_device("device:quirks", device_quirks); + litest_add_for_device(device_quirks_no_abs_mt_y, LITEST_ANKER_MOUSE_KBD); + litest_add_for_device(device_quirks_cyborg_rat_mode_button, LITEST_CYBORG_RAT); + litest_add_for_device(device_quirks_apple_magicmouse, LITEST_MAGICMOUSE); + litest_add_for_device(device_quirks_logitech_marble_mouse, LITEST_LOGITECH_TRACKBALL); + litest_add_no_device(device_quirks); - litest_add("device:capability", device_capability_at_least_one, LITEST_ANY, LITEST_ANY); - litest_add("device:capability", device_capability_check_invalid, LITEST_ANY, LITEST_ANY); - litest_add_no_device("device:capability", device_capability_nocaps_ignored); + litest_add(device_capability_at_least_one, LITEST_ANY, LITEST_ANY); + litest_add(device_capability_check_invalid, LITEST_ANY, LITEST_ANY); + litest_add_no_device(device_capability_nocaps_ignored); - litest_add("device:size", device_has_size, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("device:size", device_has_size, LITEST_TABLET, LITEST_ANY); - litest_add("device:size", device_has_no_size, LITEST_ANY, + litest_add(device_has_size, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(device_has_size, LITEST_TABLET, LITEST_ANY); + litest_add(device_has_no_size, LITEST_ANY, LITEST_TOUCHPAD|LITEST_TABLET|LITEST_TOUCH|LITEST_ABSOLUTE|LITEST_SINGLE_TOUCH|LITEST_TOTEM); - litest_add_for_device("device:output", device_get_output, LITEST_CALIBRATED_TOUCHSCREEN); - litest_add("device:output", device_no_output, LITEST_RELATIVE, LITEST_ANY); - litest_add("device:output", device_no_output, LITEST_KEYS, LITEST_ANY); + litest_add_for_device(device_get_output, LITEST_CALIBRATED_TOUCHSCREEN); + litest_add(device_no_output, LITEST_RELATIVE, LITEST_ANY); + litest_add(device_no_output, LITEST_KEYS, LITEST_ANY); - litest_add("device:seat", device_seat_phys_name, LITEST_ANY, LITEST_ANY); + litest_add(device_seat_phys_name, LITEST_ANY, LITEST_ANY); - litest_add("device:button", device_button_down_remove, LITEST_BUTTON, LITEST_ANY); + litest_add(device_button_down_remove, LITEST_BUTTON, LITEST_ANY); } diff --git a/test/test-gestures.c b/test/test-gestures.c index d16175ed..b8d5c146 100644 --- a/test/test-gestures.c +++ b/test/test-gestures.c @@ -1066,21 +1066,21 @@ TEST_COLLECTION(gestures) { struct range cardinals = { N, N + NCARDINALS }; - litest_add("gestures:cap", gestures_cap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("gestures:cap", gestures_nocap, LITEST_ANY, LITEST_TOUCHPAD); + litest_add(gestures_cap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(gestures_nocap, LITEST_ANY, LITEST_TOUCHPAD); - litest_add_ranged("gestures:swipe", gestures_swipe_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:swipe", gestures_swipe_3fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add("gestures:swipe", gestures_swipe_3fg_btntool_pinch_like, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add_ranged("gestures:swipe", gestures_swipe_4fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:swipe", gestures_swipe_4fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:pinch", gestures_pinch, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:pinch", gestures_pinch_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:pinch", gestures_pinch_4fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add_ranged("gestures:pinch", gestures_spread, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); + litest_add_ranged(gestures_swipe_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); + litest_add_ranged(gestures_swipe_3fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); + litest_add(gestures_swipe_3fg_btntool_pinch_like, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add_ranged(gestures_swipe_4fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); + litest_add_ranged(gestures_swipe_4fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); + litest_add_ranged(gestures_pinch, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); + litest_add_ranged(gestures_pinch_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); + litest_add_ranged(gestures_pinch_4fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); + litest_add_ranged(gestures_spread, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &cardinals); - litest_add("gestures:swipe", gestures_3fg_buttonarea_scroll, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH); - litest_add("gestures:swipe", gestures_3fg_buttonarea_scroll_btntool, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH); + litest_add(gestures_3fg_buttonarea_scroll, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH); + litest_add(gestures_3fg_buttonarea_scroll_btntool, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH); - litest_add("gestures:time", gestures_time_usec, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(gestures_time_usec, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); } diff --git a/test/test-keyboard.c b/test/test-keyboard.c index 6da6f853..55c5c365 100644 --- a/test/test-keyboard.c +++ b/test/test-keyboard.c @@ -478,17 +478,17 @@ END_TEST TEST_COLLECTION(keyboard) { - litest_add_no_device("keyboard:seat key count", keyboard_seat_key_count); - litest_add_no_device("keyboard:key counting", keyboard_ignore_no_pressed_release); - litest_add_no_device("keyboard:key counting", keyboard_key_auto_release); - litest_add("keyboard:keys", keyboard_has_key, LITEST_KEYS, LITEST_ANY); - litest_add("keyboard:keys", keyboard_keys_bad_device, LITEST_ANY, LITEST_ANY); - litest_add("keyboard:time", keyboard_time_usec, LITEST_KEYS, LITEST_ANY); + litest_add_no_device(keyboard_seat_key_count); + litest_add_no_device(keyboard_ignore_no_pressed_release); + litest_add_no_device(keyboard_key_auto_release); + litest_add(keyboard_has_key, LITEST_KEYS, LITEST_ANY); + litest_add(keyboard_keys_bad_device, LITEST_ANY, LITEST_ANY); + litest_add(keyboard_time_usec, LITEST_KEYS, LITEST_ANY); - litest_add("keyboard:events", keyboard_no_buttons, LITEST_KEYS, LITEST_ANY); - litest_add("keyboard:events", keyboard_frame_order, LITEST_KEYS, LITEST_ANY); + litest_add(keyboard_no_buttons, LITEST_KEYS, LITEST_ANY); + litest_add(keyboard_frame_order, LITEST_KEYS, LITEST_ANY); - litest_add("keyboard:leds", keyboard_leds, LITEST_ANY, LITEST_ANY); + litest_add(keyboard_leds, LITEST_ANY, LITEST_ANY); - litest_add("keyboard:scroll", keyboard_no_scroll, LITEST_KEYS, LITEST_WHEEL); + litest_add(keyboard_no_scroll, LITEST_KEYS, LITEST_WHEEL); } diff --git a/test/test-log.c b/test/test-log.c index 47b4debe..346955e1 100644 --- a/test/test-log.c +++ b/test/test-log.c @@ -188,12 +188,12 @@ TEST_COLLECTION(log) { struct range axes = { ABS_X, ABS_Y + 1}; - litest_add_deviceless("log:defaults", log_default_priority); - litest_add_deviceless("log:logging", log_handler_invoked); - litest_add_deviceless("log:logging", log_handler_NULL); - litest_add_no_device("log:logging", log_priority); + litest_add_deviceless(log_default_priority); + litest_add_deviceless(log_handler_invoked); + litest_add_deviceless(log_handler_NULL); + litest_add_no_device(log_priority); /* mtdev clips to axis ranges */ - litest_add_ranged("log:warnings", log_axisrange_warning, LITEST_TOUCH, LITEST_PROTOCOL_A, &axes); - litest_add_ranged("log:warnings", log_axisrange_warning, LITEST_TOUCHPAD, LITEST_ANY, &axes); + litest_add_ranged(log_axisrange_warning, LITEST_TOUCH, LITEST_PROTOCOL_A, &axes); + litest_add_ranged(log_axisrange_warning, LITEST_TOUCHPAD, LITEST_ANY, &axes); } diff --git a/test/test-misc.c b/test/test-misc.c index c3523bf6..398faa2e 100644 --- a/test/test-misc.c +++ b/test/test-misc.c @@ -880,24 +880,24 @@ END_TEST TEST_COLLECTION(misc) { - litest_add_no_device("events:conversion", event_conversion_device_notify); - litest_add_for_device("events:conversion", event_conversion_pointer, LITEST_MOUSE); - litest_add_for_device("events:conversion", event_conversion_pointer_abs, LITEST_XEN_VIRTUAL_POINTER); - litest_add_for_device("events:conversion", event_conversion_key, LITEST_KEYBOARD); - litest_add_for_device("events:conversion", event_conversion_touch, LITEST_WACOM_TOUCH); - litest_add_for_device("events:conversion", event_conversion_gesture, LITEST_BCM5974); - litest_add_for_device("events:conversion", event_conversion_tablet, LITEST_WACOM_CINTIQ); - litest_add_for_device("events:conversion", event_conversion_tablet_pad, LITEST_WACOM_INTUOS5_PAD); - litest_add_for_device("events:conversion", event_conversion_switch, LITEST_LID_SWITCH); + litest_add_no_device(event_conversion_device_notify); + litest_add_for_device(event_conversion_pointer, LITEST_MOUSE); + litest_add_for_device(event_conversion_pointer_abs, LITEST_XEN_VIRTUAL_POINTER); + litest_add_for_device(event_conversion_key, LITEST_KEYBOARD); + litest_add_for_device(event_conversion_touch, LITEST_WACOM_TOUCH); + litest_add_for_device(event_conversion_gesture, LITEST_BCM5974); + litest_add_for_device(event_conversion_tablet, LITEST_WACOM_CINTIQ); + litest_add_for_device(event_conversion_tablet_pad, LITEST_WACOM_INTUOS5_PAD); + litest_add_for_device(event_conversion_switch, LITEST_LID_SWITCH); - litest_add_deviceless("context:refcount", context_ref_counting); - litest_add_deviceless("config:status string", config_status_string); + litest_add_deviceless(context_ref_counting); + litest_add_deviceless(config_status_string); - litest_add_for_device("timer:offset-warning", timer_offset_bug_warning, LITEST_SYNAPTICS_TOUCHPAD); - litest_add_for_device("timer:delay-warning", timer_delay_bug_warning, LITEST_MOUSE); - litest_add_no_device("timer:flush", timer_flush); + litest_add_for_device(timer_offset_bug_warning, LITEST_SYNAPTICS_TOUCHPAD); + litest_add_for_device(timer_delay_bug_warning, LITEST_MOUSE); + litest_add_no_device(timer_flush); - litest_add_no_device("misc:fd", fd_no_event_leak); + litest_add_no_device(fd_no_event_leak); - litest_add_for_device("misc:system", udev_absinfo_override, LITEST_ABSINFO_OVERRIDE); + litest_add_for_device(udev_absinfo_override, LITEST_ABSINFO_OVERRIDE); } diff --git a/test/test-pad.c b/test/test-pad.c index 54b2c4a3..cfa4c76e 100644 --- a/test/test-pad.c +++ b/test/test-pad.c @@ -984,38 +984,38 @@ END_TEST TEST_COLLECTION(tablet_pad) { - litest_add("pad:cap", pad_cap, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:cap", pad_no_cap, LITEST_ANY, LITEST_TABLET_PAD); + litest_add(pad_cap, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_no_cap, LITEST_ANY, LITEST_TABLET_PAD); - litest_add("pad:time", pad_time, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_time, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:button", pad_num_buttons, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:button", pad_num_buttons_libwacom, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:button", pad_button_intuos, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:button", pad_button_bamboo, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:button", pad_button_libwacom, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:button", pad_button_mode_groups, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_num_buttons, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_num_buttons_libwacom, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_button_intuos, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_button_bamboo, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_button_libwacom, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_button_mode_groups, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:ring", pad_has_ring, LITEST_RING, LITEST_ANY); - litest_add("pad:ring", pad_ring, LITEST_RING, LITEST_ANY); - litest_add("pad:ring", pad_ring_finger_up, LITEST_RING, LITEST_ANY); + litest_add(pad_has_ring, LITEST_RING, LITEST_ANY); + litest_add(pad_ring, LITEST_RING, LITEST_ANY); + litest_add(pad_ring_finger_up, LITEST_RING, LITEST_ANY); - litest_add("pad:strip", pad_has_strip, LITEST_STRIP, LITEST_ANY); - litest_add("pad:strip", pad_strip, LITEST_STRIP, LITEST_ANY); - litest_add("pad:strip", pad_strip_finger_up, LITEST_STRIP, LITEST_ANY); + litest_add(pad_has_strip, LITEST_STRIP, LITEST_ANY); + litest_add(pad_strip, LITEST_STRIP, LITEST_ANY); + litest_add(pad_strip_finger_up, LITEST_STRIP, LITEST_ANY); - litest_add_for_device("pad:left_handed", pad_left_handed_default, LITEST_WACOM_INTUOS5_PAD); - litest_add_for_device("pad:left_handed", pad_no_left_handed, LITEST_WACOM_INTUOS3_PAD); - litest_add_for_device("pad:left_handed", pad_left_handed_ring, LITEST_WACOM_INTUOS5_PAD); + litest_add_for_device(pad_left_handed_default, LITEST_WACOM_INTUOS5_PAD); + litest_add_for_device(pad_no_left_handed, LITEST_WACOM_INTUOS3_PAD); + litest_add_for_device(pad_left_handed_ring, LITEST_WACOM_INTUOS5_PAD); /* None of the current strip tablets are left-handed */ - litest_add("pad:modes", pad_mode_groups, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:modes", pad_mode_groups_userdata, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:modes", pad_mode_groups_ref, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:modes", pad_mode_group_mode, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:modes", pad_mode_group_has, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:modes", pad_mode_group_has_invalid, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:modes", pad_mode_group_has_no_toggle, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_mode_groups, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_mode_groups_userdata, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_mode_groups_ref, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_mode_group_mode, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_mode_group_has, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_mode_group_has_invalid, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_mode_group_has_no_toggle, LITEST_TABLET_PAD, LITEST_ANY); - litest_add("pad:keys", pad_keys, LITEST_TABLET_PAD, LITEST_ANY); + litest_add(pad_keys, LITEST_TABLET_PAD, LITEST_ANY); } diff --git a/test/test-path.c b/test/test-path.c index 9c6f25cf..43e75f25 100644 --- a/test/test-path.c +++ b/test/test-path.c @@ -1014,30 +1014,30 @@ END_TEST TEST_COLLECTION(path) { - litest_add_no_device("path:create", path_create_NULL); - litest_add_no_device("path:create", path_create_invalid); - litest_add_no_device("path:create", path_create_invalid_file); - litest_add_no_device("path:create", path_create_invalid_kerneldev); - litest_add_no_device("path:create", path_create_pathmax_file); - litest_add_no_device("path:create", path_create_destroy); - litest_add("path:create", path_force_destroy, LITEST_ANY, LITEST_ANY); - litest_add_no_device("path:create", path_set_user_data); - litest_add_no_device("path:suspend", path_suspend); - litest_add_no_device("path:suspend", path_double_suspend); - litest_add_no_device("path:suspend", path_double_resume); - litest_add_no_device("path:suspend", path_add_device_suspend_resume); - litest_add_no_device("path:suspend", path_add_device_suspend_resume_fail); - litest_add_no_device("path:suspend", path_add_device_suspend_resume_remove_device); - litest_add_for_device("path:seat", path_added_seat, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("path:seat", path_seat_change, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add("path:device events", path_added_device, LITEST_ANY, LITEST_ANY); - litest_add("path:device events", path_device_sysname, LITEST_ANY, LITEST_ANY); - litest_add_for_device("path:device events", path_add_device, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_no_device("path:device events", path_add_invalid_path); - litest_add_for_device("path:device events", path_remove_device, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("path:device events", path_double_remove_device, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_no_device("path:seat", path_seat_recycle); - litest_add_for_device("path:udev", path_udev_assign_seat, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_no_device(path_create_NULL); + litest_add_no_device(path_create_invalid); + litest_add_no_device(path_create_invalid_file); + litest_add_no_device(path_create_invalid_kerneldev); + litest_add_no_device(path_create_pathmax_file); + litest_add_no_device(path_create_destroy); + litest_add(path_force_destroy, LITEST_ANY, LITEST_ANY); + litest_add_no_device(path_set_user_data); + litest_add_no_device(path_suspend); + litest_add_no_device(path_double_suspend); + litest_add_no_device(path_double_resume); + litest_add_no_device(path_add_device_suspend_resume); + litest_add_no_device(path_add_device_suspend_resume_fail); + litest_add_no_device(path_add_device_suspend_resume_remove_device); + litest_add_for_device(path_added_seat, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(path_seat_change, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add(path_added_device, LITEST_ANY, LITEST_ANY); + litest_add(path_device_sysname, LITEST_ANY, LITEST_ANY); + litest_add_for_device(path_add_device, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_no_device(path_add_invalid_path); + litest_add_for_device(path_remove_device, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(path_double_remove_device, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_no_device(path_seat_recycle); + litest_add_for_device(path_udev_assign_seat, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_no_device("path:ignore", path_ignore_device); + litest_add_no_device(path_ignore_device); } diff --git a/test/test-pointer.c b/test/test-pointer.c index c89a15a4..da3ee190 100644 --- a/test/test-pointer.c +++ b/test/test-pointer.c @@ -3130,88 +3130,88 @@ TEST_COLLECTION(pointer) struct range buttons = {BTN_LEFT, BTN_TASK + 1}; struct range buttonorder = {0, _MB_BUTTONORDER_COUNT}; - litest_add("pointer:motion", pointer_motion_relative, LITEST_RELATIVE, LITEST_POINTINGSTICK); - litest_add_for_device("pointer:motion", pointer_motion_relative_zero, LITEST_MOUSE); - litest_add_ranged("pointer:motion", pointer_motion_relative_min_decel, LITEST_RELATIVE, LITEST_POINTINGSTICK, &compass); - litest_add("pointer:motion", pointer_motion_absolute, LITEST_ABSOLUTE, LITEST_ANY); - litest_add("pointer:motion", pointer_motion_unaccel, LITEST_RELATIVE, LITEST_ANY); - litest_add("pointer:button", pointer_button, LITEST_BUTTON, LITEST_CLICKPAD); - litest_add_no_device("pointer:button", pointer_button_auto_release); - litest_add_no_device("pointer:button", pointer_seat_button_count); - litest_add_for_device("pointer:button", pointer_button_has_no_button, LITEST_KEYBOARD); - litest_add("pointer:button", pointer_recover_from_lost_button_count, LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("pointer:scroll", pointer_scroll_wheel, LITEST_WHEEL, LITEST_TABLET); - litest_add("pointer:scroll", pointer_scroll_button, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:scroll", pointer_scroll_button_noscroll, LITEST_ABSOLUTE|LITEST_BUTTON, LITEST_RELATIVE); - litest_add("pointer:scroll", pointer_scroll_button_noscroll, LITEST_ANY, LITEST_RELATIVE|LITEST_BUTTON); - litest_add("pointer:scroll", pointer_scroll_button_no_event_before_timeout, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:scroll", pointer_scroll_button_middle_emulation, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:scroll", pointer_scroll_button_device_remove_while_down, LITEST_ANY, LITEST_RELATIVE|LITEST_BUTTON); + litest_add(pointer_motion_relative, LITEST_RELATIVE, LITEST_POINTINGSTICK); + litest_add_for_device(pointer_motion_relative_zero, LITEST_MOUSE); + litest_add_ranged(pointer_motion_relative_min_decel, LITEST_RELATIVE, LITEST_POINTINGSTICK, &compass); + litest_add(pointer_motion_absolute, LITEST_ABSOLUTE, LITEST_ANY); + litest_add(pointer_motion_unaccel, LITEST_RELATIVE, LITEST_ANY); + litest_add(pointer_button, LITEST_BUTTON, LITEST_CLICKPAD); + litest_add_no_device(pointer_button_auto_release); + litest_add_no_device(pointer_seat_button_count); + 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_scroll_wheel, LITEST_WHEEL, LITEST_TABLET); + litest_add(pointer_scroll_button, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_scroll_button_noscroll, LITEST_ABSOLUTE|LITEST_BUTTON, LITEST_RELATIVE); + litest_add(pointer_scroll_button_noscroll, LITEST_ANY, LITEST_RELATIVE|LITEST_BUTTON); + litest_add(pointer_scroll_button_no_event_before_timeout, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_scroll_button_middle_emulation, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_scroll_button_device_remove_while_down, LITEST_ANY, LITEST_RELATIVE|LITEST_BUTTON); - litest_add("pointer:scroll", pointer_scroll_button_lock, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:scroll", pointer_scroll_button_lock_defaults, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:scroll", pointer_scroll_button_lock_config, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:scroll", pointer_scroll_button_lock_enable_while_down, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:scroll", pointer_scroll_button_lock_enable_while_down_just_lock, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:scroll", pointer_scroll_button_lock_otherbutton, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:scroll", pointer_scroll_button_lock_enable_while_otherbutton_down, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add_ranged("pointer:scroll", pointer_scroll_button_lock_middlebutton, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY, &buttonorder); - litest_add("pointer:scroll", pointer_scroll_button_lock_doubleclick_nomove, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_scroll_button_lock, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_scroll_button_lock_defaults, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_scroll_button_lock_config, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_scroll_button_lock_enable_while_down, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_scroll_button_lock_enable_while_down_just_lock, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_scroll_button_lock_otherbutton, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_scroll_button_lock_enable_while_otherbutton_down, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add_ranged(pointer_scroll_button_lock_middlebutton, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY, &buttonorder); + litest_add(pointer_scroll_button_lock_doubleclick_nomove, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:scroll", pointer_scroll_nowheel_defaults, LITEST_RELATIVE|LITEST_BUTTON, LITEST_WHEEL); - litest_add_for_device("pointer:scroll", pointer_scroll_defaults_logitech_marble , LITEST_LOGITECH_TRACKBALL); - litest_add("pointer:scroll", pointer_scroll_natural_defaults, LITEST_WHEEL, LITEST_TABLET); - litest_add("pointer:scroll", pointer_scroll_natural_defaults_noscroll, LITEST_ANY, LITEST_WHEEL); - litest_add("pointer:scroll", pointer_scroll_natural_enable_config, LITEST_WHEEL, LITEST_TABLET); - litest_add("pointer:scroll", pointer_scroll_natural_wheel, LITEST_WHEEL, LITEST_TABLET); - litest_add("pointer:scroll", pointer_scroll_has_axis_invalid, LITEST_WHEEL, LITEST_TABLET); + litest_add(pointer_scroll_nowheel_defaults, LITEST_RELATIVE|LITEST_BUTTON, LITEST_WHEEL); + litest_add_for_device(pointer_scroll_defaults_logitech_marble , LITEST_LOGITECH_TRACKBALL); + litest_add(pointer_scroll_natural_defaults, LITEST_WHEEL, LITEST_TABLET); + litest_add(pointer_scroll_natural_defaults_noscroll, LITEST_ANY, LITEST_WHEEL); + litest_add(pointer_scroll_natural_enable_config, LITEST_WHEEL, LITEST_TABLET); + litest_add(pointer_scroll_natural_wheel, LITEST_WHEEL, LITEST_TABLET); + litest_add(pointer_scroll_has_axis_invalid, LITEST_WHEEL, LITEST_TABLET); - litest_add("pointer:calibration", pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH|LITEST_ABSOLUTE|LITEST_PROTOCOL_A|LITEST_TABLET); + litest_add(pointer_no_calibration, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH|LITEST_ABSOLUTE|LITEST_PROTOCOL_A|LITEST_TABLET); /* tests touchpads too */ - litest_add("pointer:left-handed", pointer_left_handed_defaults, LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:left-handed", pointer_left_handed, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:left-handed", pointer_left_handed_during_click, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:left-handed", pointer_left_handed_during_click_multiple_buttons, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_left_handed_defaults, LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_left_handed, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_left_handed_during_click, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); + litest_add(pointer_left_handed_during_click_multiple_buttons, LITEST_RELATIVE|LITEST_BUTTON, LITEST_ANY); - litest_add("pointer:accel", pointer_accel_defaults, LITEST_RELATIVE, LITEST_ANY); - litest_add("pointer:accel", pointer_accel_invalid, LITEST_RELATIVE, LITEST_ANY); - litest_add("pointer:accel", pointer_accel_defaults_absolute, LITEST_ABSOLUTE, LITEST_RELATIVE); - litest_add("pointer:accel", pointer_accel_defaults_absolute_relative, LITEST_ABSOLUTE|LITEST_RELATIVE, LITEST_ANY); - litest_add("pointer:accel", pointer_accel_direction_change, LITEST_RELATIVE, LITEST_POINTINGSTICK); - litest_add("pointer:accel", pointer_accel_profile_defaults, LITEST_RELATIVE, LITEST_TOUCHPAD); - litest_add("pointer:accel", pointer_accel_profile_defaults, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("pointer:accel", pointer_accel_profile_invalid, LITEST_RELATIVE, LITEST_ANY); - litest_add("pointer:accel", pointer_accel_profile_noaccel, LITEST_ANY, LITEST_TOUCHPAD|LITEST_RELATIVE|LITEST_TABLET); - litest_add("pointer:accel", pointer_accel_profile_flat_motion_relative, LITEST_RELATIVE, LITEST_TOUCHPAD); + litest_add(pointer_accel_defaults, LITEST_RELATIVE, LITEST_ANY); + litest_add(pointer_accel_invalid, LITEST_RELATIVE, LITEST_ANY); + litest_add(pointer_accel_defaults_absolute, LITEST_ABSOLUTE, LITEST_RELATIVE); + litest_add(pointer_accel_defaults_absolute_relative, LITEST_ABSOLUTE|LITEST_RELATIVE, LITEST_ANY); + litest_add(pointer_accel_direction_change, LITEST_RELATIVE, LITEST_POINTINGSTICK); + litest_add(pointer_accel_profile_defaults, LITEST_RELATIVE, LITEST_TOUCHPAD); + litest_add(pointer_accel_profile_defaults, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(pointer_accel_profile_invalid, LITEST_RELATIVE, LITEST_ANY); + litest_add(pointer_accel_profile_noaccel, LITEST_ANY, LITEST_TOUCHPAD|LITEST_RELATIVE|LITEST_TABLET); + litest_add(pointer_accel_profile_flat_motion_relative, LITEST_RELATIVE, LITEST_TOUCHPAD); - litest_add("pointer:middlebutton", middlebutton, LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("pointer:middlebutton", middlebutton_nostart_while_down, LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("pointer:middlebutton", middlebutton_timeout, LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("pointer:middlebutton", middlebutton_doubleclick, LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("pointer:middlebutton", middlebutton_middleclick, LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("pointer:middlebutton", middlebutton_middleclick_during, LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("pointer:middlebutton", middlebutton_default_enabled, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_POINTINGSTICK); - litest_add("pointer:middlebutton", middlebutton_default_clickpad, LITEST_CLICKPAD, LITEST_ANY); - litest_add("pointer:middlebutton", middlebutton_default_touchpad, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("pointer:middlebutton", middlebutton_default_disabled, LITEST_ANY, LITEST_BUTTON); - litest_add_for_device("pointer:middlebutton", middlebutton_default_alps, LITEST_ALPS_SEMI_MT); - litest_add("pointer:middlebutton", middlebutton_button_scrolling, LITEST_RELATIVE|LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("pointer:middlebutton", middlebutton_button_scrolling_middle, LITEST_RELATIVE|LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("pointer:middlebutton", middlebutton_device_remove_while_down, LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("pointer:middlebutton", middlebutton_device_remove_while_one_is_down, LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(middlebutton, LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(middlebutton_nostart_while_down, LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(middlebutton_timeout, LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(middlebutton_doubleclick, LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(middlebutton_middleclick, LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(middlebutton_middleclick_during, LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(middlebutton_default_enabled, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_POINTINGSTICK); + litest_add(middlebutton_default_clickpad, LITEST_CLICKPAD, LITEST_ANY); + litest_add(middlebutton_default_touchpad, LITEST_TOUCHPAD, LITEST_CLICKPAD); + litest_add(middlebutton_default_disabled, LITEST_ANY, LITEST_BUTTON); + litest_add_for_device(middlebutton_default_alps, LITEST_ALPS_SEMI_MT); + litest_add(middlebutton_button_scrolling, LITEST_RELATIVE|LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(middlebutton_button_scrolling_middle, LITEST_RELATIVE|LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(middlebutton_device_remove_while_down, LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(middlebutton_device_remove_while_one_is_down, LITEST_BUTTON, LITEST_CLICKPAD); - litest_add_ranged("pointer:state", pointer_absolute_initial_state, LITEST_ABSOLUTE, LITEST_ANY, &axis_range); + litest_add_ranged(pointer_absolute_initial_state, LITEST_ABSOLUTE, LITEST_ANY, &axis_range); - litest_add("pointer:time", pointer_time_usec, LITEST_RELATIVE, LITEST_ANY); + litest_add(pointer_time_usec, LITEST_RELATIVE, LITEST_ANY); - litest_add_ranged("pointer:debounce", debounce_bounce, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE, &buttons); - litest_add("pointer:debounce", debounce_bounce_check_immediate, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE); - litest_add_ranged("pointer:debounce", debounce_spurious, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE, &buttons); - litest_add("pointer:debounce", debounce_spurious_multibounce, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE); - litest_add("pointer:debounce_otherbutton", debounce_spurious_dont_enable_on_otherbutton, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE); - litest_add("pointer:debounce_otherbutton", debounce_spurious_cancel_debounce_otherbutton, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE); - litest_add("pointer:debounce_otherbutton", debounce_spurious_switch_to_otherbutton, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE); - litest_add_no_device("pointer:debounce", debounce_remove_device_button_down); - litest_add_no_device("pointer:debounce", debounce_remove_device_button_up); + litest_add_ranged(debounce_bounce, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE, &buttons); + litest_add(debounce_bounce_check_immediate, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE); + litest_add_ranged(debounce_spurious, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE, &buttons); + litest_add(debounce_spurious_multibounce, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE); + litest_add(debounce_spurious_dont_enable_on_otherbutton, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE); + litest_add(debounce_spurious_cancel_debounce_otherbutton, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE); + litest_add(debounce_spurious_switch_to_otherbutton, LITEST_BUTTON, LITEST_TOUCHPAD|LITEST_NO_DEBOUNCE); + litest_add_no_device(debounce_remove_device_button_down); + litest_add_no_device(debounce_remove_device_button_up); } diff --git a/test/test-quirks.c b/test/test-quirks.c index 21627015..4bf5a88f 100644 --- a/test/test-quirks.c +++ b/test/test-quirks.c @@ -1474,60 +1474,60 @@ TEST_COLLECTION(quirks) { struct range boolean = {0, 2}; - litest_add_deviceless("quirks:datadir", quirks_invalid_dir); - litest_add_deviceless("quirks:datadir", quirks_empty_dir); + litest_add_deviceless(quirks_invalid_dir); + litest_add_deviceless(quirks_empty_dir); - litest_add_deviceless("quirks:structure", quirks_section_empty); - litest_add_deviceless("quirks:structure", quirks_section_double); - litest_add_deviceless("quirks:structure", quirks_section_missing_match); - litest_add_deviceless("quirks:structure", quirks_section_missing_attr); - litest_add_deviceless("quirks:structure", quirks_section_match_after_attr); - litest_add_deviceless("quirks:structure", quirks_section_duplicate_match); - litest_add_deviceless("quirks:structure", quirks_section_duplicate_attr); + litest_add_deviceless(quirks_section_empty); + litest_add_deviceless(quirks_section_double); + litest_add_deviceless(quirks_section_missing_match); + litest_add_deviceless(quirks_section_missing_attr); + litest_add_deviceless(quirks_section_match_after_attr); + litest_add_deviceless(quirks_section_duplicate_match); + litest_add_deviceless(quirks_section_duplicate_attr); - litest_add_deviceless("quirks:parsing", quirks_parse_error_section); - litest_add_deviceless("quirks:parsing", quirks_parse_error_trailing_whitespace); - litest_add_deviceless("quirks:parsing", quirks_parse_error_unknown_match); - litest_add_deviceless("quirks:parsing", quirks_parse_error_unknown_attr); - litest_add_deviceless("quirks:parsing", quirks_parse_error_unknown_model); - litest_add_deviceless("quirks:parsing", quirks_parse_error_unknown_prefix); - litest_add_deviceless("quirks:parsing", quirks_parse_error_model_not_one); - litest_add_deviceless("quirks:parsing", quirks_parse_comment_inline); - litest_add_deviceless("quirks:parsing", quirks_parse_comment_empty); - litest_add_deviceless("quirks:parsing", quirks_parse_string_quotes_single); - litest_add_deviceless("quirks:parsing", quirks_parse_string_quotes_double); + litest_add_deviceless(quirks_parse_error_section); + litest_add_deviceless(quirks_parse_error_trailing_whitespace); + litest_add_deviceless(quirks_parse_error_unknown_match); + litest_add_deviceless(quirks_parse_error_unknown_attr); + litest_add_deviceless(quirks_parse_error_unknown_model); + litest_add_deviceless(quirks_parse_error_unknown_prefix); + litest_add_deviceless(quirks_parse_error_model_not_one); + litest_add_deviceless(quirks_parse_comment_inline); + litest_add_deviceless(quirks_parse_comment_empty); + litest_add_deviceless(quirks_parse_string_quotes_single); + litest_add_deviceless(quirks_parse_string_quotes_double); - litest_add_deviceless("quirks:parsing", quirks_parse_bustype); - litest_add_deviceless("quirks:parsing", quirks_parse_bustype_invalid); - litest_add_deviceless("quirks:parsing", quirks_parse_vendor); - litest_add_deviceless("quirks:parsing", quirks_parse_vendor_invalid); - litest_add_deviceless("quirks:parsing", quirks_parse_product); - litest_add_deviceless("quirks:parsing", quirks_parse_product_invalid); - litest_add_deviceless("quirks:parsing", quirks_parse_version); - litest_add_deviceless("quirks:parsing", quirks_parse_version_invalid); - litest_add_deviceless("quirks:parsing", quirks_parse_name); - litest_add_deviceless("quirks:parsing", quirks_parse_name_invalid); - litest_add_deviceless("quirks:parsing", quirks_parse_udev); - litest_add_deviceless("quirks:parsing", quirks_parse_udev_invalid); - litest_add_deviceless("quirks:parsing", quirks_parse_dmi); - litest_add_deviceless("quirks:parsing", quirks_parse_dmi_invalid); + litest_add_deviceless(quirks_parse_bustype); + litest_add_deviceless(quirks_parse_bustype_invalid); + litest_add_deviceless(quirks_parse_vendor); + litest_add_deviceless(quirks_parse_vendor_invalid); + litest_add_deviceless(quirks_parse_product); + litest_add_deviceless(quirks_parse_product_invalid); + litest_add_deviceless(quirks_parse_version); + litest_add_deviceless(quirks_parse_version_invalid); + litest_add_deviceless(quirks_parse_name); + litest_add_deviceless(quirks_parse_name_invalid); + litest_add_deviceless(quirks_parse_udev); + litest_add_deviceless(quirks_parse_udev_invalid); + litest_add_deviceless(quirks_parse_dmi); + litest_add_deviceless(quirks_parse_dmi_invalid); - litest_add_for_device("quirks:parsing", quirks_parse_dimension_attr, LITEST_MOUSE); - litest_add_for_device("quirks:parsing", quirks_parse_range_attr, LITEST_MOUSE); - litest_add_for_device("quirks:parsing", quirks_parse_uint_attr, LITEST_MOUSE); - litest_add_for_device("quirks:parsing", quirks_parse_double_attr, LITEST_MOUSE); - litest_add_for_device("quirks:parsing", quirks_parse_string_attr, LITEST_MOUSE); - litest_add_for_device("quirks:parsing", quirks_parse_integration_attr, LITEST_MOUSE); + litest_add_for_device(quirks_parse_dimension_attr, LITEST_MOUSE); + litest_add_for_device(quirks_parse_range_attr, LITEST_MOUSE); + litest_add_for_device(quirks_parse_uint_attr, LITEST_MOUSE); + litest_add_for_device(quirks_parse_double_attr, LITEST_MOUSE); + litest_add_for_device(quirks_parse_string_attr, LITEST_MOUSE); + litest_add_for_device(quirks_parse_integration_attr, LITEST_MOUSE); - litest_add_for_device("quirks:model", quirks_model_one, LITEST_MOUSE); - litest_add_for_device("quirks:model", quirks_model_zero, LITEST_MOUSE); - litest_add_ranged_for_device("quirks:model", quirks_model_override, LITEST_MOUSE, &boolean); + litest_add_for_device(quirks_model_one, LITEST_MOUSE); + litest_add_for_device(quirks_model_zero, LITEST_MOUSE); + litest_add_ranged_for_device(quirks_model_override, LITEST_MOUSE, &boolean); - litest_add("quirks:devices", quirks_model_alps, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("quirks:devices", quirks_model_wacom, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("quirks:devices", quirks_model_apple, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("quirks:devices", quirks_model_synaptics_serial, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(quirks_model_alps, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(quirks_model_wacom, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(quirks_model_apple, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(quirks_model_synaptics_serial, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_deviceless("quirks:misc", quirks_call_NULL); - litest_add_deviceless("quirks:misc", quirks_ctx_ref); + litest_add_deviceless(quirks_call_NULL); + litest_add_deviceless(quirks_ctx_ref); } diff --git a/test/test-switch.c b/test/test-switch.c index 4dc06f16..54e01e00 100644 --- a/test/test-switch.c +++ b/test/test-switch.c @@ -1370,40 +1370,40 @@ TEST_COLLECTION(switch) struct range switches = { LIBINPUT_SWITCH_LID, LIBINPUT_SWITCH_TABLET_MODE + 1}; - litest_add("switch:has", switch_has_cap, LITEST_SWITCH, LITEST_ANY); - litest_add("switch:has", switch_has_lid_switch, LITEST_SWITCH, LITEST_ANY); - litest_add("switch:has", switch_has_tablet_mode_switch, LITEST_SWITCH, LITEST_ANY); - litest_add_ranged("switch:toggle", switch_toggle, LITEST_SWITCH, LITEST_ANY, &switches); - litest_add_ranged("switch:toggle", switch_toggle_double, LITEST_SWITCH, LITEST_ANY, &switches); - litest_add_ranged("switch:toggle", switch_down_on_init, LITEST_SWITCH, LITEST_ANY, &switches); - litest_add("switch:toggle", switch_not_down_on_init, LITEST_SWITCH, LITEST_ANY); - litest_add_ranged("switch:touchpad", switch_disable_touchpad, LITEST_SWITCH, LITEST_ANY, &switches); - litest_add_ranged("switch:touchpad", switch_disable_touchpad_during_touch, LITEST_SWITCH, LITEST_ANY, &switches); - litest_add_ranged("switch:touchpad", switch_disable_touchpad_edge_scroll, LITEST_SWITCH, LITEST_ANY, &switches); - litest_add_ranged("switch:touchpad", switch_disable_touchpad_edge_scroll_interrupt, LITEST_SWITCH, LITEST_ANY, &switches); - litest_add_ranged("switch:touchpad", switch_disable_touchpad_already_open, LITEST_SWITCH, LITEST_ANY, &switches); - litest_add_ranged("switch:touchpad", switch_dont_resume_disabled_touchpad, LITEST_SWITCH, LITEST_ANY, &switches); - litest_add_ranged("switch:touchpad", switch_dont_resume_disabled_touchpad_external_mouse, LITEST_SWITCH, LITEST_ANY, &switches); + litest_add(switch_has_cap, LITEST_SWITCH, LITEST_ANY); + litest_add(switch_has_lid_switch, LITEST_SWITCH, LITEST_ANY); + litest_add(switch_has_tablet_mode_switch, LITEST_SWITCH, LITEST_ANY); + litest_add_ranged(switch_toggle, LITEST_SWITCH, LITEST_ANY, &switches); + litest_add_ranged(switch_toggle_double, LITEST_SWITCH, LITEST_ANY, &switches); + litest_add_ranged(switch_down_on_init, LITEST_SWITCH, LITEST_ANY, &switches); + litest_add(switch_not_down_on_init, LITEST_SWITCH, LITEST_ANY); + litest_add_ranged(switch_disable_touchpad, LITEST_SWITCH, LITEST_ANY, &switches); + litest_add_ranged(switch_disable_touchpad_during_touch, LITEST_SWITCH, LITEST_ANY, &switches); + litest_add_ranged(switch_disable_touchpad_edge_scroll, LITEST_SWITCH, LITEST_ANY, &switches); + litest_add_ranged(switch_disable_touchpad_edge_scroll_interrupt, LITEST_SWITCH, LITEST_ANY, &switches); + litest_add_ranged(switch_disable_touchpad_already_open, LITEST_SWITCH, LITEST_ANY, &switches); + litest_add_ranged(switch_dont_resume_disabled_touchpad, LITEST_SWITCH, LITEST_ANY, &switches); + litest_add_ranged(switch_dont_resume_disabled_touchpad_external_mouse, LITEST_SWITCH, LITEST_ANY, &switches); - litest_add_ranged_no_device("switch:keyboard", switch_suspend_with_keyboard, &switches); - litest_add_ranged_no_device("switch:touchpad", switch_suspend_with_touchpad, &switches); + litest_add_ranged_no_device(switch_suspend_with_keyboard, &switches); + litest_add_ranged_no_device(switch_suspend_with_touchpad, &switches); - litest_add("lid:keyboard", lid_open_on_key, LITEST_SWITCH, LITEST_ANY); - litest_add("lid:keyboard", lid_open_on_key_touchpad_enabled, LITEST_SWITCH, LITEST_ANY); - litest_add_for_device("lid:buggy", lid_update_hw_on_key, LITEST_LID_SWITCH_SURFACE3); - litest_add_for_device("lid:buggy", lid_update_hw_on_key_closed_on_init, LITEST_LID_SWITCH_SURFACE3); - litest_add_for_device("lid:buggy", lid_update_hw_on_key_multiple_keyboards, LITEST_LID_SWITCH_SURFACE3); - litest_add_for_device("lid:keypress", lid_key_press, LITEST_GPIO_KEYS); + litest_add(lid_open_on_key, LITEST_SWITCH, LITEST_ANY); + litest_add(lid_open_on_key_touchpad_enabled, LITEST_SWITCH, LITEST_ANY); + litest_add_for_device(lid_update_hw_on_key, LITEST_LID_SWITCH_SURFACE3); + litest_add_for_device(lid_update_hw_on_key_closed_on_init, LITEST_LID_SWITCH_SURFACE3); + litest_add_for_device(lid_update_hw_on_key_multiple_keyboards, LITEST_LID_SWITCH_SURFACE3); + litest_add_for_device(lid_key_press, LITEST_GPIO_KEYS); - litest_add("tablet-mode:touchpad", tablet_mode_disable_touchpad_on_init, LITEST_SWITCH, LITEST_ANY); - litest_add("tablet-mode:touchpad", tablet_mode_disable_touchpad_on_resume, LITEST_SWITCH, LITEST_ANY); - litest_add("tablet-mode:touchpad", tablet_mode_enable_touchpad_on_resume, LITEST_SWITCH, LITEST_ANY); - litest_add("tablet-mode:keyboard", tablet_mode_disable_keyboard, LITEST_SWITCH, LITEST_ANY); - litest_add("tablet-mode:keyboard", tablet_mode_disable_keyboard_on_init, LITEST_SWITCH, LITEST_ANY); - litest_add("tablet-mode:keyboard", tablet_mode_disable_keyboard_on_resume, LITEST_SWITCH, LITEST_ANY); - litest_add("tablet-mode:keyboard", tablet_mode_enable_keyboard_on_resume, LITEST_SWITCH, LITEST_ANY); - litest_add("tablet-mode:trackpoint", tablet_mode_disable_trackpoint, LITEST_SWITCH, LITEST_ANY); - litest_add("tablet-mode:trackpoint", tablet_mode_disable_trackpoint_on_init, LITEST_SWITCH, LITEST_ANY); + litest_add(tablet_mode_disable_touchpad_on_init, LITEST_SWITCH, LITEST_ANY); + litest_add(tablet_mode_disable_touchpad_on_resume, LITEST_SWITCH, LITEST_ANY); + litest_add(tablet_mode_enable_touchpad_on_resume, LITEST_SWITCH, LITEST_ANY); + litest_add(tablet_mode_disable_keyboard, LITEST_SWITCH, LITEST_ANY); + litest_add(tablet_mode_disable_keyboard_on_init, LITEST_SWITCH, LITEST_ANY); + litest_add(tablet_mode_disable_keyboard_on_resume, LITEST_SWITCH, LITEST_ANY); + litest_add(tablet_mode_enable_keyboard_on_resume, LITEST_SWITCH, LITEST_ANY); + litest_add(tablet_mode_disable_trackpoint, LITEST_SWITCH, LITEST_ANY); + litest_add(tablet_mode_disable_trackpoint_on_init, LITEST_SWITCH, LITEST_ANY); - litest_add("lid:dock", dock_toggle, LITEST_SWITCH, LITEST_ANY); + litest_add(dock_toggle, LITEST_SWITCH, LITEST_ANY); } diff --git a/test/test-tablet.c b/test/test-tablet.c index 75019ec5..b4efb699 100644 --- a/test/test-tablet.c +++ b/test/test-tablet.c @@ -6075,124 +6075,124 @@ TEST_COLLECTION(tablet) struct range xyaxes = { ABS_X, ABS_Y + 1 }; struct range lh_transitions = {0, 16}; /* 2 bits for in, 2 bits for out */ - litest_add("tablet:tool", tool_ref, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add("tablet:tool", tool_user_data, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add("tablet:tool", tool_capability, LITEST_TABLET, LITEST_ANY); - litest_add_no_device("tablet:tool", tool_capabilities); - litest_add("tablet:tool", tool_type, LITEST_TABLET, LITEST_FORCED_PROXOUT); - litest_add("tablet:tool", tool_in_prox_before_start, LITEST_TABLET, LITEST_TOTEM); - litest_add("tablet:tool", tool_direct_switch_skip_tool_update, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tool", tool_direct_switch_with_forced_proxout, LITEST_TABLET, LITEST_ANY); + litest_add(tool_ref, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); + litest_add(tool_user_data, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); + litest_add(tool_capability, LITEST_TABLET, LITEST_ANY); + litest_add_no_device(tool_capabilities); + litest_add(tool_type, LITEST_TABLET, LITEST_FORCED_PROXOUT); + litest_add(tool_in_prox_before_start, LITEST_TABLET, LITEST_TOTEM); + litest_add(tool_direct_switch_skip_tool_update, LITEST_TABLET, LITEST_ANY); + litest_add(tool_direct_switch_with_forced_proxout, LITEST_TABLET, LITEST_ANY); /* Tablets hold back the proximity until the first event from the * kernel, the totem sends it immediately */ - litest_add("tablet:tool", tool_in_prox_before_start, LITEST_TABLET, LITEST_TOTEM); - litest_add("tablet:tool_serial", tool_unique, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add("tablet:tool_serial", tool_serial, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add("tablet:tool_serial", tool_id, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add("tablet:tool_serial", serial_changes_tool, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add("tablet:tool_serial", invalid_serials, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); - litest_add_no_device("tablet:tool_serial", tools_with_serials); - litest_add_no_device("tablet:tool_serial", tools_without_serials); - litest_add_for_device("tablet:tool_serial", tool_delayed_serial, LITEST_WACOM_HID4800_PEN); - litest_add("tablet:proximity", proximity_out_clear_buttons, LITEST_TABLET, LITEST_FORCED_PROXOUT); - litest_add("tablet:proximity", proximity_in_out, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:proximity", proximity_in_button_down, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:proximity", proximity_out_button_up, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:proximity", proximity_has_axes, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:proximity", bad_distance_events, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - litest_add("tablet:proximity", proximity_range_enter, LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_MOUSE, LITEST_ANY); - litest_add("tablet:proximity", proximity_range_in_out, LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_MOUSE, LITEST_ANY); - litest_add("tablet:proximity", proximity_range_button_click, LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_MOUSE, LITEST_ANY); - litest_add("tablet:proximity", proximity_range_button_press, LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_MOUSE, LITEST_ANY); - litest_add("tablet:proximity", proximity_range_button_release, LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_MOUSE, LITEST_ANY); - litest_add("tablet:proximity", proximity_out_slow_event, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - litest_add("tablet:proximity", proximity_out_not_during_contact, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - litest_add("tablet:proximity", proximity_out_not_during_buttonpress, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); - litest_add("tablet:proximity", proximity_out_disables_forced, LITEST_TABLET, LITEST_FORCED_PROXOUT|LITEST_TOTEM); - litest_add("tablet:proximity", proximity_out_disables_forced_after_forced, LITEST_TABLET, LITEST_FORCED_PROXOUT|LITEST_TOTEM); - litest_add_no_device("tablet:proximity", proximity_out_on_delete); - litest_add("tablet:button", button_down_up, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:button", button_seat_count, LITEST_TABLET, LITEST_ANY); - litest_add_no_device("tablet:button", button_up_on_delete); - litest_add("tablet:tip", tip_down_up, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); - litest_add("tablet:tip", tip_down_prox_in, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_up_prox_out, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:tip", tip_down_btn_change, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); - litest_add("tablet:tip", tip_up_btn_change, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); - litest_add("tablet:tip", tip_down_motion, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); - litest_add("tablet:tip", tip_up_motion, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); - litest_add_ranged("tablet:tip", tip_up_motion_one_axis, LITEST_TABLET|LITEST_HOVER, LITEST_ANY, &xyaxes); - litest_add("tablet:tip", tip_state_proximity, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); - litest_add("tablet:tip", tip_state_axis, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); - litest_add("tablet:tip", tip_state_button, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); - litest_add_no_device("tablet:tip", tip_up_on_delete); - litest_add("tablet:motion", motion, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:motion", motion_event_state, LITEST_TABLET, LITEST_ANY); - litest_add_for_device("tablet:motion", motion_outside_bounds, LITEST_WACOM_CINTIQ_24HD); - litest_add("tablet:tilt", tilt_available, LITEST_TABLET|LITEST_TILT, LITEST_ANY); - litest_add("tablet:tilt", tilt_not_available, LITEST_TABLET, LITEST_TILT); - litest_add("tablet:tilt", tilt_x, LITEST_TABLET|LITEST_TILT, LITEST_ANY); - litest_add("tablet:tilt", tilt_y, LITEST_TABLET|LITEST_TILT, LITEST_ANY); - litest_add_for_device("tablet:left_handed", left_handed, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:left_handed", left_handed_tilt, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:left_handed", left_handed_mouse_rotation, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:left_handed", left_handed_artpen_rotation, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:left_handed", no_left_handed, LITEST_WACOM_CINTIQ); - litest_add("tablet:pad", pad_buttons_ignored, LITEST_TABLET, LITEST_TOTEM); - litest_add("tablet:mouse", mouse_tool, LITEST_TABLET | LITEST_TOOL_MOUSE, LITEST_ANY); - litest_add("tablet:mouse", mouse_buttons, LITEST_TABLET | LITEST_TOOL_MOUSE, LITEST_ANY); - litest_add("tablet:mouse", mouse_rotation, LITEST_TABLET | LITEST_TOOL_MOUSE, LITEST_ANY); - litest_add("tablet:mouse", mouse_wheel, LITEST_TABLET | LITEST_TOOL_MOUSE, LITEST_WHEEL); - litest_add("tablet:airbrush", airbrush_tool, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:airbrush", airbrush_slider, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:artpen", artpen_tool, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:artpen", artpen_rotation, LITEST_TABLET, LITEST_ANY); + litest_add(tool_in_prox_before_start, LITEST_TABLET, LITEST_TOTEM); + litest_add(tool_unique, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); + litest_add(tool_serial, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); + litest_add(tool_id, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); + litest_add(serial_changes_tool, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); + litest_add(invalid_serials, LITEST_TABLET | LITEST_TOOL_SERIAL, LITEST_ANY); + litest_add_no_device(tools_with_serials); + litest_add_no_device(tools_without_serials); + litest_add_for_device(tool_delayed_serial, LITEST_WACOM_HID4800_PEN); + litest_add(proximity_out_clear_buttons, LITEST_TABLET, LITEST_FORCED_PROXOUT); + litest_add(proximity_in_out, LITEST_TABLET, LITEST_ANY); + litest_add(proximity_in_button_down, LITEST_TABLET, LITEST_ANY); + litest_add(proximity_out_button_up, LITEST_TABLET, LITEST_ANY); + litest_add(proximity_has_axes, LITEST_TABLET, LITEST_ANY); + litest_add(bad_distance_events, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); + litest_add(proximity_range_enter, LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_MOUSE, LITEST_ANY); + litest_add(proximity_range_in_out, LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_MOUSE, LITEST_ANY); + litest_add(proximity_range_button_click, LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_MOUSE, LITEST_ANY); + litest_add(proximity_range_button_press, LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_MOUSE, LITEST_ANY); + litest_add(proximity_range_button_release, LITEST_TABLET | LITEST_DISTANCE | LITEST_TOOL_MOUSE, LITEST_ANY); + litest_add(proximity_out_slow_event, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); + litest_add(proximity_out_not_during_contact, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); + litest_add(proximity_out_not_during_buttonpress, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); + litest_add(proximity_out_disables_forced, LITEST_TABLET, LITEST_FORCED_PROXOUT|LITEST_TOTEM); + litest_add(proximity_out_disables_forced_after_forced, LITEST_TABLET, LITEST_FORCED_PROXOUT|LITEST_TOTEM); + litest_add_no_device(proximity_out_on_delete); + litest_add(button_down_up, LITEST_TABLET, LITEST_ANY); + litest_add(button_seat_count, LITEST_TABLET, LITEST_ANY); + litest_add_no_device(button_up_on_delete); + litest_add(tip_down_up, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); + litest_add(tip_down_prox_in, LITEST_TABLET, LITEST_ANY); + litest_add(tip_up_prox_out, LITEST_TABLET, LITEST_ANY); + litest_add(tip_down_btn_change, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); + litest_add(tip_up_btn_change, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); + litest_add(tip_down_motion, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); + litest_add(tip_up_motion, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); + litest_add_ranged(tip_up_motion_one_axis, LITEST_TABLET|LITEST_HOVER, LITEST_ANY, &xyaxes); + litest_add(tip_state_proximity, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); + litest_add(tip_state_axis, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); + litest_add(tip_state_button, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); + litest_add_no_device(tip_up_on_delete); + litest_add(motion, LITEST_TABLET, LITEST_ANY); + litest_add(motion_event_state, LITEST_TABLET, LITEST_ANY); + litest_add_for_device(motion_outside_bounds, LITEST_WACOM_CINTIQ_24HD); + litest_add(tilt_available, LITEST_TABLET|LITEST_TILT, LITEST_ANY); + litest_add(tilt_not_available, LITEST_TABLET, LITEST_TILT); + litest_add(tilt_x, LITEST_TABLET|LITEST_TILT, LITEST_ANY); + litest_add(tilt_y, LITEST_TABLET|LITEST_TILT, LITEST_ANY); + litest_add_for_device(left_handed, LITEST_WACOM_INTUOS); + litest_add_for_device(left_handed_tilt, LITEST_WACOM_INTUOS); + litest_add_for_device(left_handed_mouse_rotation, LITEST_WACOM_INTUOS); + litest_add_for_device(left_handed_artpen_rotation, LITEST_WACOM_INTUOS); + litest_add_for_device(no_left_handed, LITEST_WACOM_CINTIQ); + litest_add(pad_buttons_ignored, LITEST_TABLET, LITEST_TOTEM); + litest_add(mouse_tool, LITEST_TABLET | LITEST_TOOL_MOUSE, LITEST_ANY); + litest_add(mouse_buttons, LITEST_TABLET | LITEST_TOOL_MOUSE, LITEST_ANY); + litest_add(mouse_rotation, LITEST_TABLET | LITEST_TOOL_MOUSE, LITEST_ANY); + litest_add(mouse_wheel, LITEST_TABLET | LITEST_TOOL_MOUSE, LITEST_WHEEL); + litest_add(airbrush_tool, LITEST_TABLET, LITEST_ANY); + litest_add(airbrush_slider, LITEST_TABLET, LITEST_ANY); + litest_add(artpen_tool, LITEST_TABLET, LITEST_ANY); + litest_add(artpen_rotation, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:time", tablet_time_usec, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:pressure", tablet_pressure_distance_exclusive, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); + litest_add(tablet_time_usec, LITEST_TABLET, LITEST_ANY); + litest_add(tablet_pressure_distance_exclusive, LITEST_TABLET | LITEST_DISTANCE, LITEST_ANY); /* The totem doesn't need calibration */ - litest_add("tablet:calibration", tablet_calibration_has_matrix, LITEST_TABLET, LITEST_TOTEM); - litest_add("tablet:calibration", tablet_calibration_set_matrix, LITEST_TABLET, LITEST_TOTEM); - litest_add("tablet:calibration", tablet_calibration_set_matrix_delta, LITEST_TABLET, LITEST_TOTEM); + litest_add(tablet_calibration_has_matrix, LITEST_TABLET, LITEST_TOTEM); + litest_add(tablet_calibration_set_matrix, LITEST_TABLET, LITEST_TOTEM); + litest_add(tablet_calibration_set_matrix_delta, LITEST_TABLET, LITEST_TOTEM); - litest_add("tablet:pressure", tablet_pressure_min_max, LITEST_TABLET, LITEST_ANY); - litest_add_for_device("tablet:pressure", tablet_pressure_range, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset_decrease, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset_increase, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset_exceed_threshold, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset_none_for_zero_distance, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:pressure", tablet_pressure_offset_none_for_small_distance, LITEST_WACOM_INTUOS); - litest_add_for_device("tablet:distance", tablet_distance_range, LITEST_WACOM_INTUOS); + litest_add(tablet_pressure_min_max, LITEST_TABLET, LITEST_ANY); + litest_add_for_device(tablet_pressure_range, LITEST_WACOM_INTUOS); + litest_add_for_device(tablet_pressure_offset, LITEST_WACOM_INTUOS); + litest_add_for_device(tablet_pressure_offset_decrease, LITEST_WACOM_INTUOS); + litest_add_for_device(tablet_pressure_offset_increase, LITEST_WACOM_INTUOS); + litest_add_for_device(tablet_pressure_offset_exceed_threshold, LITEST_WACOM_INTUOS); + litest_add_for_device(tablet_pressure_offset_none_for_zero_distance, LITEST_WACOM_INTUOS); + litest_add_for_device(tablet_pressure_offset_none_for_small_distance, LITEST_WACOM_INTUOS); + litest_add_for_device(tablet_distance_range, LITEST_WACOM_INTUOS); - litest_add("tablet:relative", relative_no_profile, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:relative", relative_no_delta_prox_in, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:relative", relative_delta, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:relative", relative_no_delta_on_tip, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); - litest_add("tablet:relative", relative_calibration, LITEST_TABLET, LITEST_ANY); + litest_add(relative_no_profile, LITEST_TABLET, LITEST_ANY); + litest_add(relative_no_delta_prox_in, LITEST_TABLET, LITEST_ANY); + litest_add(relative_delta, LITEST_TABLET, LITEST_ANY); + litest_add(relative_no_delta_on_tip, LITEST_TABLET|LITEST_HOVER, LITEST_ANY); + litest_add(relative_calibration, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:touch-arbitration", touch_arbitration, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:touch-arbitration", touch_arbitration_stop_touch, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:touch-arbitration", touch_arbitration_suspend_touch_device, LITEST_TOUCH, LITEST_ANY); - litest_add("tablet:touch-arbitration", touch_arbitration_remove_touch, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:touch-arbitration", touch_arbitration_remove_tablet, LITEST_TOUCH, LITEST_ANY); - litest_add("tablet:touch-arbitration", touch_arbitration_keep_ignoring, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:touch-arbitration", touch_arbitration_late_touch_lift, LITEST_TABLET, LITEST_ANY); - litest_add("tablet:touch-arbitration", touch_arbitration_outside_rect, LITEST_TABLET | LITEST_DIRECT, LITEST_ANY); - litest_add("tablet:touch-arbitration", touch_arbitration_remove_after, LITEST_TABLET | LITEST_DIRECT, LITEST_ANY); + litest_add(touch_arbitration, LITEST_TABLET, LITEST_ANY); + litest_add(touch_arbitration_stop_touch, LITEST_TABLET, LITEST_ANY); + litest_add(touch_arbitration_suspend_touch_device, LITEST_TOUCH, LITEST_ANY); + litest_add(touch_arbitration_remove_touch, LITEST_TABLET, LITEST_ANY); + litest_add(touch_arbitration_remove_tablet, LITEST_TOUCH, LITEST_ANY); + litest_add(touch_arbitration_keep_ignoring, LITEST_TABLET, LITEST_ANY); + litest_add(touch_arbitration_late_touch_lift, LITEST_TABLET, LITEST_ANY); + litest_add(touch_arbitration_outside_rect, LITEST_TABLET | LITEST_DIRECT, LITEST_ANY); + litest_add(touch_arbitration_remove_after, LITEST_TABLET | LITEST_DIRECT, LITEST_ANY); - litest_add_ranged("tablet:touch-rotation", tablet_rotation_left_handed, LITEST_TABLET, LITEST_ANY, &lh_transitions); - litest_add_ranged("tablet:touch-rotation", tablet_rotation_left_handed_configuration, LITEST_TABLET, LITEST_ANY, &lh_transitions); - litest_add_ranged("tablet:touch-rotation", tablet_rotation_left_handed_while_in_prox, LITEST_TABLET, LITEST_ANY, &lh_transitions); - litest_add_ranged("tablet:touch-rotation", tablet_rotation_left_handed_while_touch_down, LITEST_TABLET, LITEST_ANY, &lh_transitions); - litest_add_ranged("tablet:touch-rotation", tablet_rotation_left_handed_add_touchpad, LITEST_TABLET, LITEST_ANY, &lh_transitions); - litest_add_ranged("tablet:touch-rotation", tablet_rotation_left_handed_add_tablet, LITEST_TOUCHPAD, LITEST_ANY, &lh_transitions); + litest_add_ranged(tablet_rotation_left_handed, LITEST_TABLET, LITEST_ANY, &lh_transitions); + litest_add_ranged(tablet_rotation_left_handed_configuration, LITEST_TABLET, LITEST_ANY, &lh_transitions); + litest_add_ranged(tablet_rotation_left_handed_while_in_prox, LITEST_TABLET, LITEST_ANY, &lh_transitions); + litest_add_ranged(tablet_rotation_left_handed_while_touch_down, LITEST_TABLET, LITEST_ANY, &lh_transitions); + litest_add_ranged(tablet_rotation_left_handed_add_touchpad, LITEST_TABLET, LITEST_ANY, &lh_transitions); + litest_add_ranged(tablet_rotation_left_handed_add_tablet, LITEST_TOUCHPAD, LITEST_ANY, &lh_transitions); - litest_add_for_device("tablet:quirks", huion_static_btn_tool_pen, LITEST_HUION_TABLET); - litest_add_for_device("tablet:quirks", huion_static_btn_tool_pen_no_timeout_during_usage, LITEST_HUION_TABLET); - litest_add_ranged_for_device("tablet:quirks", huion_static_btn_tool_pen_disable_quirk_on_prox_out, LITEST_HUION_TABLET, &with_timeout); + litest_add_for_device(huion_static_btn_tool_pen, LITEST_HUION_TABLET); + litest_add_for_device(huion_static_btn_tool_pen_no_timeout_during_usage, LITEST_HUION_TABLET); + litest_add_ranged_for_device(huion_static_btn_tool_pen_disable_quirk_on_prox_out, LITEST_HUION_TABLET, &with_timeout); - litest_add_for_device("tablet:smoothing", tablet_smoothing, LITEST_WACOM_HID4800_PEN); + litest_add_for_device(tablet_smoothing, LITEST_WACOM_HID4800_PEN); } diff --git a/test/test-totem.c b/test/test-totem.c index d10ad323..917c0fc8 100644 --- a/test/test-totem.c +++ b/test/test-totem.c @@ -586,20 +586,20 @@ END_TEST TEST_COLLECTION(totem) { - litest_add("totem:tool", totem_type, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:tool", totem_axes, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:proximity", totem_proximity_in_out, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:proximity", totem_proximity_in_on_init, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:proximity", totem_proximity_out_on_suspend, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_type, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_axes, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_proximity_in_out, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_proximity_in_on_init, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_proximity_out_on_suspend, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:axes", totem_motion, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:axes", totem_rotation, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:axes", totem_size, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:button", totem_button, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:button", totem_button_down_on_init, LITEST_TOTEM, LITEST_ANY); - litest_add_no_device("totem:button", totem_button_up_on_delete); + litest_add(totem_motion, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_rotation, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_size, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_button, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_button_down_on_init, LITEST_TOTEM, LITEST_ANY); + litest_add_no_device(totem_button_up_on_delete); - litest_add("totem:arbitration", totem_arbitration_below, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:arbitration", totem_arbitration_during, LITEST_TOTEM, LITEST_ANY); - litest_add("totem:arbitration", totem_arbitration_outside_rect, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_arbitration_below, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_arbitration_during, LITEST_TOTEM, LITEST_ANY); + litest_add(totem_arbitration_outside_rect, LITEST_TOTEM, LITEST_ANY); } diff --git a/test/test-touch.c b/test/test-touch.c index d3a0c857..73f4f031 100644 --- a/test/test-touch.c +++ b/test/test-touch.c @@ -1342,53 +1342,53 @@ TEST_COLLECTION(touch) { struct range axes = { ABS_X, ABS_Y + 1}; - litest_add("touch:frame", touch_frame_events, LITEST_TOUCH, LITEST_ANY); - litest_add("touch:down", touch_downup_no_motion, LITEST_TOUCH, LITEST_ANY); - litest_add("touch:down", touch_downup_no_motion, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); - litest_add_no_device("touch:abs-transform", touch_abs_transform); - litest_add("touch:slots", touch_seat_slot, LITEST_TOUCH, LITEST_TOUCHPAD); - litest_add_no_device("touch:slots", touch_many_slots); - litest_add("touch:double-touch-down-up", touch_double_touch_down_up, LITEST_TOUCH, LITEST_PROTOCOL_A); - litest_add("touch:calibration", touch_calibration_scale, LITEST_TOUCH, LITEST_TOUCHPAD); - litest_add("touch:calibration", touch_calibration_scale, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); - litest_add("touch:calibration", touch_calibration_rotation, LITEST_TOUCH, LITEST_TOUCHPAD); - litest_add("touch:calibration", touch_calibration_rotation, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); - litest_add("touch:calibration", touch_calibration_translation, LITEST_TOUCH, LITEST_TOUCHPAD); - litest_add("touch:calibration", touch_calibration_translation, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); - litest_add_for_device("touch:calibration", touch_calibrated_screen_path, LITEST_CALIBRATED_TOUCHSCREEN); - litest_add_for_device("touch:calibration", touch_calibrated_screen_udev, LITEST_CALIBRATED_TOUCHSCREEN); - litest_add("touch:calibration", touch_calibration_config, LITEST_TOUCH, LITEST_ANY); + litest_add(touch_frame_events, LITEST_TOUCH, LITEST_ANY); + litest_add(touch_downup_no_motion, LITEST_TOUCH, LITEST_ANY); + litest_add(touch_downup_no_motion, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); + litest_add_no_device(touch_abs_transform); + litest_add(touch_seat_slot, LITEST_TOUCH, LITEST_TOUCHPAD); + litest_add_no_device(touch_many_slots); + litest_add(touch_double_touch_down_up, LITEST_TOUCH, LITEST_PROTOCOL_A); + litest_add(touch_calibration_scale, LITEST_TOUCH, LITEST_TOUCHPAD); + litest_add(touch_calibration_scale, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); + litest_add(touch_calibration_rotation, LITEST_TOUCH, LITEST_TOUCHPAD); + litest_add(touch_calibration_rotation, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); + litest_add(touch_calibration_translation, LITEST_TOUCH, LITEST_TOUCHPAD); + litest_add(touch_calibration_translation, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); + litest_add_for_device(touch_calibrated_screen_path, LITEST_CALIBRATED_TOUCHSCREEN); + litest_add_for_device(touch_calibrated_screen_udev, LITEST_CALIBRATED_TOUCHSCREEN); + litest_add(touch_calibration_config, LITEST_TOUCH, LITEST_ANY); - litest_add("touch:left-handed", touch_no_left_handed, LITEST_TOUCH, LITEST_ANY); + litest_add(touch_no_left_handed, LITEST_TOUCH, LITEST_ANY); - litest_add("touch:fake-mt", fake_mt_exists, LITEST_FAKE_MT, LITEST_ANY); - litest_add("touch:fake-mt", fake_mt_no_touch_events, LITEST_FAKE_MT, LITEST_ANY); + litest_add(fake_mt_exists, LITEST_FAKE_MT, LITEST_ANY); + litest_add(fake_mt_no_touch_events, LITEST_FAKE_MT, LITEST_ANY); - litest_add("touch:protocol a", touch_protocol_a_init, LITEST_PROTOCOL_A, LITEST_ANY); - litest_add("touch:protocol a", touch_protocol_a_touch, LITEST_PROTOCOL_A, LITEST_ANY); - litest_add("touch:protocol a", touch_protocol_a_2fg_touch, LITEST_PROTOCOL_A, LITEST_ANY); + litest_add(touch_protocol_a_init, LITEST_PROTOCOL_A, LITEST_ANY); + litest_add(touch_protocol_a_touch, LITEST_PROTOCOL_A, LITEST_ANY); + litest_add(touch_protocol_a_2fg_touch, LITEST_PROTOCOL_A, LITEST_ANY); - litest_add_ranged("touch:state", touch_initial_state, LITEST_TOUCH, LITEST_PROTOCOL_A, &axes); + litest_add_ranged(touch_initial_state, LITEST_TOUCH, LITEST_PROTOCOL_A, &axes); - litest_add("touch:time", touch_time_usec, LITEST_TOUCH, LITEST_TOUCHPAD); + litest_add(touch_time_usec, LITEST_TOUCH, LITEST_TOUCHPAD); - litest_add_for_device("touch:fuzz", touch_fuzz, LITEST_MULTITOUCH_FUZZ_SCREEN); - litest_add_for_device("touch:fuzz", touch_fuzz_property, LITEST_MULTITOUCH_FUZZ_SCREEN); + litest_add_for_device(touch_fuzz, LITEST_MULTITOUCH_FUZZ_SCREEN); + litest_add_for_device(touch_fuzz_property, LITEST_MULTITOUCH_FUZZ_SCREEN); - litest_add_no_device("touch:release", touch_release_on_unplug); + litest_add_no_device(touch_release_on_unplug); - litest_add_for_device("touch:range", touch_invalid_range_over, LITEST_TOUCHSCREEN_INVALID_RANGE); - litest_add_for_device("touch:range", touch_invalid_range_under, LITEST_TOUCHSCREEN_INVALID_RANGE); + litest_add_for_device(touch_invalid_range_over, LITEST_TOUCHSCREEN_INVALID_RANGE); + litest_add_for_device(touch_invalid_range_under, LITEST_TOUCHSCREEN_INVALID_RANGE); - litest_add("touch:count", touch_count_st, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); - litest_add("touch:count", touch_count_mt, LITEST_TOUCH, LITEST_SINGLE_TOUCH|LITEST_PROTOCOL_A); - litest_add("touch:count", touch_count_unknown, LITEST_PROTOCOL_A, LITEST_ANY); - litest_add("touch:count", touch_count_invalid, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH|LITEST_PROTOCOL_A); + litest_add(touch_count_st, LITEST_SINGLE_TOUCH, LITEST_TOUCHPAD); + litest_add(touch_count_mt, LITEST_TOUCH, LITEST_SINGLE_TOUCH|LITEST_PROTOCOL_A); + litest_add(touch_count_unknown, LITEST_PROTOCOL_A, LITEST_ANY); + litest_add(touch_count_invalid, LITEST_ANY, LITEST_TOUCH|LITEST_SINGLE_TOUCH|LITEST_PROTOCOL_A); - litest_add("touch:tool", touch_palm_detect_tool_palm, LITEST_TOUCH, LITEST_ANY); - litest_add("touch:tool", touch_palm_detect_tool_palm_on_off, LITEST_TOUCH, LITEST_ANY); - litest_add("touch:tool", touch_palm_detect_tool_palm_keep_type, LITEST_TOUCH, LITEST_ANY); - litest_add("touch:tool", touch_palm_detect_tool_palm_2fg, LITEST_TOUCH, LITEST_SINGLE_TOUCH); - litest_add("touch:tool", touch_palm_detect_tool_palm_on_off_2fg, LITEST_TOUCH, LITEST_SINGLE_TOUCH); - litest_add("touch:tool", touch_palm_detect_tool_palm_keep_type_2fg, LITEST_TOUCH, LITEST_ANY); + litest_add(touch_palm_detect_tool_palm, LITEST_TOUCH, LITEST_ANY); + litest_add(touch_palm_detect_tool_palm_on_off, LITEST_TOUCH, LITEST_ANY); + litest_add(touch_palm_detect_tool_palm_keep_type, LITEST_TOUCH, LITEST_ANY); + litest_add(touch_palm_detect_tool_palm_2fg, LITEST_TOUCH, LITEST_SINGLE_TOUCH); + litest_add(touch_palm_detect_tool_palm_on_off_2fg, LITEST_TOUCH, LITEST_SINGLE_TOUCH); + litest_add(touch_palm_detect_tool_palm_keep_type_2fg, LITEST_TOUCH, LITEST_ANY); } diff --git a/test/test-touchpad-buttons.c b/test/test-touchpad-buttons.c index d6a5cebe..3bb6d575 100644 --- a/test/test-touchpad-buttons.c +++ b/test/test-touchpad-buttons.c @@ -2096,71 +2096,69 @@ TEST_COLLECTION(touchpad_buttons) { struct range finger_count = {1, 4}; - litest_add("touchpad:button", touchpad_button, LITEST_TOUCHPAD, LITEST_CLICKPAD); + litest_add(touchpad_button, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("touchpad:clickfinger", touchpad_1fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_1fg_clickfinger_no_touch, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_2fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_3fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_3fg_clickfinger_btntool, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_4fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_4fg_clickfinger_btntool_2slots, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_4fg_clickfinger_btntool_3slots, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_2fg_clickfinger_distance, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_3fg_clickfinger_distance, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_3fg_clickfinger_distance_btntool, LITEST_CLICKPAD, LITEST_ANY); - litest_add_for_device("touchpad:clickfinger", touchpad_2fg_clickfinger_bottom, LITEST_SYNAPTICS_TOPBUTTONPAD); - litest_add("touchpad:clickfinger", touchpad_clickfinger_to_area_method, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", - touchpad_clickfinger_to_area_method_while_down, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", touchpad_area_to_clickfinger_method, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:clickfinger", - touchpad_area_to_clickfinger_method_while_down, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_1fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_1fg_clickfinger_no_touch, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_2fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_3fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_3fg_clickfinger_btntool, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_4fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_4fg_clickfinger_btntool_2slots, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_4fg_clickfinger_btntool_3slots, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_2fg_clickfinger_distance, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_3fg_clickfinger_distance, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_3fg_clickfinger_distance_btntool, LITEST_CLICKPAD, LITEST_ANY); + litest_add_for_device(touchpad_2fg_clickfinger_bottom, LITEST_SYNAPTICS_TOPBUTTONPAD); + litest_add(touchpad_clickfinger_to_area_method, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_clickfinger_to_area_method_while_down, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_area_to_clickfinger_method, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_area_to_clickfinger_method_while_down, LITEST_CLICKPAD, LITEST_ANY); /* run those two for the T440 one only so we don't have to worry * about small touchpads messing with thumb detection expectations */ - litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_3fg_tool_position, LITEST_SYNAPTICS_TOPBUTTONPAD); - litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_4fg_tool_position, LITEST_SYNAPTICS_TOPBUTTONPAD); + litest_add_for_device(touchpad_clickfinger_3fg_tool_position, LITEST_SYNAPTICS_TOPBUTTONPAD); + litest_add_for_device(touchpad_clickfinger_4fg_tool_position, LITEST_SYNAPTICS_TOPBUTTONPAD); - litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_appletouch_config, LITEST_APPLETOUCH); - litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_appletouch_1fg, LITEST_APPLETOUCH); - litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_appletouch_2fg, LITEST_APPLETOUCH); - litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_appletouch_3fg, LITEST_APPLETOUCH); + litest_add_for_device(touchpad_clickfinger_appletouch_config, LITEST_APPLETOUCH); + litest_add_for_device(touchpad_clickfinger_appletouch_1fg, LITEST_APPLETOUCH); + litest_add_for_device(touchpad_clickfinger_appletouch_2fg, LITEST_APPLETOUCH); + litest_add_for_device(touchpad_clickfinger_appletouch_3fg, LITEST_APPLETOUCH); - litest_add_ranged("touchpad:clickfinger", touchpad_clickfinger_click_drag, LITEST_CLICKPAD, LITEST_ANY, &finger_count); + litest_add_ranged(touchpad_clickfinger_click_drag, LITEST_CLICKPAD, LITEST_ANY, &finger_count); - litest_add("touchpad:click", touchpad_click_defaults_clickfinger, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("touchpad:click", touchpad_click_defaults_btnarea, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:click", touchpad_click_defaults_none, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("touchpad:click", touchpad_click_defaults_none, LITEST_ANY, LITEST_TOUCHPAD); + litest_add(touchpad_click_defaults_clickfinger, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add(touchpad_click_defaults_btnarea, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(touchpad_click_defaults_none, LITEST_TOUCHPAD, LITEST_CLICKPAD); + litest_add(touchpad_click_defaults_none, LITEST_ANY, LITEST_TOUCHPAD); - litest_add("touchpad:click", touchpad_btn_left, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("touchpad:click", clickpad_btn_left, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:click", clickpad_click_n_drag, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:click", clickpad_finger_pin, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_btn_left, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(clickpad_btn_left, LITEST_CLICKPAD, LITEST_ANY); + litest_add(clickpad_click_n_drag, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH); + litest_add(clickpad_finger_pin, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:softbutton", clickpad_softbutton_left, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:softbutton", clickpad_softbutton_middle, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:softbutton", clickpad_softbutton_right, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:softbutton", clickpad_softbutton_left_tap_n_drag, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:softbutton", clickpad_softbutton_right_tap_n_drag, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:softbutton", clickpad_softbutton_left_1st_fg_move, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:softbutton", clickpad_softbutton_left_2nd_fg_move, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:softbutton", clickpad_softbutton_left_to_right, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:softbutton", clickpad_softbutton_right_to_left, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:softbutton", clickpad_softbutton_hover_into_buttons, LITEST_CLICKPAD|LITEST_HOVER, LITEST_APPLE_CLICKPAD); + litest_add(clickpad_softbutton_left, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(clickpad_softbutton_middle, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(clickpad_softbutton_right, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(clickpad_softbutton_left_tap_n_drag, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(clickpad_softbutton_right_tap_n_drag, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(clickpad_softbutton_left_1st_fg_move, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(clickpad_softbutton_left_2nd_fg_move, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(clickpad_softbutton_left_to_right, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(clickpad_softbutton_right_to_left, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(clickpad_softbutton_hover_into_buttons, LITEST_CLICKPAD|LITEST_HOVER, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:topsoftbuttons", clickpad_topsoftbuttons_left, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("touchpad:topsoftbuttons", clickpad_topsoftbuttons_right, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("touchpad:topsoftbuttons", clickpad_topsoftbuttons_middle, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("touchpad:topsoftbuttons", clickpad_topsoftbuttons_move_out_leftclick, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("touchpad:topsoftbuttons", clickpad_topsoftbuttons_move_out_leftclick_before_timeout, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("touchpad:topsoftbuttons", clickpad_topsoftbuttons_clickfinger, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("touchpad:topsoftbuttons", clickpad_topsoftbuttons_clickfinger_dev_disabled, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(clickpad_topsoftbuttons_left, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(clickpad_topsoftbuttons_right, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(clickpad_topsoftbuttons_middle, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(clickpad_topsoftbuttons_move_out_leftclick, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(clickpad_topsoftbuttons_move_out_leftclick_before_timeout, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(clickpad_topsoftbuttons_clickfinger, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(clickpad_topsoftbuttons_clickfinger_dev_disabled, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("touchpad:middleemulation", clickpad_middleemulation_config_delayed, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:middleemulation", clickpad_middleemulation_click, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:middleemulation", clickpad_middleemulation_click_middle_left, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:middleemulation", clickpad_middleemulation_click_middle_right, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:middleemulation", clickpad_middleemulation_click_enable_while_down, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:middleemulation", clickpad_middleemulation_click_disable_while_down, LITEST_CLICKPAD, LITEST_ANY); + litest_add(clickpad_middleemulation_config_delayed, LITEST_CLICKPAD, LITEST_ANY); + litest_add(clickpad_middleemulation_click, LITEST_CLICKPAD, LITEST_ANY); + litest_add(clickpad_middleemulation_click_middle_left, LITEST_CLICKPAD, LITEST_ANY); + litest_add(clickpad_middleemulation_click_middle_right, LITEST_CLICKPAD, LITEST_ANY); + litest_add(clickpad_middleemulation_click_enable_while_down, LITEST_CLICKPAD, LITEST_ANY); + litest_add(clickpad_middleemulation_click_disable_while_down, LITEST_CLICKPAD, LITEST_ANY); } diff --git a/test/test-touchpad-tap.c b/test/test-touchpad-tap.c index 87c0e5ab..4cd5ab92 100644 --- a/test/test-touchpad-tap.c +++ b/test/test-touchpad-tap.c @@ -5224,110 +5224,110 @@ TEST_COLLECTION(touchpad_tap) struct range range_multifinger_tap = {1, 4}; struct range range_multifinger_doubletap = {3, 12}; - litest_add("tap:1fg", touchpad_1fg_tap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_ranged("tap:multitap", touchpad_doubletap, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_doubletap); - litest_add_ranged("tap:multitap", touchpad_multitap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:multitap", touchpad_multitap_timeout, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:multitap", touchpad_multitap_n_drag_timeout, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:multitap", touchpad_multitap_n_drag_high_delay, LITEST_TOUCHPAD, LITEST_ANY, &any_tap_range); - litest_add_ranged("tap:multitap", touchpad_multitap_n_drag_tap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:multitap", touchpad_multitap_n_drag_move, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:multitap", touchpad_multitap_n_drag_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &multitap_range); - litest_add_ranged("tap:multitap", touchpad_multitap_n_drag_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:2fg", touchpad_2fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT, &tap_map_range); - litest_add_ranged("tap:2fg", touchpad_2fg_tap_inverted, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &tap_map_range); - litest_add("tap:2fg", touchpad_2fg_tap_move_on_release, LITEST_TOUCHPAD|LITEST_SEMI_MT, LITEST_SINGLE_TOUCH); - litest_add("tap:2fg", touchpad_2fg_tap_n_hold_first, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:2fg", touchpad_2fg_tap_n_hold_second, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:2fg", touchpad_2fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:2fg", touchpad_1fg_tap_click, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("tap:2fg", touchpad_2fg_tap_click, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_SINGLE_TOUCH|LITEST_CLICKPAD); + litest_add(touchpad_1fg_tap, LITEST_TOUCHPAD, LITEST_ANY); + litest_add_ranged(touchpad_doubletap, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_doubletap); + litest_add_ranged(touchpad_multitap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged(touchpad_multitap_timeout, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged(touchpad_multitap_n_drag_timeout, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged(touchpad_multitap_n_drag_high_delay, LITEST_TOUCHPAD, LITEST_ANY, &any_tap_range); + litest_add_ranged(touchpad_multitap_n_drag_tap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged(touchpad_multitap_n_drag_move, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged(touchpad_multitap_n_drag_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &multitap_range); + litest_add_ranged(touchpad_multitap_n_drag_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range); + litest_add_ranged(touchpad_2fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT, &tap_map_range); + litest_add_ranged(touchpad_2fg_tap_inverted, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &tap_map_range); + litest_add(touchpad_2fg_tap_move_on_release, LITEST_TOUCHPAD|LITEST_SEMI_MT, LITEST_SINGLE_TOUCH); + litest_add(touchpad_2fg_tap_n_hold_first, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_2fg_tap_n_hold_second, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_2fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_1fg_tap_click, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(touchpad_2fg_tap_click, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_SINGLE_TOUCH|LITEST_CLICKPAD); - litest_add("tap:2fg", touchpad_2fg_tap_click_apple, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("tap:2fg", touchpad_no_2fg_tap_after_move, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:2fg", touchpad_no_2fg_tap_after_timeout, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:2fg", touchpad_no_first_fg_tap_after_move, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add_ranged("tap:3fg", touchpad_3fg_tap_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &tap_map_range); - litest_add_ranged("tap:3fg", touchpad_3fg_tap_btntool_inverted, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &tap_map_range); - litest_add_ranged("tap:3fg", touchpad_3fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &tap_map_range); - litest_add("tap:3fg", touchpad_3fg_tap_tap_again, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:3fg", touchpad_3fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:3fg", touchpad_3fg_tap_hover_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:3fg", touchpad_3fg_tap_pressure_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add_for_device("tap:3fg", touchpad_3fg_tap_btntool_pointerjump, LITEST_SYNAPTICS_TOPBUTTONPAD); - litest_add_for_device("tap:3fg", touchpad_3fg_tap_slot_release_btntool, LITEST_SYNAPTICS_TOPBUTTONPAD); - litest_add("tap:3fg", touchpad_3fg_tap_after_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_2fg_tap_click_apple, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add(touchpad_no_2fg_tap_after_move, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_no_2fg_tap_after_timeout, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_no_first_fg_tap_after_move, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add_ranged(touchpad_3fg_tap_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &tap_map_range); + litest_add_ranged(touchpad_3fg_tap_btntool_inverted, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &tap_map_range); + litest_add_ranged(touchpad_3fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &tap_map_range); + litest_add(touchpad_3fg_tap_tap_again, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_3fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_3fg_tap_hover_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_3fg_tap_pressure_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add_for_device(touchpad_3fg_tap_btntool_pointerjump, LITEST_SYNAPTICS_TOPBUTTONPAD); + litest_add_for_device(touchpad_3fg_tap_slot_release_btntool, LITEST_SYNAPTICS_TOPBUTTONPAD); + litest_add(touchpad_3fg_tap_after_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("tap:4fg", touchpad_4fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:4fg", touchpad_4fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:5fg", touchpad_5fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:5fg", touchpad_5fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_4fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_4fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_5fg_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_5fg_tap_quickrelease, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add_ranged("tap:multifinger", touchpad_move_after_touch, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger); + litest_add_ranged(touchpad_move_after_touch, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger); - litest_add_ranged("tap:drag", touchpad_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); - litest_add_ranged("tap:drag", touchpad_tap_n_drag_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_multifinger_tap); - litest_add_ranged("tap:drag", touchpad_tap_n_drag_3fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_APPLE_CLICKPAD, &range_multifinger_tap); - litest_add_ranged("tap:drag", touchpad_tap_n_drag_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_multifinger_tap); - litest_add_ranged("tap:draglock", touchpad_tap_n_drag_draglock, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); - litest_add_ranged("tap:draglock", touchpad_tap_n_drag_draglock_tap, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_doubletap); - litest_add_ranged("tap:draglock", touchpad_tap_n_drag_draglock_timeout, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_n_drag, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_n_drag_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_n_drag_3fg_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_APPLE_CLICKPAD, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_n_drag_3fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_n_drag_draglock, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_n_drag_draglock_tap, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_doubletap); + litest_add_ranged(touchpad_tap_n_drag_draglock_timeout, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); /* Real buttons don't interfere with tapping, so don't run those for pads with buttons */ - litest_add_ranged("tap:multifinger", touchpad_double_tap_click, LITEST_CLICKPAD, LITEST_ANY, &range_multifinger_tap); - litest_add_ranged("tap:multifinger", touchpad_tap_n_drag_click, LITEST_CLICKPAD, LITEST_ANY, &range_multifinger_tap); - litest_add_ranged("tap:drag", touchpad_multitap_n_drag_tap_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:draglock", touchpad_tap_n_drag_draglock_tap_click, LITEST_CLICKPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_double_tap_click, LITEST_CLICKPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_n_drag_click, LITEST_CLICKPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_multitap_n_drag_tap_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range); + litest_add_ranged(touchpad_tap_n_drag_draglock_tap_click, LITEST_CLICKPAD, LITEST_ANY, &range_multifinger_tap); - litest_add("tap:config", touchpad_tap_default_disabled, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_ANY); - litest_add("tap:config", touchpad_tap_default_enabled, LITEST_TOUCHPAD, LITEST_BUTTON); - litest_add("tap:config", touchpad_tap_invalid, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:config", touchpad_tap_is_available, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:config", touchpad_tap_is_not_available, LITEST_ANY, LITEST_TOUCHPAD); + litest_add(touchpad_tap_default_disabled, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_ANY); + litest_add(touchpad_tap_default_enabled, LITEST_TOUCHPAD, LITEST_BUTTON); + litest_add(touchpad_tap_invalid, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_tap_is_available, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_tap_is_not_available, LITEST_ANY, LITEST_TOUCHPAD); - litest_add("tap:config", touchpad_tap_default_map, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:config", touchpad_tap_map_unsupported, LITEST_ANY, LITEST_TOUCHPAD); - litest_add("tap:config", touchpad_tap_set_map, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:config", touchpad_tap_set_map_no_tapping, LITEST_ANY, LITEST_TOUCHPAD); - litest_add("tap:config", touchpad_tap_get_map_no_tapping, LITEST_ANY, LITEST_TOUCHPAD); - litest_add("tap:config", touchpad_tap_map_delayed, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_tap_default_map, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_tap_map_unsupported, LITEST_ANY, LITEST_TOUCHPAD); + litest_add(touchpad_tap_set_map, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_tap_set_map_no_tapping, LITEST_ANY, LITEST_TOUCHPAD); + litest_add(touchpad_tap_get_map_no_tapping, LITEST_ANY, LITEST_TOUCHPAD); + litest_add(touchpad_tap_map_delayed, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("tap:1fg", clickpad_1fg_tap_click, LITEST_CLICKPAD, LITEST_ANY); - litest_add("tap:2fg", clickpad_2fg_tap_click, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH|LITEST_APPLE_CLICKPAD); + litest_add(clickpad_1fg_tap_click, LITEST_CLICKPAD, LITEST_ANY); + litest_add(clickpad_2fg_tap_click, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH|LITEST_APPLE_CLICKPAD); - litest_add("tap:draglock", touchpad_drag_lock_default_disabled, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:draglock", touchpad_drag_lock_default_unavailable, LITEST_ANY, LITEST_TOUCHPAD); + litest_add(touchpad_drag_lock_default_disabled, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_drag_lock_default_unavailable, LITEST_ANY, LITEST_TOUCHPAD); - litest_add("tap:drag", touchpad_drag_default_disabled, LITEST_ANY, LITEST_TOUCHPAD); - litest_add("tap:drag", touchpad_drag_default_enabled, LITEST_TOUCHPAD, LITEST_BUTTON); - litest_add("tap:drag", touchpad_drag_config_invalid, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:drag", touchpad_drag_config_unsupported, LITEST_ANY, LITEST_TOUCHPAD); - litest_add("tap:drag", touchpad_drag_config_enabledisable, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_ranged("tap:drag", touchpad_drag_disabled, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); - litest_add_ranged("tap:drag", touchpad_drag_disabled_immediate, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); - litest_add_ranged("tap:drag", touchpad_drag_disabled_multitap_no_drag, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add(touchpad_drag_default_disabled, LITEST_ANY, LITEST_TOUCHPAD); + litest_add(touchpad_drag_default_enabled, LITEST_TOUCHPAD, LITEST_BUTTON); + litest_add(touchpad_drag_config_invalid, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_drag_config_unsupported, LITEST_ANY, LITEST_TOUCHPAD); + litest_add(touchpad_drag_config_enabledisable, LITEST_TOUCHPAD, LITEST_ANY); + litest_add_ranged(touchpad_drag_disabled, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_drag_disabled_immediate, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_drag_disabled_multitap_no_drag, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add("tap:palm", touchpad_tap_palm_on_idle, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:palm", touchpad_tap_palm_on_touch, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:palm", touchpad_tap_palm_on_touch_hold_timeout, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:palm", touchpad_tap_palm_on_touch_hold_move, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_ranged("tap:palm", touchpad_tap_palm_on_tapped, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); - litest_add_ranged("tap:palm", touchpad_tap_palm_on_tapped_palm_down, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); - litest_add_ranged("tap:palm", touchpad_tap_palm_on_tapped_doubletap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_multifinger_doubletap); - litest_add_ranged("tap:palm", touchpad_tap_palm_on_drag, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); - litest_add_ranged("tap:palm", touchpad_tap_palm_on_drag_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_2fg_multifinger_tap); - litest_add_ranged("tap:palm", touchpad_tap_palm_on_touch_2, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_2fg); - litest_add_ranged("tap:palm", touchpad_tap_palm_on_touch_2_retouch, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_2fg); - litest_add_ranged("tap:palm", touchpad_tap_palm_on_touch_3, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_3fg); - litest_add_ranged("tap:palm", touchpad_tap_palm_on_touch_3_retouch, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_3fg); - litest_add_ranged("tap:palm", touchpad_tap_palm_on_touch_4, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_4fg); - litest_add_ranged("tap:palm", touchpad_tap_palm_after_tap, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); - litest_add_ranged("tap:palm", touchpad_tap_palm_multitap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:palm", touchpad_tap_palm_multitap_timeout, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); - litest_add_ranged("tap:palm", touchpad_tap_palm_multitap_down_again, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &multitap_range); - litest_add_ranged("tap:palm", touchpad_tap_palm_multitap_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range); - litest_add("tap:palm", touchpad_tap_palm_click_then_tap, LITEST_CLICKPAD, LITEST_ANY); - litest_add("tap:palm", touchpad_tap_palm_dwt_tap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("tap:palm", touchpad_tap_palm_3fg_start, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_tap_palm_on_idle, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_tap_palm_on_touch, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_tap_palm_on_touch_hold_timeout, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_tap_palm_on_touch_hold_move, LITEST_TOUCHPAD, LITEST_ANY); + litest_add_ranged(touchpad_tap_palm_on_tapped, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_palm_on_tapped_palm_down, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_palm_on_tapped_doubletap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_multifinger_doubletap); + litest_add_ranged(touchpad_tap_palm_on_drag, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_palm_on_drag_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_2fg_multifinger_tap); + litest_add_ranged(touchpad_tap_palm_on_touch_2, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_2fg); + litest_add_ranged(touchpad_tap_palm_on_touch_2_retouch, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_2fg); + litest_add_ranged(touchpad_tap_palm_on_touch_3, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_3fg); + litest_add_ranged(touchpad_tap_palm_on_touch_3_retouch, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_3fg); + litest_add_ranged(touchpad_tap_palm_on_touch_4, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &range_4fg); + litest_add_ranged(touchpad_tap_palm_after_tap, LITEST_TOUCHPAD, LITEST_ANY, &range_multifinger_tap); + litest_add_ranged(touchpad_tap_palm_multitap, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged(touchpad_tap_palm_multitap_timeout, LITEST_TOUCHPAD, LITEST_ANY, &multitap_range); + litest_add_ranged(touchpad_tap_palm_multitap_down_again, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH, &multitap_range); + litest_add_ranged(touchpad_tap_palm_multitap_click, LITEST_CLICKPAD, LITEST_ANY, &multitap_range); + litest_add(touchpad_tap_palm_click_then_tap, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_tap_palm_dwt_tap, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_tap_palm_3fg_start, LITEST_TOUCHPAD, LITEST_ANY); } diff --git a/test/test-touchpad.c b/test/test-touchpad.c index f6dad237..8691f805 100644 --- a/test/test-touchpad.c +++ b/test/test-touchpad.c @@ -6994,203 +6994,203 @@ TEST_COLLECTION(touchpad) struct range twice = {0, 2 }; struct range five_fingers = {1, 6}; - litest_add("touchpad:motion", touchpad_1fg_motion, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:motion", touchpad_2fg_no_motion, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_1fg_motion, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_2fg_no_motion, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_2fg_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("touchpad:scroll", touchpad_2fg_scroll_initially_diagonal, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("touchpad:scroll", touchpad_2fg_scroll_axis_lock, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("touchpad:scroll", touchpad_2fg_scroll_axis_lock_switch, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_2fg_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_2fg_scroll_initially_diagonal, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_2fg_scroll_axis_lock, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_2fg_scroll_axis_lock_switch, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("touchpad:scroll", touchpad_2fg_scroll_slow_distance, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_2fg_scroll_return_to_motion, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_2fg_scroll_source, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_2fg_scroll_semi_mt, LITEST_SEMI_MT, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_2fg_scroll_from_btnareas, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_scroll_natural_defaults, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_scroll_natural_enable_config, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_scroll_natural_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_scroll_natural_edge, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_scroll_defaults, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_vert, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_horiz, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("touchpad:scroll", touchpad_edge_scroll_horiz_clickpad, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_no_horiz, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("touchpad:scroll", touchpad_edge_scroll_no_motion, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_no_edge_after_motion, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_timeout, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_source, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_no_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:scroll", touchpad_edge_scroll_into_buttonareas, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_within_buttonareas, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_buttonareas_click_stops_scroll, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_clickfinger_click_stops_scroll, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:scroll", touchpad_edge_scroll_into_area, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_2fg_scroll_slow_distance, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_2fg_scroll_return_to_motion, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_2fg_scroll_source, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_2fg_scroll_semi_mt, LITEST_SEMI_MT, LITEST_SINGLE_TOUCH); + litest_add(touchpad_2fg_scroll_from_btnareas, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_scroll_natural_defaults, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_scroll_natural_enable_config, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_scroll_natural_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_scroll_natural_edge, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_scroll_defaults, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_vert, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_horiz, LITEST_TOUCHPAD, LITEST_CLICKPAD); + litest_add(touchpad_edge_scroll_horiz_clickpad, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_no_horiz, LITEST_TOUCHPAD, LITEST_CLICKPAD); + litest_add(touchpad_edge_scroll_no_motion, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_no_edge_after_motion, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_timeout, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_source, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_no_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_edge_scroll_into_buttonareas, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_within_buttonareas, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_buttonareas_click_stops_scroll, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_clickfinger_click_stops_scroll, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_edge_scroll_into_area, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_at_edge, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_at_top, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); - litest_add("touchpad:palm", touchpad_palm_detect_at_bottom_corners, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("touchpad:palm", touchpad_palm_detect_at_top_corners, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); - litest_add("touchpad:palm", touchpad_palm_detect_palm_becomes_pointer, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_top_palm_becomes_pointer, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); - litest_add("touchpad:palm", touchpad_palm_detect_palm_stays_palm, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_top_palm_stays_palm, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); - litest_add("touchpad:palm", touchpad_palm_detect_no_palm_moving_into_edges, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_no_palm_moving_into_top, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); - litest_add("touchpad:palm", touchpad_palm_detect_no_tap_top_edge, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); - litest_add("touchpad:palm", touchpad_palm_detect_tap_hardbuttons, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("touchpad:palm", touchpad_palm_detect_tap_softbuttons, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_tap_clickfinger, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_no_palm_detect_at_edge_for_edge_scrolling, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("touchpad:palm", touchpad_no_palm_detect_2fg_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_both_edges, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_tool_palm, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_tool_palm_on_off, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_tool_palm_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_tool_palm_tap_after, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_at_edge, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_at_top, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); + litest_add(touchpad_palm_detect_at_bottom_corners, LITEST_TOUCHPAD, LITEST_CLICKPAD); + litest_add(touchpad_palm_detect_at_top_corners, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); + litest_add(touchpad_palm_detect_palm_becomes_pointer, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_top_palm_becomes_pointer, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); + litest_add(touchpad_palm_detect_palm_stays_palm, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_top_palm_stays_palm, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); + litest_add(touchpad_palm_detect_no_palm_moving_into_edges, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_no_palm_moving_into_top, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); + litest_add(touchpad_palm_detect_no_tap_top_edge, LITEST_TOUCHPAD, LITEST_TOPBUTTONPAD); + litest_add(touchpad_palm_detect_tap_hardbuttons, LITEST_TOUCHPAD, LITEST_CLICKPAD); + litest_add(touchpad_palm_detect_tap_softbuttons, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_tap_clickfinger, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_no_palm_detect_at_edge_for_edge_scrolling, LITEST_TOUCHPAD, LITEST_CLICKPAD); + litest_add(touchpad_no_palm_detect_2fg_scroll, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_both_edges, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_tool_palm, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_tool_palm_on_off, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_tool_palm_tap, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_tool_palm_tap_after, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_touch_size, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_touch_size_late, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_touch_size_keep_palm, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_touch_size_after_edge, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_touch_size_after_dwt, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_touch_size, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_touch_size_late, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_touch_size_keep_palm, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_touch_size_after_edge, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_touch_size_after_dwt, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_pressure, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_pressure_late_tap, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_pressure_tap_hold, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_pressure_tap_hold_2ndfg, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_move_and_tap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_detect_pressure_late, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_pressure_keep_palm, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_pressure_after_edge, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_detect_pressure_after_dwt, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:palm", touchpad_palm_clickfinger_pressure, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_clickfinger_pressure_2fg, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_clickfinger_size, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:palm", touchpad_palm_clickfinger_size_2fg, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_pressure, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_pressure_late_tap, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_pressure_tap_hold, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_pressure_tap_hold_2ndfg, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_move_and_tap, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_palm_detect_pressure_late, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_pressure_keep_palm, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_pressure_after_edge, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_detect_pressure_after_dwt, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_palm_clickfinger_pressure, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_clickfinger_pressure_2fg, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_clickfinger_size, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_palm_clickfinger_size_2fg, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:left-handed", touchpad_left_handed, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); - litest_add_for_device("touchpad:left-handed", touchpad_left_handed_appletouch, LITEST_APPLETOUCH); - litest_add("touchpad:left-handed", touchpad_left_handed_clickpad, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:left-handed", touchpad_left_handed_clickfinger, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("touchpad:left-handed", touchpad_left_handed_tapping, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:left-handed", touchpad_left_handed_tapping_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:left-handed", touchpad_left_handed_delayed, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); - litest_add("touchpad:left-handed", touchpad_left_handed_clickpad_delayed, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:left-handed", touchpad_left_handed_rotation, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_left_handed, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); + litest_add_for_device(touchpad_left_handed_appletouch, LITEST_APPLETOUCH); + litest_add(touchpad_left_handed_clickpad, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(touchpad_left_handed_clickfinger, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add(touchpad_left_handed_tapping, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_left_handed_tapping_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_left_handed_delayed, LITEST_TOUCHPAD|LITEST_BUTTON, LITEST_CLICKPAD); + litest_add(touchpad_left_handed_clickpad_delayed, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add(touchpad_left_handed_rotation, LITEST_TOUCHPAD, LITEST_ANY); /* Semi-MT hover tests aren't generic, they only work on this device and * ignore the semi-mt capability (it doesn't matter for the tests) */ - litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_noevent, LITEST_SYNAPTICS_HOVER_SEMI_MT); - litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_down, LITEST_SYNAPTICS_HOVER_SEMI_MT); - litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_down_up, LITEST_SYNAPTICS_HOVER_SEMI_MT); - litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_down_hover_down, LITEST_SYNAPTICS_HOVER_SEMI_MT); - litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_2fg_noevent, LITEST_SYNAPTICS_HOVER_SEMI_MT); - litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_2fg_1fg_down, LITEST_SYNAPTICS_HOVER_SEMI_MT); - litest_add_for_device("touchpad:semi-mt-hover", touchpad_semi_mt_hover_2fg_up, LITEST_SYNAPTICS_HOVER_SEMI_MT); + litest_add_for_device(touchpad_semi_mt_hover_noevent, LITEST_SYNAPTICS_HOVER_SEMI_MT); + litest_add_for_device(touchpad_semi_mt_hover_down, LITEST_SYNAPTICS_HOVER_SEMI_MT); + litest_add_for_device(touchpad_semi_mt_hover_down_up, LITEST_SYNAPTICS_HOVER_SEMI_MT); + litest_add_for_device(touchpad_semi_mt_hover_down_hover_down, LITEST_SYNAPTICS_HOVER_SEMI_MT); + litest_add_for_device(touchpad_semi_mt_hover_2fg_noevent, LITEST_SYNAPTICS_HOVER_SEMI_MT); + litest_add_for_device(touchpad_semi_mt_hover_2fg_1fg_down, LITEST_SYNAPTICS_HOVER_SEMI_MT); + litest_add_for_device(touchpad_semi_mt_hover_2fg_up, LITEST_SYNAPTICS_HOVER_SEMI_MT); - litest_add("touchpad:hover", touchpad_hover_noevent, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); - litest_add("touchpad:hover", touchpad_hover_down, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); - litest_add("touchpad:hover", touchpad_hover_down_up, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); - litest_add("touchpad:hover", touchpad_hover_down_hover_down, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); - litest_add("touchpad:hover", touchpad_hover_2fg_noevent, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); - litest_add("touchpad:hover", touchpad_hover_2fg_1fg_down, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); - litest_add("touchpad:hover", touchpad_hover_1fg_tap, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); + litest_add(touchpad_hover_noevent, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); + litest_add(touchpad_hover_down, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); + litest_add(touchpad_hover_down_up, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); + litest_add(touchpad_hover_down_hover_down, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); + litest_add(touchpad_hover_2fg_noevent, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); + litest_add(touchpad_hover_2fg_1fg_down, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); + litest_add(touchpad_hover_1fg_tap, LITEST_TOUCHPAD|LITEST_HOVER, LITEST_ANY); - litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_buttons, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); - litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_mb_scroll, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); - litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_mb_click, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); - litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_buttons_softbuttons, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); - litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_buttons_2fg_scroll, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); - litest_add_for_device("touchpad:trackpoint", touchpad_trackpoint_no_trackpoint, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); + litest_add_for_device(touchpad_trackpoint_buttons, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); + litest_add_for_device(touchpad_trackpoint_mb_scroll, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); + litest_add_for_device(touchpad_trackpoint_mb_click, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); + litest_add_for_device(touchpad_trackpoint_buttons_softbuttons, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); + litest_add_for_device(touchpad_trackpoint_buttons_2fg_scroll, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); + litest_add_for_device(touchpad_trackpoint_no_trackpoint, LITEST_SYNAPTICS_TRACKPOINT_BUTTONS); - litest_add_ranged("touchpad:state", touchpad_initial_state, LITEST_TOUCHPAD, LITEST_ANY, &axis_range); - litest_add_ranged("touchpad:state", touchpad_fingers_down_before_init, LITEST_TOUCHPAD, LITEST_ANY, &five_fingers); - litest_add("touchpad:state", touchpad_state_after_syn_dropped_2fg_change, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add_ranged(touchpad_initial_state, LITEST_TOUCHPAD, LITEST_ANY, &axis_range); + litest_add_ranged(touchpad_fingers_down_before_init, LITEST_TOUCHPAD, LITEST_ANY, &five_fingers); + litest_add(touchpad_state_after_syn_dropped_2fg_change, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:dwt", touchpad_dwt, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_for_device("touchpad:dwt", touchpad_dwt_ext_and_int_keyboard, LITEST_SYNAPTICS_I2C); - litest_add("touchpad:dwt", touchpad_dwt_enable_touch, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_touch_hold, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_key_hold, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_key_hold_timeout, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_key_hold_timeout_existing_touch, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_key_hold_timeout_existing_touch_cornercase, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_type, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_type_short_timeout, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_modifier_no_dwt, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_modifier_combo_no_dwt, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_modifier_combo_dwt_after, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_modifier_combo_dwt_remains, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_fkeys_no_dwt, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_tap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_tap_drag, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_click, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_edge_scroll, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("touchpad:dwt", touchpad_dwt_edge_scroll_interrupt, LITEST_TOUCHPAD, LITEST_CLICKPAD); - litest_add("touchpad:dwt", touchpad_dwt_config_default_on, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_config_default_off, LITEST_ANY, LITEST_TOUCHPAD); - litest_add("touchpad:dwt", touchpad_dwt_disabled, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_disable_during_touch, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_disable_before_touch, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_disable_during_key_release, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_disable_during_key_hold, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_enable_during_touch, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_enable_before_touch, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_enable_during_tap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:dwt", touchpad_dwt_remove_kbd_while_active, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_for_device("touchpad:dwt", touchpad_dwt_apple, LITEST_BCM5974); - litest_add_for_device("touchpad:dwt", touchpad_dwt_acer_hawaii, LITEST_ACER_HAWAII_TOUCHPAD); - litest_add_for_device("touchpad:dwt", touchpad_dwt_multiple_keyboards, LITEST_SYNAPTICS_I2C); - litest_add_for_device("touchpad:dwt", touchpad_dwt_multiple_keyboards_bothkeys, LITEST_SYNAPTICS_I2C); - litest_add_for_device("touchpad:dwt", touchpad_dwt_multiple_keyboards_bothkeys_modifier, LITEST_SYNAPTICS_I2C); - litest_add_ranged_for_device("touchpad:dwt", touchpad_dwt_multiple_keyboards_remove, LITEST_SYNAPTICS_I2C, &twice); + litest_add(touchpad_dwt, LITEST_TOUCHPAD, LITEST_ANY); + litest_add_for_device(touchpad_dwt_ext_and_int_keyboard, LITEST_SYNAPTICS_I2C); + litest_add(touchpad_dwt_enable_touch, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_touch_hold, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_key_hold, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_key_hold_timeout, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_key_hold_timeout_existing_touch, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_key_hold_timeout_existing_touch_cornercase, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_type, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_type_short_timeout, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_modifier_no_dwt, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_modifier_combo_no_dwt, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_modifier_combo_dwt_after, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_modifier_combo_dwt_remains, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_fkeys_no_dwt, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_tap, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_tap_drag, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_click, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_edge_scroll, LITEST_TOUCHPAD, LITEST_CLICKPAD); + litest_add(touchpad_dwt_edge_scroll_interrupt, LITEST_TOUCHPAD, LITEST_CLICKPAD); + litest_add(touchpad_dwt_config_default_on, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_config_default_off, LITEST_ANY, LITEST_TOUCHPAD); + litest_add(touchpad_dwt_disabled, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_disable_during_touch, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_disable_before_touch, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_disable_during_key_release, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_disable_during_key_hold, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_enable_during_touch, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_enable_before_touch, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_enable_during_tap, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_dwt_remove_kbd_while_active, LITEST_TOUCHPAD, LITEST_ANY); + litest_add_for_device(touchpad_dwt_apple, LITEST_BCM5974); + litest_add_for_device(touchpad_dwt_acer_hawaii, LITEST_ACER_HAWAII_TOUCHPAD); + litest_add_for_device(touchpad_dwt_multiple_keyboards, LITEST_SYNAPTICS_I2C); + litest_add_for_device(touchpad_dwt_multiple_keyboards_bothkeys, LITEST_SYNAPTICS_I2C); + litest_add_for_device(touchpad_dwt_multiple_keyboards_bothkeys_modifier, LITEST_SYNAPTICS_I2C); + litest_add_ranged_for_device(touchpad_dwt_multiple_keyboards_remove, LITEST_SYNAPTICS_I2C, &twice); - litest_add("touchpad:thumb", touchpad_thumb_lower_area_movement, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:thumb", touchpad_thumb_lower_area_movement_rethumb, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:thumb", touchpad_thumb_speed_empty_slots, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:thumb", touchpad_thumb_area_clickfinger, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:thumb", touchpad_thumb_area_btnarea, LITEST_CLICKPAD, LITEST_ANY); - litest_add("touchpad:thumb", touchpad_thumb_no_doublethumb, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_thumb_lower_area_movement, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_thumb_lower_area_movement_rethumb, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_thumb_speed_empty_slots, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_thumb_area_clickfinger, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_thumb_area_btnarea, LITEST_CLICKPAD, LITEST_ANY); + litest_add(touchpad_thumb_no_doublethumb, LITEST_CLICKPAD, LITEST_ANY); - litest_add_for_device("touchpad:bugs", touchpad_tool_tripletap_touch_count, LITEST_SYNAPTICS_TOPBUTTONPAD); - litest_add_for_device("touchpad:bugs", touchpad_tool_tripletap_touch_count_late, LITEST_SYNAPTICS_TOPBUTTONPAD); - litest_add_for_device("touchpad:bugs", touchpad_slot_swap, LITEST_SYNAPTICS_TOPBUTTONPAD); - litest_add_for_device("touchpad:bugs", touchpad_finger_always_down, LITEST_SYNAPTICS_TOPBUTTONPAD); + litest_add_for_device(touchpad_tool_tripletap_touch_count, LITEST_SYNAPTICS_TOPBUTTONPAD); + litest_add_for_device(touchpad_tool_tripletap_touch_count_late, LITEST_SYNAPTICS_TOPBUTTONPAD); + litest_add_for_device(touchpad_slot_swap, LITEST_SYNAPTICS_TOPBUTTONPAD); + litest_add_for_device(touchpad_finger_always_down, LITEST_SYNAPTICS_TOPBUTTONPAD); - litest_add("touchpad:time", touchpad_time_usec, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_time_usec, LITEST_TOUCHPAD, LITEST_ANY); - litest_add_for_device("touchpad:jumps", touchpad_jump_finger_motion, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("touchpad:jumps", touchpad_jump_delta, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(touchpad_jump_finger_motion, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(touchpad_jump_delta, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("touchpad:sendevents", touchpad_disabled_on_mouse, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("touchpad:sendevents", touchpad_disabled_on_mouse_suspend_mouse, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("touchpad:sendevents", touchpad_disabled_double_mouse, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("touchpad:sendevents", touchpad_disabled_double_mouse_one_suspended, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(touchpad_disabled_on_mouse, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(touchpad_disabled_on_mouse_suspend_mouse, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(touchpad_disabled_double_mouse, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(touchpad_disabled_double_mouse_one_suspended, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add("touchpad:pressure", touchpad_pressure, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:pressure", touchpad_pressure_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:pressure", touchpad_pressure_2fg_st, LITEST_TOUCHPAD|LITEST_SINGLE_TOUCH, LITEST_ANY); - litest_add("touchpad:pressure", touchpad_pressure_tap, LITEST_TOUCHPAD, LITEST_ANY); - litest_add("touchpad:pressure", touchpad_pressure_tap_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:pressure", touchpad_pressure_tap_2fg_1fg_light, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:pressure", touchpad_pressure_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); - litest_add("touchpad:pressure", touchpad_pressure_semi_mt_2fg_goes_light, LITEST_SEMI_MT, LITEST_ANY); + litest_add(touchpad_pressure, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_pressure_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_pressure_2fg_st, LITEST_TOUCHPAD|LITEST_SINGLE_TOUCH, LITEST_ANY); + litest_add(touchpad_pressure_tap, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_pressure_tap_2fg, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_pressure_tap_2fg_1fg_light, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_pressure_btntool, LITEST_TOUCHPAD, LITEST_SINGLE_TOUCH); + litest_add(touchpad_pressure_semi_mt_2fg_goes_light, LITEST_SEMI_MT, LITEST_ANY); - litest_add("touchpad:touch-size", touchpad_touch_size, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("touchpad:touch-size", touchpad_touch_size_2fg, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add(touchpad_touch_size, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add(touchpad_touch_size_2fg, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("touchpad:speed", touchpad_speed_ignore_finger, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("touchpad:speed", touchpad_speed_allow_nearby_finger, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add("touchpad:speed", touchpad_speed_ignore_finger_edgescroll, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); - litest_add_for_device("touchpad:speed", touchpad_speed_ignore_hovering_finger, LITEST_BCM5974); + litest_add(touchpad_speed_ignore_finger, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_speed_allow_nearby_finger, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add(touchpad_speed_ignore_finger_edgescroll, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH|LITEST_SEMI_MT); + litest_add_for_device(touchpad_speed_ignore_hovering_finger, LITEST_BCM5974); - litest_add_ranged("touchpad:suspend", touchpad_suspend_abba, LITEST_TOUCHPAD, LITEST_ANY, &suspends); - litest_add_ranged("touchpad:suspend", touchpad_suspend_abab, LITEST_TOUCHPAD, LITEST_ANY, &suspends); + litest_add_ranged(touchpad_suspend_abba, LITEST_TOUCHPAD, LITEST_ANY, &suspends); + litest_add_ranged(touchpad_suspend_abab, LITEST_TOUCHPAD, LITEST_ANY, &suspends); /* Happens on the "Wacom Intuos Pro M Finger" but our test device * has the same properties */ - litest_add_for_device("touchpad:bugs", touchpad_end_start_touch, LITEST_WACOM_FINGER); + litest_add_for_device(touchpad_end_start_touch, LITEST_WACOM_FINGER); - litest_add("touchpad:fuzz", touchpad_fuzz, LITEST_TOUCHPAD, LITEST_ANY); + litest_add(touchpad_fuzz, LITEST_TOUCHPAD, LITEST_ANY); } diff --git a/test/test-trackball.c b/test/test-trackball.c index 55025850..2f455bb9 100644 --- a/test/test-trackball.c +++ b/test/test-trackball.c @@ -261,12 +261,12 @@ END_TEST TEST_COLLECTION(trackball) { - litest_add("trackball:rotation", trackball_rotation_config_defaults, LITEST_TRACKBALL, LITEST_ANY); - litest_add("trackball:rotation", trackball_rotation_config_invalid_range, LITEST_TRACKBALL, LITEST_ANY); - litest_add("trackball:rotation", trackball_rotation_config_no_rotation, LITEST_ANY, LITEST_TRACKBALL); - litest_add("trackball:rotation", trackball_rotation_config_right_angle, LITEST_TRACKBALL, LITEST_ANY); - litest_add("trackball:rotation", trackball_rotation_config_odd_angle, LITEST_TRACKBALL, LITEST_ANY); - litest_add("trackball:rotation", trackball_rotation_x, LITEST_TRACKBALL, LITEST_ANY); - litest_add("trackball:rotation", trackball_rotation_y, LITEST_TRACKBALL, LITEST_ANY); - litest_add("trackball:rotation", trackball_rotation_accel, LITEST_TRACKBALL, LITEST_ANY); + litest_add(trackball_rotation_config_defaults, LITEST_TRACKBALL, LITEST_ANY); + litest_add(trackball_rotation_config_invalid_range, LITEST_TRACKBALL, LITEST_ANY); + litest_add(trackball_rotation_config_no_rotation, LITEST_ANY, LITEST_TRACKBALL); + litest_add(trackball_rotation_config_right_angle, LITEST_TRACKBALL, LITEST_ANY); + litest_add(trackball_rotation_config_odd_angle, LITEST_TRACKBALL, LITEST_ANY); + litest_add(trackball_rotation_x, LITEST_TRACKBALL, LITEST_ANY); + litest_add(trackball_rotation_y, LITEST_TRACKBALL, LITEST_ANY); + litest_add(trackball_rotation_accel, LITEST_TRACKBALL, LITEST_ANY); } diff --git a/test/test-trackpoint.c b/test/test-trackpoint.c index 66e58249..87984dfa 100644 --- a/test/test-trackpoint.c +++ b/test/test-trackpoint.c @@ -410,16 +410,16 @@ END_TEST TEST_COLLECTION(trackpoint) { - litest_add("trackpoint:middlebutton", trackpoint_middlebutton, LITEST_POINTINGSTICK, LITEST_ANY); - litest_add("trackpoint:middlebutton", trackpoint_middlebutton_noscroll, LITEST_POINTINGSTICK, LITEST_ANY); - litest_add("trackpoint:scroll", trackpoint_scroll, LITEST_POINTINGSTICK, LITEST_ANY); - litest_add("trackpoint:scroll", trackpoint_scroll_source, LITEST_POINTINGSTICK, LITEST_ANY); - litest_add("trackpoint:left-handed", trackpoint_topsoftbuttons_left_handed_trackpoint, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("trackpoint:left-handed", trackpoint_topsoftbuttons_left_handed_touchpad, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("trackpoint:left-handed", trackpoint_topsoftbuttons_left_handed_both, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(trackpoint_middlebutton, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add(trackpoint_middlebutton_noscroll, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add(trackpoint_scroll, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add(trackpoint_scroll_source, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add(trackpoint_topsoftbuttons_left_handed_trackpoint, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(trackpoint_topsoftbuttons_left_handed_touchpad, LITEST_TOPBUTTONPAD, LITEST_ANY); + litest_add(trackpoint_topsoftbuttons_left_handed_both, LITEST_TOPBUTTONPAD, LITEST_ANY); - litest_add("trackpoint:palmdetect", trackpoint_palmdetect, LITEST_POINTINGSTICK, LITEST_ANY); - litest_add("trackpoint:palmdetect", trackpoint_palmdetect_resume_touch, LITEST_POINTINGSTICK, LITEST_ANY); - litest_add("trackpoint:palmdetect", trackpoint_palmdetect_require_min_events, LITEST_POINTINGSTICK, LITEST_ANY); - litest_add("trackpoint:palmdetect", trackpoint_palmdetect_require_min_events_timeout, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add(trackpoint_palmdetect, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add(trackpoint_palmdetect_resume_touch, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add(trackpoint_palmdetect_require_min_events, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add(trackpoint_palmdetect_require_min_events_timeout, LITEST_POINTINGSTICK, LITEST_ANY); } diff --git a/test/test-udev.c b/test/test-udev.c index 592109c6..ad86d14b 100644 --- a/test/test-udev.c +++ b/test/test-udev.c @@ -674,25 +674,25 @@ END_TEST TEST_COLLECTION(udev) { - litest_add_no_device("udev:create", udev_create_NULL); - litest_add_no_device("udev:create", udev_create_seat0); - litest_add_no_device("udev:create", udev_create_empty_seat); - litest_add_no_device("udev:create", udev_create_seat_too_long); - litest_add_no_device("udev:create", udev_set_user_data); + litest_add_no_device(udev_create_NULL); + litest_add_no_device(udev_create_seat0); + litest_add_no_device(udev_create_empty_seat); + litest_add_no_device(udev_create_seat_too_long); + litest_add_no_device(udev_set_user_data); - litest_add_no_device("udev:seat", udev_added_seat_default); - litest_add_no_device("udev:seat", udev_change_seat); + litest_add_no_device(udev_added_seat_default); + litest_add_no_device(udev_change_seat); - litest_add_for_device("udev:suspend", udev_double_suspend, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("udev:suspend", udev_double_resume, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("udev:suspend", udev_suspend_resume, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("udev:suspend", udev_resume_before_seat, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("udev:suspend", udev_suspend_resume_before_seat, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("udev:device events", udev_device_sysname, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_for_device("udev:seat", udev_seat_recycle, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(udev_double_suspend, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(udev_double_resume, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(udev_suspend_resume, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(udev_resume_before_seat, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(udev_suspend_resume_before_seat, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(udev_device_sysname, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_for_device(udev_seat_recycle, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_no_device("udev:path", udev_path_add_device); - litest_add_for_device("udev:path", udev_path_remove_device, LITEST_SYNAPTICS_CLICKPAD_X220); + litest_add_no_device(udev_path_add_device); + litest_add_for_device(udev_path_remove_device, LITEST_SYNAPTICS_CLICKPAD_X220); - litest_add_no_device("udev:ignore", udev_ignore_device); + litest_add_no_device(udev_ignore_device); }