diff options
| -rw-r--r-- | tests/server/grab.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/server/grab.cpp b/tests/server/grab.cpp index a7525f4..eaf603c 100644 --- a/tests/server/grab.cpp +++ b/tests/server/grab.cpp @@ -1500,13 +1500,16 @@ TEST_P(TouchUngrabTest, UngrabButtonDuringTouch) switch (grab_type) { case GRABTYPE_CORE: { - ASSERT_EVENT(XEvent, release, dpy, ButtonRelease); + ASSERT_EVENT(XEvent, release, dpy, MotionNotify); + ASSERT_EVENT(XEvent, motion, dpy, ButtonRelease); break; } case GRABTYPE_XI1: break; case GRABTYPE_XI2: { + ASSERT_EVENT(XIDeviceEvent, motion, dpy, GenericEvent, + xi2_opcode, XI_Motion); ASSERT_EVENT(XIDeviceEvent, release, dpy, GenericEvent, xi2_opcode, XI_ButtonRelease); break; @@ -2257,6 +2260,7 @@ TEST_F(TouchOwnershipTest, ActivePointerGrabForWholeTouch) TouchDev().TouchBegin(200, 200, 0); + ASSERT_EVENT(XIDeviceEvent, A_motion1, dpy, GenericEvent, xi2_opcode, XI_Motion); ASSERT_EVENT(XIDeviceEvent, A_btnpress, dpy, GenericEvent, xi2_opcode, XI_ButtonPress); ASSERT_EVENT(XIDeviceEvent, B_begin, dpy2, GenericEvent, xi2_opcode, XI_TouchBegin); @@ -2266,6 +2270,7 @@ TEST_F(TouchOwnershipTest, ActivePointerGrabForWholeTouch) TouchDev().TouchEnd(250, 250, 0); + ASSERT_EVENT(XIDeviceEvent, A_motion2, dpy, GenericEvent, xi2_opcode, XI_Motion); ASSERT_EVENT(XIDeviceEvent, A_btnrelease, dpy, GenericEvent, xi2_opcode, XI_ButtonRelease); /* One event on the wire and it's TouchEnd, not ownership */ @@ -2301,6 +2306,7 @@ TEST_F(TouchOwnershipTest, ActivePointerUngrabDuringTouch) TouchDev().TouchBegin(200, 200, 0); + ASSERT_EVENT(XIDeviceEvent, A_motion1, dpy, GenericEvent, xi2_opcode, XI_Motion); ASSERT_EVENT(XIDeviceEvent, A_btnpress, dpy, GenericEvent, xi2_opcode, XI_ButtonPress); ASSERT_EVENT(XIDeviceEvent, B_begin, dpy2, GenericEvent, xi2_opcode, XI_TouchBegin); |