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

test: cast to int before integer comparison

Browse source 
No effect with the current macros since they'll cast to int for us, but this
will change with the litest_assert macros.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2015-05-05 11:52:32 +10:00
parent d81a677f6d
commit c9ea9836f3
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
test/litest.c
View file

@ -1169,8 +1169,8 @@ int
litest_scale(const struct litest_device *d, unsigned int axis, double val)
{
int min, max;
ck_assert_int_ge(val, 0);
ck_assert_int_le(val, 100);
ck_assert_int_ge((int)val, 0);
ck_assert_int_le((int)val, 100);
ck_assert_int_le(axis, (unsigned int)ABS_Y);
min = d->interface->min[axis];
@ -1630,6 +1630,7 @@ litest_assert_scroll(struct libinput *li,
{
struct libinput_event *event, *next_event;
struct libinput_event_pointer *ptrev;
int value;
event = libinput_get_event(li);
next_event = libinput_get_event(li);
@ -1639,17 +1640,13 @@ litest_assert_scroll(struct libinput *li,
ptrev = litest_is_axis_event(event, axis, 0);
if (next_event) {
value = libinput_event_pointer_get_axis_value(ptrev,
axis);
/* Normal scroll event, check dir */
if (minimum_movement > 0) {
ck_assert_int_ge(
libinput_event_pointer_get_axis_value(ptrev,
axis),
minimum_movement);
ck_assert_int_ge(value, minimum_movement);
} else {
ck_assert_int_le(
libinput_event_pointer_get_axis_value(ptrev,
axis),
minimum_movement);
ck_assert_int_le(value, minimum_movement);
}
} else {
/* Last scroll event, must be 0 */

4
test/pointer.c
View file

@ -154,8 +154,8 @@ test_absolute_event(struct litest_device *dev, double x, double y)
ex = libinput_event_pointer_get_absolute_x_transformed(ptrev, 100);
ey = libinput_event_pointer_get_absolute_y_transformed(ptrev, 100);
ck_assert_int_eq(ex + 0.5, x);
ck_assert_int_eq(ey + 0.5, y);
ck_assert_int_eq((int)(ex + 0.5), (int)x);
ck_assert_int_eq((int)(ey + 0.5), (int)y);
libinput_event_destroy(event);
}