diff --git a/test/litest.c b/test/litest.c index c19d7a95..84c6ea39 100644 --- a/test/litest.c +++ b/test/litest.c @@ -682,7 +682,7 @@ void litest_set_current_device(struct litest_device *device) void litest_generic_device_teardown(void) { - litest_delete_device(current_device); + litest_device_destroy(current_device); current_device = NULL; } @@ -2284,7 +2284,7 @@ udev_wait_for_device_event(struct udev_monitor *udev_monitor, } void -litest_delete_device(struct litest_device *d) +litest_device_destroy(struct litest_device *d) { _unref_(udev_monitor) *udev_monitor = NULL; diff --git a/test/litest.h b/test/litest.h index 85a32627..e65f8597 100644 --- a/test/litest.h +++ b/test/litest.h @@ -809,7 +809,7 @@ void litest_ungrab_device(struct litest_device *d); void -litest_delete_device(struct litest_device *d); +litest_device_destroy(struct litest_device *d); const char * litest_event_type_str(enum libinput_event_type type); diff --git a/test/test-device.c b/test/test-device.c index f1e73849..658c876b 100644 --- a/test/test-device.c +++ b/test/test-device.c @@ -174,7 +174,7 @@ START_TEST(device_disable) LIBINPUT_EVENT_POINTER_MOTION); libinput_event_destroy(event); - litest_delete_device(tmp); + litest_device_destroy(tmp); } END_TEST @@ -428,7 +428,7 @@ START_TEST(device_reenable_syspath_changed) litest_drain_events(li); - litest_delete_device(litest_device); + litest_device_destroy(litest_device); litest_drain_events(li); litest_device = litest_add_device(li, LITEST_MOUSE); @@ -450,7 +450,7 @@ START_TEST(device_reenable_syspath_changed) libinput_event_destroy(event); } - litest_delete_device(litest_device); + litest_device_destroy(litest_device); libinput_device_unref(device1); } END_TEST @@ -472,7 +472,7 @@ START_TEST(device_reenable_device_removed) litest_drain_events(li); - litest_delete_device(litest_device); + litest_device_destroy(litest_device); litest_drain_events(li); status = libinput_device_config_send_events_set_mode(device, @@ -733,7 +733,7 @@ START_TEST(device_disable_topsoftbutton) litest_assert_empty_queue(li); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST @@ -829,7 +829,7 @@ START_TEST(device_group_ref) libinput_device_ref(device); litest_drain_events(li); - litest_delete_device(dev); + litest_device_destroy(dev); litest_drain_events(li); /* make sure the device is dead but the group is still around */ @@ -1512,7 +1512,7 @@ START_TEST(device_quirks) litest_disable_log_handler(li); - litest_delete_device(dev); + litest_device_destroy(dev); } END_TEST @@ -1673,7 +1673,7 @@ START_TEST(device_button_down_remove) litest_event(dev, EV_SYN, SYN_REPORT, 0); litest_dispatch(li); - litest_delete_device(dev); + litest_device_destroy(dev); litest_dispatch(li); while ((event = libinput_get_event(li))) { diff --git a/test/test-keyboard.c b/test/test-keyboard.c index 1292565e..2bf04f67 100644 --- a/test/test-keyboard.c +++ b/test/test-keyboard.c @@ -94,7 +94,7 @@ START_TEST(keyboard_seat_key_count) litest_assert_int_eq(seat_key_count, 0); for (i = 0; i < num_devices; ++i) - litest_delete_device(devices[i]); + litest_device_destroy(devices[i]); } END_TEST @@ -150,7 +150,7 @@ START_TEST(keyboard_ignore_no_pressed_release) } litest_assert_empty_queue(libinput); - litest_delete_device(dev); + litest_device_destroy(dev); } END_TEST @@ -213,7 +213,7 @@ START_TEST(keyboard_key_auto_release) litest_drain_events(libinput); /* "Disconnect" device */ - litest_delete_device(dev); + litest_device_destroy(dev); /* Mark all released keys until device is removed */ while (1) { diff --git a/test/test-misc.c b/test/test-misc.c index ee20e68b..519a1cfb 100644 --- a/test/test-misc.c +++ b/test/test-misc.c @@ -784,8 +784,8 @@ START_TEST(timer_flush) litest_assert_button_event(li, BTN_LEFT, LIBINPUT_BUTTON_STATE_RELEASED); - litest_delete_device(keyboard); - litest_delete_device(touchpad); + litest_device_destroy(keyboard); + litest_device_destroy(touchpad); } END_TEST diff --git a/test/test-path.c b/test/test-path.c index f764a9c5..9005a4bf 100644 --- a/test/test-path.c +++ b/test/test-path.c @@ -1000,7 +1000,7 @@ START_TEST(path_ignore_device) device = libinput_path_add_device(li, path); litest_assert(device == NULL); - litest_delete_device(dev); + litest_device_destroy(dev); } END_TEST diff --git a/test/test-pointer.c b/test/test-pointer.c index 8aabcf5d..e949f9d6 100644 --- a/test/test-pointer.c +++ b/test/test-pointer.c @@ -469,7 +469,7 @@ START_TEST(pointer_button_auto_release) litest_drain_events(libinput); /* "Disconnect" device */ - litest_delete_device(dev); + litest_device_destroy(dev); /* Mark all released buttons until device is removed */ while (1) { @@ -1200,7 +1200,7 @@ START_TEST(pointer_seat_button_count) litest_assert_int_eq(seat_button_count, 0); for (i = 0; i < num_devices; ++i) - litest_delete_device(devices[i]); + litest_device_destroy(devices[i]); } END_TEST @@ -1371,7 +1371,7 @@ START_TEST(pointer_left_handed_disable_with_button_down) BTN_RIGHT, LIBINPUT_BUTTON_STATE_PRESSED); - litest_delete_device(dev); + litest_device_destroy(dev); litest_dispatch(li); litest_assert_button_event(li, @@ -1573,7 +1573,7 @@ START_TEST(pointer_scroll_button_device_remove_while_down) litest_dispatch(li); /* delete the device while the timer is still active */ - litest_delete_device(dev); + litest_device_destroy(dev); litest_dispatch(li); } END_TEST @@ -3662,7 +3662,7 @@ START_TEST(debounce_remove_device_button_up) litest_dispatch(li); /* delete the device while the timer is still active */ - litest_delete_device(dev); + litest_device_destroy(dev); litest_timeout_debounce(li); } @@ -3682,7 +3682,7 @@ START_TEST(debounce_remove_device_button_down) litest_dispatch(li); /* delete the device the timer is still active */ - litest_delete_device(dev); + litest_device_destroy(dev); litest_timeout_debounce(li); } diff --git a/test/test-switch.c b/test/test-switch.c index 56c8675a..31d86a69 100644 --- a/test/test-switch.c +++ b/test/test-switch.c @@ -302,7 +302,7 @@ START_TEST(switch_disable_touchpad) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); litest_ungrab_device(sw); } END_TEST @@ -334,7 +334,7 @@ START_TEST(switch_disable_touchpad_during_touch) litest_touch_up(touchpad, 0); litest_assert_empty_queue(li); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -372,7 +372,7 @@ START_TEST(switch_disable_touchpad_edge_scroll) litest_dispatch(li); litest_assert_empty_queue(li); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -412,7 +412,7 @@ START_TEST(switch_disable_touchpad_edge_scroll_interrupt) litest_is_switch_event(event, which, LIBINPUT_SWITCH_STATE_ON); libinput_event_destroy(event); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -446,7 +446,7 @@ START_TEST(switch_disable_touchpad_already_open) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -486,7 +486,7 @@ START_TEST(switch_dont_resume_disabled_touchpad) litest_touch_up(touchpad, 0); litest_assert_empty_queue(li); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -532,8 +532,8 @@ START_TEST(switch_dont_resume_disabled_touchpad_external_mouse) litest_touch_up(touchpad, 0); litest_assert_empty_queue(li); - litest_delete_device(touchpad); - litest_delete_device(mouse); + litest_device_destroy(touchpad); + litest_device_destroy(mouse); } END_TEST @@ -577,7 +577,7 @@ START_TEST(lid_open_on_key) } litest_ungrab_device(sw); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -616,8 +616,8 @@ START_TEST(lid_open_on_key_touchpad_enabled) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); - litest_delete_device(touchpad); + litest_device_destroy(keyboard); + litest_device_destroy(touchpad); } END_TEST @@ -652,10 +652,10 @@ START_TEST(switch_suspend_with_keyboard) litest_drain_events(li); litest_ungrab_device(sw); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); litest_drain_events(li); - litest_delete_device(sw); + litest_device_destroy(sw); litest_dispatch(li); } END_TEST @@ -690,9 +690,9 @@ START_TEST(switch_suspend_with_touchpad) litest_drain_events(li); litest_ungrab_device(sw); - litest_delete_device(sw); + litest_device_destroy(sw); litest_drain_events(li); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); litest_drain_events(li); } END_TEST @@ -745,7 +745,7 @@ START_TEST(lid_update_hw_on_key) rc = libevdev_next_event(evdev, LIBEVDEV_READ_FLAG_NORMAL, &event); litest_assert_int_eq(rc, -EAGAIN); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -808,7 +808,7 @@ START_TEST(lid_update_hw_on_key_closed_on_init) rc = libevdev_next_event(evdev, LIBEVDEV_READ_FLAG_NORMAL, &event); litest_assert_int_eq(rc, -EAGAIN); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -865,8 +865,8 @@ START_TEST(lid_update_hw_on_key_multiple_keyboards) rc = libevdev_next_event(evdev, LIBEVDEV_READ_FLAG_NORMAL, &event); litest_assert_int_eq(rc, -EAGAIN); - litest_delete_device(keyboard1); - litest_delete_device(keyboard2); + litest_device_destroy(keyboard1); + litest_device_destroy(keyboard2); } END_TEST @@ -923,7 +923,7 @@ START_TEST(tablet_mode_disable_touchpad_on_init) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); litest_ungrab_device(sw); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -992,7 +992,7 @@ START_TEST(tablet_mode_disable_touchpad_on_resume) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -1048,7 +1048,7 @@ START_TEST(tablet_mode_enable_touchpad_on_resume) litest_touch_up(touchpad, 0); litest_assert_empty_queue(li); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -1101,7 +1101,7 @@ START_TEST(tablet_mode_disable_keyboard) litest_assert_key_event(li, KEY_B, LIBINPUT_KEY_STATE_PRESSED); litest_assert_key_event(li, KEY_B, LIBINPUT_KEY_STATE_RELEASED); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -1136,7 +1136,7 @@ START_TEST(tablet_mode_disable_keyboard_on_init) litest_keyboard_key(keyboard, KEY_A, false); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -1204,7 +1204,7 @@ START_TEST(tablet_mode_disable_keyboard_on_resume) litest_keyboard_key(keyboard, KEY_A, false); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -1248,7 +1248,7 @@ START_TEST(tablet_mode_enable_keyboard_on_resume) litest_keyboard_key(keyboard, KEY_A, false); litest_assert_empty_queue(li); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -1294,7 +1294,7 @@ START_TEST(tablet_mode_disable_trackpoint) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); litest_ungrab_device(sw); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST @@ -1335,7 +1335,7 @@ START_TEST(tablet_mode_disable_trackpoint_on_init) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); litest_ungrab_device(sw); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST diff --git a/test/test-tablet.c b/test/test-tablet.c index c2cf1045..871f7221 100644 --- a/test/test-tablet.c +++ b/test/test-tablet.c @@ -172,7 +172,7 @@ START_TEST(button_seat_count) libinput_event_destroy(event); litest_assert_empty_queue(li); - litest_delete_device(dev2); + litest_device_destroy(dev2); } END_TEST @@ -197,7 +197,7 @@ START_TEST(button_up_on_delete) } litest_drain_events(li); - litest_delete_device(dev); + litest_device_destroy(dev); litest_dispatch(li); for (code = BTN_LEFT; code <= BTN_TASK; code++) { @@ -946,7 +946,7 @@ START_TEST(tip_up_on_delete) litest_tablet_tip_down(dev, 10, 10, axes); litest_drain_events(li); - litest_delete_device(dev); + litest_device_destroy(dev); litest_dispatch(li); event = libinput_get_event(li); @@ -1711,7 +1711,7 @@ START_TEST(proximity_out_on_delete) litest_tablet_proximity_in(dev, 10, 10, NULL); litest_drain_events(li); - litest_delete_device(dev); + litest_device_destroy(dev); litest_dispatch(li); litest_assert_tablet_proximity_event(li, @@ -2595,8 +2595,8 @@ START_TEST(tools_with_serials) litest_assert_notnull(tool[1]); litest_assert_ptr_eq(tool[0], tool[1]); - litest_delete_device(dev[0]); - litest_delete_device(dev[1]); + litest_device_destroy(dev[0]); + litest_device_destroy(dev[1]); } END_TEST @@ -2638,8 +2638,8 @@ START_TEST(tools_without_serials) litest_assert_notnull(tool[1]); litest_assert_ptr_ne(tool[0], tool[1]); - litest_delete_device(dev[0]); - litest_delete_device(dev[1]); + litest_device_destroy(dev[0]); + litest_device_destroy(dev[1]); } END_TEST @@ -2786,8 +2786,8 @@ START_TEST(tool_capabilities) libinput_event_destroy(event); litest_assert_empty_queue(li); - litest_delete_device(bamboo); - litest_delete_device(intuos); + litest_device_destroy(bamboo); + litest_device_destroy(intuos); } END_TEST @@ -5098,7 +5098,7 @@ START_TEST(tablet_pressure_across_multiple_tablets) litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); } - litest_delete_device(mobilestudio); + litest_device_destroy(mobilestudio); } END_TEST @@ -5127,7 +5127,7 @@ START_TEST(tablet_pressure_after_unplug) litest_tablet_proximity_out(dev); litest_checkpoint("Unplugging/replugging device"); - litest_delete_device(dev); + litest_device_destroy(dev); litest_dispatch(li); litest_drain_events(li); dev = litest_add_device(li, LITEST_WACOM_CINTIQ_PRO16_PEN); @@ -5181,7 +5181,7 @@ START_TEST(tablet_pressure_after_unplug) litest_timeout_tablet_proxout(li); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); - litest_delete_device(dev); + litest_device_destroy(dev); } END_TEST @@ -5898,7 +5898,7 @@ START_TEST(touch_arbitration) assert_touch_is_arbitrated(dev, finger); - litest_delete_device(finger); + litest_device_destroy(finger); } END_TEST @@ -5978,7 +5978,7 @@ START_TEST(touch_arbitration_outside_rect) litest_assert_touch_sequence(li); #endif - litest_delete_device(finger); + litest_device_destroy(finger); } END_TEST @@ -6018,7 +6018,7 @@ START_TEST(touch_arbitration_remove_after) /* Delete the device immediately after the tablet goes out of prox. * This merely tests that the arbitration timer gets cleaned up */ - litest_delete_device(finger); + litest_device_destroy(finger); } END_TEST @@ -6105,7 +6105,7 @@ START_TEST(touch_arbitration_stop_touch) else litest_assert_touch_sequence(li); - litest_delete_device(finger); + litest_device_destroy(finger); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); } END_TEST @@ -6161,7 +6161,7 @@ START_TEST(touch_arbitration_suspend_touch_device) litest_assert_empty_queue(li); /* Remove tablet device to unpair, still disabled though */ - litest_delete_device(tablet); + litest_device_destroy(tablet); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); @@ -6226,7 +6226,7 @@ START_TEST(touch_arbitration_remove_touch) litest_tablet_proximity_in(dev, 10, 10, axes); litest_drain_events(li); - litest_delete_device(finger); + litest_device_destroy(finger); litest_dispatch(li); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); litest_assert_empty_queue(li); @@ -6278,7 +6278,7 @@ START_TEST(touch_arbitration_remove_tablet) litest_touch_move_to(dev, 0, 30, 30, 80, 80, 10); litest_assert_empty_queue(li); - litest_delete_device(tablet); + litest_device_destroy(tablet); litest_assert_tablet_proximity_event(li, LIBINPUT_TABLET_TOOL_PROXIMITY_STATE_OUT); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); @@ -6345,7 +6345,7 @@ START_TEST(touch_arbitration_keep_ignoring) litest_assert_empty_queue(li); - litest_delete_device(finger); + litest_device_destroy(finger); } END_TEST @@ -6400,7 +6400,7 @@ START_TEST(touch_arbitration_late_touch_lift) litest_assert_empty_queue(li); - litest_delete_device(finger); + litest_device_destroy(finger); } END_TEST @@ -6438,8 +6438,8 @@ START_TEST(touch_arbitration_swap_device) litest_drain_events(li); assert_touch_is_arbitrated(tablet, finger); - litest_delete_device(touchscreen); - litest_delete_device(finger); + litest_device_destroy(touchscreen); + litest_device_destroy(finger); } END_TEST @@ -6609,7 +6609,7 @@ START_TEST(tablet_rotation_left_handed) verify_left_handed_touch_sequence(finger, li, enabled_to); out: - litest_delete_device(finger); + litest_device_destroy(finger); #endif } END_TEST @@ -6663,7 +6663,7 @@ START_TEST(tablet_rotation_left_handed_configuration) litest_assert_int_eq(touch_enabled, touch_to); out: - litest_delete_device(finger); + litest_device_destroy(finger); #endif } END_TEST @@ -6763,7 +6763,7 @@ START_TEST(tablet_rotation_left_handed_while_in_prox) verify_left_handed_touch_sequence(finger, li, enabled_to); out: - litest_delete_device(finger); + litest_device_destroy(finger); #endif } END_TEST @@ -6832,7 +6832,7 @@ START_TEST(tablet_rotation_left_handed_while_touch_down) verify_left_handed_touch_sequence(finger, li, enabled_to); out: - litest_delete_device(finger); + litest_device_destroy(finger); #endif } END_TEST @@ -6887,7 +6887,7 @@ START_TEST(tablet_rotation_left_handed_add_touchpad) verify_left_handed_tablet_sequence(tablet, li, enabled_to); out: - litest_delete_device(finger); + litest_device_destroy(finger); #endif } END_TEST @@ -6940,7 +6940,7 @@ START_TEST(tablet_rotation_left_handed_add_tablet) verify_left_handed_touch_sequence(finger, li, enabled_to); verify_left_handed_tablet_sequence(tablet, li, enabled_to); - litest_delete_device(tablet); + litest_device_destroy(tablet); #endif } END_TEST diff --git a/test/test-totem.c b/test/test-totem.c index 1896da5a..8ce22130 100644 --- a/test/test-totem.c +++ b/test/test-totem.c @@ -455,7 +455,7 @@ START_TEST(totem_button_up_on_delete) litest_button_click(dev, BTN_0, true); litest_drain_events(li); - litest_delete_device(dev); + litest_device_destroy(dev); litest_dispatch(li); litest_assert_tablet_button_event(li, @@ -503,7 +503,7 @@ START_TEST(totem_arbitration_below) litest_touch_up(touch, 0); litest_assert_empty_queue(li); - litest_delete_device(touch); + litest_device_destroy(touch); } END_TEST @@ -529,7 +529,7 @@ START_TEST(totem_arbitration_during) litest_assert_empty_queue(li); } - litest_delete_device(touch); + litest_device_destroy(touch); } END_TEST @@ -564,7 +564,7 @@ START_TEST(totem_arbitration_outside_rect) litest_assert_touch_sequence(li); - litest_delete_device(touch); + litest_device_destroy(touch); } END_TEST diff --git a/test/test-touch.c b/test/test-touch.c index 0a48be00..3cc66139 100644 --- a/test/test-touch.c +++ b/test/test-touch.c @@ -130,7 +130,7 @@ START_TEST(touch_abs_transform) litest_assert(tested); - litest_delete_device(dev); + litest_device_destroy(dev); } END_TEST @@ -199,7 +199,7 @@ START_TEST(touch_seat_slot) litest_touch_up(dev1, 1); touch_assert_seat_slot(li, LIBINPUT_EVENT_TOUCH_UP, 1, 3); - litest_delete_device(dev2); + litest_device_destroy(dev2); } END_TEST @@ -257,7 +257,7 @@ START_TEST(touch_many_slots) litest_assert_int_eq(slot_count, 0); - litest_delete_device(dev); + litest_device_destroy(dev); } END_TEST @@ -980,7 +980,7 @@ START_TEST(touch_release_on_unplug) litest_drain_events(li); /* Touch is still down when device is removed, expect a release */ - litest_delete_device(dev); + litest_device_destroy(dev); litest_dispatch(li); ev = libinput_get_event(li); diff --git a/test/test-touchpad-buttons.c b/test/test-touchpad-buttons.c index 2cfdaa08..c6437d92 100644 --- a/test/test-touchpad-buttons.c +++ b/test/test-touchpad-buttons.c @@ -1956,7 +1956,7 @@ START_TEST(clickpad_topsoftbuttons_clickfinger_dev_disabled) BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST diff --git a/test/test-touchpad-tap.c b/test/test-touchpad-tap.c index ac021b09..eb1308ee 100644 --- a/test/test-touchpad-tap.c +++ b/test/test-touchpad-tap.c @@ -5578,7 +5578,7 @@ START_TEST(touchpad_tap_palm_dwt_tap) litest_assert_empty_queue(li); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST diff --git a/test/test-touchpad.c b/test/test-touchpad.c index 785f2886..87099d73 100644 --- a/test/test-touchpad.c +++ b/test/test-touchpad.c @@ -2136,7 +2136,7 @@ START_TEST(touchpad_palm_detect_pressure_after_dwt) litest_assert_empty_queue(li); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -3334,7 +3334,7 @@ START_TEST(touchpad_trackpoint_buttons) LIBINPUT_BUTTON_STATE_RELEASED); } - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST @@ -3363,7 +3363,7 @@ START_TEST(touchpad_trackpoint_mb_scroll) litest_assert_only_axis_events(li, LIBINPUT_EVENT_POINTER_SCROLL_CONTINUOUS); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST @@ -3391,7 +3391,7 @@ START_TEST(touchpad_trackpoint_mb_click) assert_btnevent_from_device(trackpoint, BTN_MIDDLE, LIBINPUT_BUTTON_STATE_RELEASED); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST @@ -3446,7 +3446,7 @@ START_TEST(touchpad_trackpoint_buttons_softbuttons) BTN_RIGHT, LIBINPUT_BUTTON_STATE_RELEASED); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST @@ -3534,7 +3534,7 @@ START_TEST(touchpad_trackpoint_buttons_2fg_scroll) LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL, -1); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST @@ -3765,7 +3765,7 @@ START_TEST(touchpad_dwt) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -3806,8 +3806,8 @@ START_TEST(touchpad_dwt_ext_and_int_keyboard) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); - litest_delete_device(yubikey); + litest_device_destroy(keyboard); + litest_device_destroy(yubikey); } END_TEST @@ -3845,7 +3845,7 @@ START_TEST(touchpad_dwt_enable_touch) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -3882,7 +3882,7 @@ START_TEST(touchpad_dwt_touch_hold) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -3910,7 +3910,7 @@ START_TEST(touchpad_dwt_key_hold) litest_keyboard_key(keyboard, KEY_A, false); litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -3953,7 +3953,7 @@ START_TEST(touchpad_dwt_key_hold_timeout) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4008,7 +4008,7 @@ START_TEST(touchpad_dwt_key_hold_timeout_existing_touch_cornercase) * can be removed */ litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4047,7 +4047,7 @@ START_TEST(touchpad_dwt_key_hold_timeout_existing_touch) litest_touch_up(touchpad, 0); litest_assert_empty_queue(li); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4085,7 +4085,7 @@ START_TEST(touchpad_dwt_type) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4123,7 +4123,7 @@ START_TEST(touchpad_dwt_type_short_timeout) litest_touch_up(touchpad, 0); litest_assert_empty_queue(li); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4171,7 +4171,7 @@ START_TEST(touchpad_dwt_modifier_no_dwt) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); } - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4214,7 +4214,7 @@ START_TEST(touchpad_dwt_shift_combo_triggers_dwt) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4261,7 +4261,7 @@ START_TEST(touchpad_dwt_modifier_combo_no_dwt) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); } - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4311,7 +4311,7 @@ START_TEST(touchpad_dwt_modifier_combo_dwt_after) litest_timeout_dwt_long(li); } - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4369,7 +4369,7 @@ START_TEST(touchpad_dwt_modifier_combo_dwt_remains) litest_timeout_dwt_long(li); } - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4405,7 +4405,7 @@ START_TEST(touchpad_dwt_fkeys_no_dwt) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); } - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4436,7 +4436,7 @@ START_TEST(touchpad_dwt_tap) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_BUTTON); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4470,7 +4470,7 @@ START_TEST(touchpad_dwt_tap_drag) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4502,7 +4502,7 @@ START_TEST(touchpad_dwt_click) litest_assert_only_typed_events(li, LIBINPUT_EVENT_KEYBOARD_KEY); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4546,7 +4546,7 @@ START_TEST(touchpad_dwt_edge_scroll) litest_dispatch(li); litest_assert_empty_queue(li); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4594,7 +4594,7 @@ START_TEST(touchpad_dwt_edge_scroll_interrupt) litest_touch_move_to(touchpad, 0, 99, 30, 99, 80, 10); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4755,7 +4755,7 @@ START_TEST(touchpad_dwt_disabled) litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4797,7 +4797,7 @@ START_TEST(touchpad_dwt_disable_during_touch) litest_assert_empty_queue(li); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4829,7 +4829,7 @@ START_TEST(touchpad_dwt_disable_before_touch) litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); litest_assert_empty_queue(li); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4863,7 +4863,7 @@ START_TEST(touchpad_dwt_disable_during_key_release) litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4895,7 +4895,7 @@ START_TEST(touchpad_dwt_disable_during_key_hold) litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4930,7 +4930,7 @@ START_TEST(touchpad_dwt_enable_during_touch) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4961,7 +4961,7 @@ START_TEST(touchpad_dwt_enable_before_touch) litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -4998,7 +4998,7 @@ START_TEST(touchpad_dwt_enable_during_tap) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -5029,7 +5029,7 @@ START_TEST(touchpad_dwt_remove_kbd_while_active) litest_keyboard_key(keyboard, KEY_A, false); litest_drain_events(li); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); litest_drain_events(li); litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10); @@ -5065,7 +5065,7 @@ START_TEST(touchpad_dwt_apple) litest_dispatch(li); litest_assert_empty_queue(li); - litest_delete_device(apple_keyboard); + litest_device_destroy(apple_keyboard); } END_TEST @@ -5103,8 +5103,8 @@ START_TEST(touchpad_dwt_acer_hawaii) litest_dispatch(li); litest_assert_empty_queue(li); - litest_delete_device(keyboard); - litest_delete_device(hawaii_keyboard); + litest_device_destroy(keyboard); + litest_device_destroy(hawaii_keyboard); } END_TEST @@ -5143,8 +5143,8 @@ START_TEST(touchpad_dwt_multiple_keyboards) litest_timeout_dwt_short(li); - litest_delete_device(k1); - litest_delete_device(k2); + litest_device_destroy(k1); + litest_device_destroy(k2); } END_TEST @@ -5161,7 +5161,7 @@ START_TEST(touchpad_dwt_remove_before_keyboard) /* remove the touchpad before the keyboard. * this test can fail in valgrind only */ - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -5189,8 +5189,8 @@ START_TEST(touchpad_dwt_multiple_keyboards_bothkeys) litest_touch_up(touchpad, 0); litest_assert_empty_queue(li); - litest_delete_device(k1); - litest_delete_device(k2); + litest_device_destroy(k1); + litest_device_destroy(k2); } END_TEST @@ -5224,8 +5224,8 @@ START_TEST(touchpad_dwt_multiple_keyboards_bothkeys_modifier) litest_touch_up(touchpad, 0); litest_assert_empty_queue(li); - litest_delete_device(k1); - litest_delete_device(k2); + litest_device_destroy(k1); + litest_device_destroy(k2); } END_TEST @@ -5257,7 +5257,7 @@ START_TEST(touchpad_dwt_multiple_keyboards_remove) removed = keyboards[which % 2]; remained = keyboards[(which + 1) % 2]; - litest_delete_device(removed); + litest_device_destroy(removed); litest_keyboard_key(remained, KEY_C, true); litest_keyboard_key(remained, KEY_C, false); litest_drain_events(li); @@ -5267,7 +5267,7 @@ START_TEST(touchpad_dwt_multiple_keyboards_remove) litest_touch_up(touchpad, 0); litest_assert_empty_queue(li); - litest_delete_device(remained); + litest_device_destroy(remained); } END_TEST @@ -5943,7 +5943,7 @@ START_TEST(touchpad_disabled_on_mouse) litest_touch_up(dev, 0); litest_assert_empty_queue(li); - litest_delete_device(mouse); + litest_device_destroy(mouse); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); litest_touch_down(dev, 0, 20, 30); @@ -5986,7 +5986,7 @@ START_TEST(touchpad_disabled_on_mouse_suspend_mouse) litest_touch_up(dev, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(mouse); + litest_device_destroy(mouse); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); litest_touch_down(dev, 0, 20, 30); @@ -6024,7 +6024,7 @@ START_TEST(touchpad_disabled_double_mouse) litest_touch_up(dev, 0); litest_assert_empty_queue(li); - litest_delete_device(mouse1); + litest_device_destroy(mouse1); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); litest_touch_down(dev, 0, 20, 30); @@ -6032,7 +6032,7 @@ START_TEST(touchpad_disabled_double_mouse) litest_touch_up(dev, 0); litest_assert_empty_queue(li); - litest_delete_device(mouse2); + litest_device_destroy(mouse2); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); litest_touch_down(dev, 0, 20, 30); @@ -6076,7 +6076,7 @@ START_TEST(touchpad_disabled_double_mouse_one_suspended) litest_touch_up(dev, 0); litest_assert_empty_queue(li); - litest_delete_device(mouse1); + litest_device_destroy(mouse1); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); litest_touch_down(dev, 0, 20, 30); @@ -6084,7 +6084,7 @@ START_TEST(touchpad_disabled_double_mouse_one_suspended) litest_touch_up(dev, 0); litest_assert_empty_queue(li); - litest_delete_device(mouse2); + litest_device_destroy(mouse2); litest_assert_only_typed_events(li, LIBINPUT_EVENT_DEVICE_REMOVED); litest_touch_down(dev, 0, 20, 30); @@ -6669,7 +6669,7 @@ START_TEST(touchpad_palm_detect_touch_size_after_dwt) litest_assert_empty_queue(li); - litest_delete_device(keyboard); + litest_device_destroy(keyboard); } END_TEST @@ -6962,9 +6962,9 @@ START_TEST(touchpad_suspend_abba) out: litest_ungrab_device(lid); litest_ungrab_device(tabletmode); - litest_delete_device(lid); - litest_delete_device(tabletmode); - litest_delete_device(extmouse); + litest_device_destroy(lid); + litest_device_destroy(tabletmode); + litest_device_destroy(extmouse); } END_TEST @@ -7117,9 +7117,9 @@ START_TEST(touchpad_suspend_abab) out: litest_ungrab_device(lid); litest_ungrab_device(tabletmode); - litest_delete_device(lid); - litest_delete_device(tabletmode); - litest_delete_device(extmouse); + litest_device_destroy(lid); + litest_device_destroy(tabletmode); + litest_device_destroy(extmouse); } END_TEST diff --git a/test/test-trackpoint.c b/test/test-trackpoint.c index 80d15aff..4c6d4452 100644 --- a/test/test-trackpoint.c +++ b/test/test-trackpoint.c @@ -213,7 +213,7 @@ START_TEST(trackpoint_topsoftbuttons_left_handed_trackpoint) litest_assert(device == trackpoint->libinput_device); libinput_event_destroy(event); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST @@ -256,7 +256,7 @@ START_TEST(trackpoint_topsoftbuttons_left_handed_touchpad) litest_assert(device == trackpoint->libinput_device); libinput_event_destroy(event); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST @@ -304,7 +304,7 @@ START_TEST(trackpoint_topsoftbuttons_left_handed_both) litest_assert(device == trackpoint->libinput_device); libinput_event_destroy(event); - litest_delete_device(trackpoint); + litest_device_destroy(trackpoint); } END_TEST @@ -362,7 +362,7 @@ START_TEST(trackpoint_palmdetect) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -393,7 +393,7 @@ START_TEST(trackpoint_palmdetect_dwtp_disabled) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -431,7 +431,7 @@ START_TEST(trackpoint_palmdetect_resume_touch) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -461,7 +461,7 @@ START_TEST(trackpoint_palmdetect_require_min_events) litest_touch_up(touchpad, 0); litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST @@ -495,7 +495,7 @@ START_TEST(trackpoint_palmdetect_require_min_events_timeout) litest_timeout_trackpoint(li); } - litest_delete_device(touchpad); + litest_device_destroy(touchpad); } END_TEST diff --git a/test/test-udev.c b/test/test-udev.c index 89dca79d..849aa1cc 100644 --- a/test/test-udev.c +++ b/test/test-udev.c @@ -212,7 +212,7 @@ START_TEST(udev_added_seat_default) libinput_unref(li); udev_unref(udev); - litest_delete_device(dev); + litest_device_destroy(dev); } END_TEST @@ -287,7 +287,7 @@ START_TEST(udev_change_seat) libinput_unref(li); udev_unref(udev); - litest_delete_device(dev); + litest_device_destroy(dev); } END_TEST @@ -663,7 +663,7 @@ START_TEST(udev_ignore_device) libinput_unref(li); udev_unref(udev); - litest_delete_device(dev); + litest_device_destroy(dev); } END_TEST