diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-02-08 14:39:54 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-02-11 14:12:56 +1000 |
| commit | 2573ce812b80beab46e07d11196ee677b71250fa (patch) | |
| tree | 8166f93fdd4a4d1282e5e56d9ff5a73354cbf6f7 | |
| parent | a8cfcdc8081ef3a36b45f3761cba9f4be1dd7a65 (diff) | |
server/touch: add test to make sure we don't get touch end motion events
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | registry/server-registry.xml | 12 | ||||
| -rw-r--r-- | tests/server/touch.cpp | 19 |
2 files changed, 31 insertions, 0 deletions
diff --git a/registry/server-registry.xml b/registry/server-registry.xml index fbd5715..5d72813 100644 --- a/registry/server-registry.xml +++ b/registry/server-registry.xml @@ -476,6 +476,18 @@ <xit:testcase name="EmulatedButtonMaskOnTouchBeginEndXI2/1" success="true"/> <xit:testcase name="EmulatedButtonMaskOnTouchBeginEndXI2/2" success="true"/> <xit:testcase name="EmulatedButtonMaskOnTouchBeginEndXI2/3" success="true"/> + <xit:testcase name="NoEmulatedButton1MotionWithoutButtonPress/0" success="false"> + <xit:bug type="bugzilla">https://bugs.freedesktop.org/show_bug.cgi?id=60394</xit:bug> + </xit:testcase> + <xit:testcase name="NoEmulatedButton1MotionWithoutButtonPress/1" success="false"> + <xit:bug type="bugzilla">https://bugs.freedesktop.org/show_bug.cgi?id=60394</xit:bug> + </xit:testcase> + <xit:testcase name="NoEmulatedButton1MotionWithoutButtonPress/2" success="false"> + <xit:bug type="bugzilla">https://bugs.freedesktop.org/show_bug.cgi?id=60394</xit:bug> + </xit:testcase> + <xit:testcase name="NoEmulatedButton1MotionWithoutButtonPress/3" success="false"> + <xit:bug type="bugzilla">https://bugs.freedesktop.org/show_bug.cgi?id=60394</xit:bug> + </xit:testcase> <xit:testcase name="XIQueryPointerTouchscreen/0" success="true"/> <xit:testcase name="XIQueryPointerTouchscreen/1" success="true"/> <xit:testcase name="XIQueryPointerTouchscreen/2" success="true"/> diff --git a/tests/server/touch.cpp b/tests/server/touch.cpp index 813d0f7..d8cdeb2 100644 --- a/tests/server/touch.cpp +++ b/tests/server/touch.cpp @@ -252,6 +252,25 @@ TEST_P(TouchTestXI2Version, EmulatedButtonMaskOnTouchBeginEndCore) EXPECT_EQ(ev.xbutton.button, 1U) << "ButtonRelease must have button 1 mask down"; } +TEST_P(TouchTestXI2Version, NoEmulatedButton1MotionWithoutButtonPress) +{ + XORG_TESTCASE("Select for core Pointer1Motion mask on the root window.\n" + "Create a pointer-emulating touch event.\n" + "No motion event expected\n" + "https://bugs.freedesktop.org/show_bug.cgi?id=60394"); + + ::Display *dpy = Display(); + XSelectInput(dpy, DefaultRootWindow(dpy), Button1MotionMask); + XSync(dpy, False); + + dev->Play(RECORDINGS_DIR "tablets/N-Trig-MultiTouch.touch_1_begin.events"); + dev->Play(RECORDINGS_DIR "tablets/N-Trig-MultiTouch.touch_1_update.events"); + dev->Play(RECORDINGS_DIR "tablets/N-Trig-MultiTouch.touch_1_end.events"); + + XSync(dpy, False); + ASSERT_EQ(XPending(dpy), 0); +} + TEST_P(TouchTestXI2Version, EmulatedButton1MotionMaskOnTouch) { XORG_TESTCASE("Select for core Pointer1Motion mask on the root window.\n" |