diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2013-01-11 15:06:17 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2013-01-17 09:52:52 +1000 |
| commit | 41ddf995ce008dd842ccd1f00cfcdbf530ecf906 (patch) | |
| tree | 17e3db132586b3eab0a73d138df696cb6b420a6c | |
| parent | a8db52b7703cda2a1ee5a9be4f8afe72fee1ceca (diff) | |
server/input: create PointerSubpixelTest class
PointerMotionTest is too generic a name:
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | registry/server-registry.xml | 2 | ||||
| -rw-r--r-- | tests/server/input.cpp | 19 |
2 files changed, 19 insertions, 2 deletions
diff --git a/registry/server-registry.xml b/registry/server-registry.xml index 43262dc..bcfebdc 100644 --- a/registry/server-registry.xml +++ b/registry/server-registry.xml @@ -207,7 +207,7 @@ <xit:bug type="bugzilla">https://bugs.freedesktop.org/show_bug.cgi?id=58255</xit:bug> </xit:testcase> </xit:testsuite> - <xit:testsuite name="PointerMotionTest"> + <xit:testsuite name="PointerSubpixelTest"> <xit:testcase name="NoSubpixelCoreEvents" success="false"> <xit:bug type="bugzilla">https://bugs.freedesktop.org/show_bug.cgi?id=57383</xit:bug> </xit:testcase> diff --git a/tests/server/input.cpp b/tests/server/input.cpp index dfe4c45..4b02dae 100644 --- a/tests/server/input.cpp +++ b/tests/server/input.cpp @@ -31,6 +31,23 @@ public: config.AddDefaultScreenWithDriver(); config.AddInputSection("evdev", "--device--", "Option \"CorePointer\" \"on\"\n" + "Option \"Device\" \"" + dev->GetDeviceNode() + "\""); + /* add default keyboard device to avoid server adding our device again */ + config.AddInputSection("kbd", "kbd-device", + "Option \"CoreKeyboard\" \"on\"\n"); + config.WriteConfig(); + } +}; + +class PointerSubpixelTest : public PointerMotionTest { + /** + * Sets up an xorg.conf for a single evdev CoreKeyboard device based on + * the evemu device. The input from GetParam() is used as XkbLayout. + */ + virtual void SetUpConfigAndLog() { + config.AddDefaultScreenWithDriver(); + config.AddInputSection("evdev", "--device--", + "Option \"CorePointer\" \"on\"\n" "Option \"ConstantDeceleration\" \"20\"\n" "Option \"Device\" \"" + dev->GetDeviceNode() + "\""); /* add default keyboard device to avoid server adding our device again */ @@ -40,7 +57,7 @@ public: } }; -TEST_F(PointerMotionTest, NoSubpixelCoreEvents) +TEST_F(PointerSubpixelTest, NoSubpixelCoreEvents) { XORG_TESTCASE("Move pointer by less than a pixels\n" "Ensure no core motion event is received\n" |