From: Peter Hutterer Date: Fri, 11 Oct 2024 03:55:56 +0000 (+1000) Subject: test: switch a bunch of integer comparisons to right sizes X-Git-Tag: 1.27.0~90 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f4f72dca40ae4db54cc0da848dbd5dd5109778d;p=platform%2Fupstream%2Flibinput.git test: switch a bunch of integer comparisons to right sizes Part-of: --- diff --git a/test/test-device.c b/test/test-device.c index b1bb9303..7cab7238 100644 --- a/test/test-device.c +++ b/test/test-device.c @@ -43,7 +43,7 @@ START_TEST(device_sendevents_config) modes = libinput_device_config_send_events_get_modes(device); litest_assert_int_eq(modes, - LIBINPUT_CONFIG_SEND_EVENTS_DISABLED); + (uint32_t)LIBINPUT_CONFIG_SEND_EVENTS_DISABLED); } END_TEST @@ -517,7 +517,7 @@ START_TEST(device_disable_release_buttons) LIBINPUT_EVENT_POINTER_BUTTON); ptrevent = libinput_event_get_pointer_event(event); litest_assert_int_eq(libinput_event_pointer_get_button(ptrevent), - BTN_LEFT); + (unsigned int)BTN_LEFT); litest_assert_int_eq(libinput_event_pointer_get_button_state(ptrevent), LIBINPUT_BUTTON_STATE_RELEASED); @@ -551,7 +551,7 @@ START_TEST(device_disable_release_keys) LIBINPUT_EVENT_KEYBOARD_KEY); kbdevent = libinput_event_get_keyboard_event(event); litest_assert_int_eq(libinput_event_keyboard_get_key(kbdevent), - KEY_A); + (unsigned int)KEY_A); litest_assert_int_eq(libinput_event_keyboard_get_key_state(kbdevent), LIBINPUT_KEY_STATE_RELEASED); @@ -721,7 +721,7 @@ START_TEST(device_disable_topsoftbutton) trackpoint->libinput_device); ptrevent = libinput_event_get_pointer_event(event); litest_assert_int_eq(libinput_event_pointer_get_button(ptrevent), - BTN_RIGHT); + (unsigned int)BTN_RIGHT); litest_assert_int_eq(libinput_event_pointer_get_button_state(ptrevent), LIBINPUT_BUTTON_STATE_PRESSED); libinput_event_destroy(event); @@ -733,7 +733,7 @@ START_TEST(device_disable_topsoftbutton) trackpoint->libinput_device); ptrevent = libinput_event_get_pointer_event(event); litest_assert_int_eq(libinput_event_pointer_get_button(ptrevent), - BTN_RIGHT); + (unsigned int)BTN_RIGHT); litest_assert_int_eq(libinput_event_pointer_get_button_state(ptrevent), LIBINPUT_BUTTON_STATE_RELEASED); libinput_event_destroy(event); diff --git a/test/test-keyboard.c b/test/test-keyboard.c index 251a1db9..770a1e84 100644 --- a/test/test-keyboard.c +++ b/test/test-keyboard.c @@ -79,7 +79,8 @@ START_TEST(keyboard_seat_key_count) while ((ev = libinput_get_event(libinput))) { kev = libinput_event_get_keyboard_event(ev); litest_assert_notnull(kev); - litest_assert_int_eq(libinput_event_keyboard_get_key(kev), KEY_A); + litest_assert_int_eq(libinput_event_keyboard_get_key(kev), + (unsigned int)KEY_A); litest_assert_int_eq(libinput_event_keyboard_get_key_state(kev), LIBINPUT_KEY_STATE_RELEASED); @@ -146,7 +147,7 @@ START_TEST(keyboard_ignore_no_pressed_release) litest_assert_event_type(event, LIBINPUT_EVENT_KEYBOARD_KEY); kevent = libinput_event_get_keyboard_event(event); litest_assert_int_eq(libinput_event_keyboard_get_key(kevent), - KEY_A); + (unsigned int)KEY_A); litest_assert_int_eq(libinput_event_keyboard_get_key_state(kevent), *state); libinput_event_destroy(event); diff --git a/test/test-pad.c b/test/test-pad.c index 9bc9a21d..726d2390 100644 --- a/test/test-pad.c +++ b/test/test-pad.c @@ -155,7 +155,7 @@ START_TEST(pad_num_buttons) struct litest_device *dev = litest_current_device(); struct libinput_device *device = dev->libinput_device; unsigned int code; - unsigned int nbuttons = 0; + int nbuttons = 0; for (code = BTN_0; code < KEY_OK; code++) { /* BTN_STYLUS is set for compatibility reasons but not @@ -359,10 +359,10 @@ START_TEST(pad_button_mode_groups) /* litest virtual devices don't have modes */ mode = libinput_event_tablet_pad_get_mode(pev); - litest_assert_int_eq(mode, 0); + litest_assert_int_eq(mode, 0U); group = libinput_event_tablet_pad_get_mode_group(pev); index = libinput_tablet_pad_mode_group_get_index(group); - litest_assert_int_eq(index, 0); + litest_assert_int_eq(index, 0U); libinput_event_destroy(ev); @@ -371,10 +371,10 @@ START_TEST(pad_button_mode_groups) pev = libinput_event_get_tablet_pad_event(ev); mode = libinput_event_tablet_pad_get_mode(pev); - litest_assert_int_eq(mode, 0); + litest_assert_int_eq(mode, 0U); group = libinput_event_tablet_pad_get_mode_group(pev); index = libinput_tablet_pad_mode_group_get_index(group); - litest_assert_int_eq(index, 0); + litest_assert_int_eq(index, 0U); libinput_event_destroy(ev); } @@ -783,12 +783,12 @@ START_TEST(pad_mode_groups) struct libinput_device *device = dev->libinput_device; struct libinput_tablet_pad_mode_group *group; int ngroups; - int i; + unsigned int i; ngroups = libinput_device_tablet_pad_get_num_mode_groups(device); litest_assert_int_eq(ngroups, 1); - for (i = 0; i < ngroups; i++) { + for (i = 0; i < (unsigned int)ngroups; i++) { group = libinput_device_tablet_pad_get_mode_group(device, i); litest_assert_notnull(group); litest_assert_int_eq(libinput_tablet_pad_mode_group_get_index(group), @@ -854,7 +854,7 @@ START_TEST(pad_mode_group_mode) group = libinput_device_tablet_pad_get_mode_group(device, 0); nmodes = libinput_tablet_pad_mode_group_get_num_modes(group); - litest_assert_int_eq(nmodes, 1); + litest_assert_int_eq(nmodes, 1U); mode = libinput_tablet_pad_mode_group_get_mode(group); litest_assert_int_lt(mode, nmodes); diff --git a/test/test-path.c b/test/test-path.c index 8a32f76c..3d710e20 100644 --- a/test/test-path.c +++ b/test/test-path.c @@ -480,7 +480,7 @@ START_TEST(path_device_sysname) sysname = libinput_device_get_sysname(device); litest_assert_notnull(sysname); - litest_assert_int_gt(strlen(sysname), 1); + litest_assert_int_gt(strlen(sysname), 1U); litest_assert(strchr(sysname, '/') == NULL); litest_assert(strneq(sysname, "event", 5)); diff --git a/test/test-pointer.c b/test/test-pointer.c index b31ed846..2673e034 100644 --- a/test/test-pointer.c +++ b/test/test-pointer.c @@ -1138,7 +1138,7 @@ START_TEST(pointer_seat_button_count) tev = libinput_event_get_pointer_event(ev); litest_assert_notnull(tev); litest_assert_int_eq(libinput_event_pointer_get_button(tev), - BTN_LEFT); + (unsigned int)BTN_LEFT); litest_assert_int_eq(libinput_event_pointer_get_button_state(tev), LIBINPUT_BUTTON_STATE_PRESSED); @@ -1171,7 +1171,7 @@ START_TEST(pointer_seat_button_count) tev = libinput_event_get_pointer_event(ev); litest_assert_notnull(tev); litest_assert_int_eq(libinput_event_pointer_get_button(tev), - BTN_LEFT); + (unsigned int)BTN_LEFT); litest_assert_int_eq(libinput_event_pointer_get_button_state(tev), LIBINPUT_BUTTON_STATE_RELEASED); @@ -1438,11 +1438,11 @@ START_TEST(pointer_scroll_button_noscroll) enum libinput_config_status status; methods = libinput_device_config_scroll_get_method(device); - litest_assert_int_eq((methods & LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN), 0); + litest_assert_int_eq((methods & LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN), 0U); button = libinput_device_config_scroll_get_button(device); - litest_assert_int_eq(button, 0); + litest_assert_int_eq(button, 0U); button = libinput_device_config_scroll_get_default_button(device); - litest_assert_int_eq(button, 0); + litest_assert_int_eq(button, 0U); status = libinput_device_config_scroll_set_method(device, LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN); @@ -2111,9 +2111,9 @@ START_TEST(pointer_scroll_nowheel_defaults) if (method == LIBINPUT_CONFIG_SCROLL_ON_BUTTON_DOWN) { button = libinput_device_config_scroll_get_button(device); - litest_assert_int_eq(button, BTN_MIDDLE); + litest_assert_int_eq(button, (unsigned int)BTN_MIDDLE); button = libinput_device_config_scroll_get_default_button(device); - litest_assert_int_eq(button, BTN_MIDDLE); + litest_assert_int_eq(button, (unsigned int)BTN_MIDDLE); } } END_TEST @@ -2131,7 +2131,7 @@ START_TEST(pointer_scroll_defaults_logitech_marble) litest_assert_int_eq(method, LIBINPUT_CONFIG_SCROLL_NO_SCROLL); button = libinput_device_config_scroll_get_button(device); - litest_assert_int_eq(button, BTN_SIDE); + litest_assert_int_eq(button, (unsigned int)BTN_SIDE); } END_TEST diff --git a/test/test-quirks.c b/test/test-quirks.c index d71586ab..e4691035 100644 --- a/test/test-quirks.c +++ b/test/test-quirks.c @@ -1054,7 +1054,7 @@ test_attr_parse(struct litest_device *dev, struct qtest_dim { const char *str; bool success; - int w, h; + size_t w, h; }; START_TEST(quirks_parse_dimension_attr) diff --git a/test/test-tablet.c b/test/test-tablet.c index 9b91a31f..f66a6683 100644 --- a/test/test-tablet.c +++ b/test/test-tablet.c @@ -139,7 +139,7 @@ START_TEST(button_seat_count) litest_assert_int_eq(libinput_event_tablet_tool_get_button(tev), button); litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(tev), LIBINPUT_BUTTON_STATE_PRESSED); - litest_assert_int_eq(libinput_event_tablet_tool_get_seat_button_count(tev), 1); + litest_assert_int_eq(libinput_event_tablet_tool_get_seat_button_count(tev), 1U); libinput_event_destroy(event); event = libinput_get_event(li); @@ -147,7 +147,7 @@ START_TEST(button_seat_count) litest_assert_int_eq(libinput_event_tablet_tool_get_button(tev), button); litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(tev), LIBINPUT_BUTTON_STATE_PRESSED); - litest_assert_int_eq(libinput_event_tablet_tool_get_seat_button_count(tev), 2); + litest_assert_int_eq(libinput_event_tablet_tool_get_seat_button_count(tev), 2U); libinput_event_destroy(event); litest_assert_empty_queue(li); @@ -161,7 +161,7 @@ START_TEST(button_seat_count) litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(tev), LIBINPUT_BUTTON_STATE_RELEASED); litest_assert_int_eq(libinput_event_tablet_tool_get_button(tev), button); - litest_assert_int_eq(libinput_event_tablet_tool_get_seat_button_count(tev), 1); + litest_assert_int_eq(libinput_event_tablet_tool_get_seat_button_count(tev), 1U); libinput_event_destroy(event); event = libinput_get_event(li); @@ -169,7 +169,7 @@ START_TEST(button_seat_count) litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(tev), LIBINPUT_BUTTON_STATE_RELEASED); litest_assert_int_eq(libinput_event_tablet_tool_get_button(tev), button); - litest_assert_int_eq(libinput_event_tablet_tool_get_seat_button_count(tev), 0); + litest_assert_int_eq(libinput_event_tablet_tool_get_seat_button_count(tev), 0U); libinput_event_destroy(event); litest_assert_empty_queue(li); @@ -439,7 +439,7 @@ START_TEST(tip_up_btn_change) tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); litest_assert_int_eq(libinput_event_tablet_tool_get_button(tablet_event), - BTN_STYLUS); + (unsigned int)BTN_STYLUS); litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(tablet_event), LIBINPUT_BUTTON_STATE_PRESSED); libinput_event_destroy(event); @@ -472,7 +472,7 @@ START_TEST(tip_up_btn_change) tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); litest_assert_int_eq(libinput_event_tablet_tool_get_button(tablet_event), - BTN_STYLUS); + (unsigned int)BTN_STYLUS); litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(tablet_event), LIBINPUT_BUTTON_STATE_RELEASED); libinput_event_destroy(event); @@ -517,7 +517,7 @@ START_TEST(tip_down_btn_change) tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); litest_assert_int_eq(libinput_event_tablet_tool_get_button(tablet_event), - BTN_STYLUS); + (unsigned int)BTN_STYLUS); litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(tablet_event), LIBINPUT_BUTTON_STATE_PRESSED); libinput_event_destroy(event); @@ -551,7 +551,7 @@ START_TEST(tip_down_btn_change) tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); litest_assert_int_eq(libinput_event_tablet_tool_get_button(tablet_event), - BTN_STYLUS); + (unsigned int)BTN_STYLUS); litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(tablet_event), LIBINPUT_BUTTON_STATE_RELEASED); libinput_event_destroy(event); @@ -2364,7 +2364,7 @@ START_TEST(tool_serial) tablet_event = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); tool = libinput_event_tablet_tool_get_tool(tablet_event); - litest_assert_int_eq(libinput_tablet_tool_get_serial(tool), 1000); + litest_assert_int_eq(libinput_tablet_tool_get_serial(tool), (uint64_t)1000); libinput_event_destroy(event); } END_TEST @@ -2389,7 +2389,7 @@ START_TEST(tool_id) tool = libinput_event_tablet_tool_get_tool(tablet_event); litest_assert_int_eq(libinput_device_get_id_vendor(dev->libinput_device), - VENDOR_ID_WACOM); + (unsigned int)VENDOR_ID_WACOM); switch (libinput_device_get_id_product(dev->libinput_device)) { case 0x27: /* Intuos 5 */ @@ -2437,7 +2437,7 @@ START_TEST(serial_changes_tool) LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); tool = libinput_event_tablet_tool_get_tool(tablet_event); - litest_assert_int_eq(libinput_tablet_tool_get_serial(tool), 2000); + litest_assert_int_eq(libinput_tablet_tool_get_serial(tool), (uint64_t)2000); libinput_event_destroy(event); } END_TEST @@ -2470,7 +2470,7 @@ START_TEST(invalid_serials) tablet_event = libinput_event_get_tablet_tool_event(event); tool = libinput_event_tablet_tool_get_tool(tablet_event); - litest_assert_int_eq(libinput_tablet_tool_get_serial(tool), 1000); + litest_assert_int_eq(libinput_tablet_tool_get_serial(tool), (uint64_t)1000); } libinput_event_destroy(event); @@ -2690,7 +2690,7 @@ START_TEST(tool_delayed_serial) LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); tool = libinput_event_tablet_tool_get_tool(tev); serial = libinput_tablet_tool_get_serial(tool); - litest_assert_int_eq(serial, 0); + litest_assert_int_eq(serial, (uint64_t)0); libinput_event_destroy(event); for (int x = 4500; x < 8000; x += 1000) { @@ -2714,7 +2714,7 @@ START_TEST(tool_delayed_serial) LIBINPUT_EVENT_TABLET_TOOL_AXIS); tool = libinput_event_tablet_tool_get_tool(tev); serial = libinput_tablet_tool_get_serial(tool); - litest_assert_int_eq(serial, 0); + litest_assert_int_eq(serial, (uint64_t)0); libinput_event_destroy(event); for (int x = 4500; x < 8000; x += 500) { @@ -2731,7 +2731,7 @@ START_TEST(tool_delayed_serial) LIBINPUT_EVENT_TABLET_TOOL_AXIS); tool = libinput_event_tablet_tool_get_tool(tev); serial = libinput_tablet_tool_get_serial(tool); - litest_assert_int_eq(serial, 0); + litest_assert_int_eq(serial, (uint64_t)0); libinput_event_destroy(event); event = libinput_get_event(li); } while (event != NULL); @@ -2749,7 +2749,7 @@ START_TEST(tool_delayed_serial) LIBINPUT_EVENT_TABLET_TOOL_PROXIMITY); tool = libinput_event_tablet_tool_get_tool(tev); serial = libinput_tablet_tool_get_serial(tool); - litest_assert_int_eq(serial, 0); + litest_assert_int_eq(serial, (uint64_t)0); libinput_event_destroy(event); } END_TEST @@ -2924,7 +2924,7 @@ START_TEST(tool_in_prox_before_start) { -1, -1 } }; const char *devnode; - unsigned int serial; + uint64_t serial; litest_tablet_proximity_in(dev, 10, 10, axes); diff --git a/test/test-totem.c b/test/test-totem.c index 1e462c1d..127727de 100644 --- a/test/test-totem.c +++ b/test/test-totem.c @@ -377,7 +377,8 @@ START_TEST(totem_button) litest_dispatch(li); event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - litest_assert_int_eq(libinput_event_tablet_tool_get_button(t), BTN_0); + litest_assert_int_eq(libinput_event_tablet_tool_get_button(t), + (unsigned int)BTN_0); litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(t), LIBINPUT_BUTTON_STATE_PRESSED); litest_assert_int_eq(libinput_event_tablet_tool_get_tip_state(t), @@ -389,7 +390,8 @@ START_TEST(totem_button) event = libinput_get_event(li); t = litest_is_tablet_event(event, LIBINPUT_EVENT_TABLET_TOOL_BUTTON); - litest_assert_int_eq(libinput_event_tablet_tool_get_button(t), BTN_0); + litest_assert_int_eq(libinput_event_tablet_tool_get_button(t), + (unsigned int)BTN_0); litest_assert_int_eq(libinput_event_tablet_tool_get_button_state(t), LIBINPUT_BUTTON_STATE_RELEASED); litest_assert_int_eq(libinput_event_tablet_tool_get_tip_state(t), diff --git a/test/test-touchpad-buttons.c b/test/test-touchpad-buttons.c index 8ceeccbe..aeae3f92 100644 --- a/test/test-touchpad-buttons.c +++ b/test/test-touchpad-buttons.c @@ -165,7 +165,7 @@ START_TEST(touchpad_click_defaults_none) /* call this test for non-clickpads and non-touchpads */ methods = libinput_device_config_click_get_methods(device); - litest_assert_int_eq(methods, 0); + litest_assert_int_eq(methods, 0U); method = libinput_device_config_click_get_method(device); litest_assert_int_eq(method, LIBINPUT_CONFIG_CLICK_METHOD_NONE); diff --git a/test/test-udev.c b/test/test-udev.c index d7c99bc1..1ee3390f 100644 --- a/test/test-udev.c +++ b/test/test-udev.c @@ -486,7 +486,7 @@ START_TEST(udev_device_sysname) device = libinput_event_get_device(ev); sysname = libinput_device_get_sysname(device); litest_assert_notnull(sysname); - litest_assert_int_gt(strlen(sysname), 1); + litest_assert_int_gt(strlen(sysname), 1U); litest_assert(strchr(sysname, '/') == NULL); litest_assert(strneq(sysname, "event", 5)); libinput_event_destroy(ev);