test: add test helpers for touch sequence parts

The necessary helpers to test for a touch event + one touch frame and the extra case for the TOUCH_CANCEL in is_touch_event Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
gitclear · Aug 3, 2018 · 2855e26 · 2855e26
1 parent adf0e5a
commit 2855e26
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 0 deletions.
diff --git a/test/litest.c b/test/litest.c
@@ -3203,6 +3203,7 @@ litest_is_touch_event(struct libinput_event *event,
 	case LIBINPUT_EVENT_TOUCH_UP:
 	case LIBINPUT_EVENT_TOUCH_MOTION:
 	case LIBINPUT_EVENT_TOUCH_FRAME:
+	case LIBINPUT_EVENT_TOUCH_CANCEL:
 		litest_assert_event_type(event, type);
 		break;
 	default:
@@ -3505,6 +3506,75 @@ litest_assert_touch_sequence(struct libinput *li)
 	libinput_event_destroy(event);
 }
 
+void
+litest_assert_touch_motion_frame(struct libinput *li)
+{
+	struct libinput_event *event;
+
+	/* expect at least one, but maybe more */
+	event = libinput_get_event(li);
+	litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_MOTION);
+	libinput_event_destroy(event);
+
+	event = libinput_get_event(li);
+	litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_FRAME);
+	libinput_event_destroy(event);
+
+	event = libinput_get_event(li);
+	while (event) {
+		litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_MOTION);
+		libinput_event_destroy(event);
+
+		event = libinput_get_event(li);
+		litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_FRAME);
+		libinput_event_destroy(event);
+
+		event = libinput_get_event(li);
+	}
+}
+
+void
+litest_assert_touch_down_frame(struct libinput *li)
+{
+	struct libinput_event *event;
+
+	event = libinput_get_event(li);
+	litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_DOWN);
+	libinput_event_destroy(event);
+
+	event = libinput_get_event(li);
+	litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_FRAME);
+	libinput_event_destroy(event);
+}
+
+void
+litest_assert_touch_up_frame(struct libinput *li)
+{
+	struct libinput_event *event;
+
+	event = libinput_get_event(li);
+	litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_UP);
+	libinput_event_destroy(event);
+
+	event = libinput_get_event(li);
+	litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_FRAME);
+	libinput_event_destroy(event);
+}
+
+void
+litest_assert_touch_cancel(struct libinput *li)
+{
+	struct libinput_event *event;
+
+	event = libinput_get_event(li);
+	litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_CANCEL);
+	libinput_event_destroy(event);
+
+	event = libinput_get_event(li);
+	litest_is_touch_event(event, LIBINPUT_EVENT_TOUCH_FRAME);
+	libinput_event_destroy(event);
+}
+
 void
 litest_timeout_tap(void)
 {

diff --git a/test/litest.h b/test/litest.h
@@ -670,6 +670,15 @@ litest_assert_empty_queue(struct libinput *li);
 void
 litest_assert_touch_sequence(struct libinput *li);
 
+void
+litest_assert_touch_motion_frame(struct libinput *li);
+void
+litest_assert_touch_down_frame(struct libinput *li);
+void
+litest_assert_touch_up_frame(struct libinput *li);
+void
+litest_assert_touch_cancel(struct libinput *li);
+
 struct libinput_event_pointer *
 litest_is_button_event(struct libinput_event *event,
 		       unsigned int button,