diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-05-01 12:49:20 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-05-01 12:50:02 +1000 |
| commit | 57df04ddf8b428dca723d396df39e302e947722d (patch) | |
| tree | a1b14289cbd9fb207071365fa1c2cdc309ab935f | |
| parent | 1f96787cd90666c34306a8884011e01ebca23d2e (diff) | |
input/synaptics: fix up clickfinger 3 distance test
Changed behaviour in the driver, see xf86-input-synaptics-1.7.99.1-7-ga6f0f4c.
now we don't care about distance anymore.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | tests/input/synaptics.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/input/synaptics.cpp b/tests/input/synaptics.cpp index 91fa2ce..a37fd27 100644 --- a/tests/input/synaptics.cpp +++ b/tests/input/synaptics.cpp @@ -1047,10 +1047,10 @@ TEST_F(SynapticsClickpadTest, ClickFinger3) TEST_F(SynapticsClickpadTest, ClickFinger3Distance) { - XORG_TESTCASE("Put two fingers on the touchpad, too far apart for clickfinger\n" + XORG_TESTCASE("Put two fingers on the touchpad, far apart\n" "Trigger BTN_TOOL_TRIPLETAP\n" "Trigger BTN_LEFT\n" - "Expect ClickFinger2 action\n"); + "Expect ClickFinger3 action\n"); ::Display *dpy = Display(); SetClickfingerProperty("--device--", 0, 2, 3); @@ -1065,12 +1065,12 @@ TEST_F(SynapticsClickpadTest, ClickFinger3Distance) TouchEnd(1); TouchEnd(0); - /* First two fingers too far apart but the third counts, so we expect - CF2 action */ + /* xf86-input-synaptics-1.7.99.1-7-ga6f0f4c changed the behaviour, now + we always expect clickfinger 3, regardless of distance */ ASSERT_EVENT(XEvent, press, dpy, ButtonPress); ASSERT_EVENT(XEvent, release, dpy, ButtonRelease); - ASSERT_EQ(press->xbutton.button, 2); - ASSERT_EQ(release->xbutton.button, 2); + ASSERT_EQ(press->xbutton.button, 3); + ASSERT_EQ(release->xbutton.button, 3); } |