[PATCH libinput] test: check if tapping that happens after a moving thumb works

Peter Hutterer peter.hutterer at who-t.net
Thu May 10 06:14:42 UTC 2018


On Thu, May 10, 2018 at 12:47:33AM +0200, Friedrich Schöller wrote:
> ---
>  test/test-touchpad.c | 40 ++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 40 insertions(+)
> 
> diff --git a/test/test-touchpad.c b/test/test-touchpad.c
> index b73d9e58..8341e209 100644
> --- a/test/test-touchpad.c
> +++ b/test/test-touchpad.c
> @@ -4974,6 +4974,45 @@ START_TEST(touchpad_thumb_tap_hold_2ndfg_tap)
>  }
>  END_TEST
>  
> +START_TEST(touchpad_thumb_move_and_tap)
> +{
> +	struct litest_device *dev = litest_current_device();
> +	struct libinput *li = dev->libinput;
> +	struct axis_replacement axes[] = {
> +		{ ABS_MT_PRESSURE, 75 },
> +		{ -1, 0 }
> +	};
> +
> +	if (!has_thumb_detect(dev))
> +		return;
> +
> +	litest_enable_tap(dev->libinput_device);
> +	litest_drain_events(li);
> +
> +	/* trigger thumb detection by pressure after a slight movement */
> +	litest_touch_down(dev, 0, 50, 99);
> +	litest_touch_move(dev, 0, 51, 99);
> +	litest_touch_move_extended(dev, 0, 55, 99, axes);
> +	libinput_dispatch(li);
> +
> +	litest_assert_empty_queue(li);
> +
> +	/* thumb is resting, check if tapping still works */
> +	litest_touch_down(dev, 1, 50, 50);
> +	litest_touch_up(dev, 1);
> +	libinput_dispatch(li);
> +	litest_timeout_tap();
> +
> +	litest_assert_button_event(li,
> +				   BTN_LEFT,
> +				   LIBINPUT_BUTTON_STATE_PRESSED);
> +	litest_assert_button_event(li,
> +				   BTN_LEFT,
> +				   LIBINPUT_BUTTON_STATE_RELEASED);
> +	litest_assert_empty_queue(li);
> +}
> +END_TEST
> +
>  START_TEST(touchpad_tool_tripletap_touch_count)
>  {
>  	struct litest_device *dev = litest_current_device();
> @@ -6081,6 +6120,7 @@ TEST_COLLECTION(touchpad)
>  	litest_add("touchpad:thumb", touchpad_thumb_tap_hold, LITEST_CLICKPAD, LITEST_ANY);
>  	litest_add("touchpad:thumb", touchpad_thumb_tap_hold_2ndfg, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH);
>  	litest_add("touchpad:thumb", touchpad_thumb_tap_hold_2ndfg_tap, LITEST_CLICKPAD, LITEST_SINGLE_TOUCH);
> +	litest_add("touchpad:thumb", touchpad_thumb_move_and_tap, 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_slot_swap, LITEST_SYNAPTICS_TOPBUTTONPAD);
> -- 
> 2.14.3
> 

Thanks, I've squashed this in with the actual fix so they go together.
Commit af86152370b9f2ff15d3adb5e0590da7fb64e7cf is on git master now.

Cheers,
   Peter


More information about the wayland-devel mailing list