Merge lp:~chasedouglas/geis/v1-device-add-subscribe-test into lp:geis

[Chase Douglas]

Add test for lp:1009270: Unity fails to use multitouch gestures if magic touchpad is connected after Unity has launched.

[Stephen M. Webb (bregma)]

Code looks OK, test fails as expected.

review: Approve

[lp:~chasedouglas/geis/v1-device-add-subscribe-test]

273. By Chase Douglas on 2012-06-15

Merged utouch-geis into v1-device-add-subscribe-test.

274. By Chase Douglas on 2012-06-15

Update new device subscription test to use device added callback

[Chase Douglas (chasedouglas)]

Test rebased and fixed up based on comments in the next merge proposal: https://code.launchpad.net/~chasedouglas/utouch-geis/v1-device-add-subscribe-fix/+merge/109414. Please review.

review: Needs Resubmitting

[Stephen M. Webb (bregma)]

Excellent.

review: Approve

=== modified file 'testsuite/geis1/Makefile.am'
--- testsuite/geis1/Makefile.am	2012-04-11 19:29:52 +0000
+++ testsuite/geis1/Makefile.am	2012-06-15 17:33:29 +0000
@@ -35,6 +35,7 @@
 
 gtest_geis1_api_SOURCES = \
         gtest_attrs.cpp \
+        gtest_devices.cpp \
         gtest_subscription.cpp
 
 nodist_gtest_geis1_api_SOURCES = \

=== added file 'testsuite/geis1/gtest_devices.cpp'
--- testsuite/geis1/gtest_devices.cpp	1970-01-01 00:00:00 +0000
+++ testsuite/geis1/gtest_devices.cpp	2012-06-15 17:33:29 +0000
@@ -0,0 +1,124 @@
+/**
+ * GTest test suite for GEIS v1 device handling.
+ *
+ * Copyright 2012 Canonical Ltd.
+ */
+#include "geis/geis.h"
+#include "gtest_evemu_device.h"
+#include "gtest_geis1_fixture.h"
+#include "libutouch-geis/geis_test_api.h"
+#include <memory>
+
+static const std::string TEST_DEVICE_PROP_FILE(
+    TEST_ROOT_DIR "recordings/touchscreen_a/device.prop");
+static const std::string TEST_DEVICE_EVENTS_FILE(
+    TEST_ROOT_DIR "recordings/touchscreen_a/drag_2.record");
+
+/**
+ * Fixture for testing device handling.
+ * This is a separate class because gtest uses Java reflection.
+ */
+class Geis1DeviceTests : public GTestGeis1Fixture
+{
+public:
+  Geis1DeviceTests() : saw_events_(false) {}
+  void GestureUpdate(GeisGestureType type, GeisGestureId id, GeisSize count,
+                     GeisGestureAttr* attrs);
+
+  void UseNewDevice();
+
+protected:
+  void CreateNewDevice();
+
+  std::unique_ptr<Testsuite::EvemuDevice> new_device_;
+  bool saw_events_;
+};
+
+namespace
+{
+
+void gesture_update_func(void* cookie, GeisGestureType type, GeisGestureId id,
+                    GeisSize count, GeisGestureAttr* attrs) {
+  Geis1DeviceTests* fixture = reinterpret_cast<Geis1DeviceTests*>(cookie);
+  fixture->GestureUpdate(type, id, count, attrs);
+}
+
+void gesture_null_func(void* cookie, GeisGestureType type, GeisGestureId id,
+                       GeisSize count, GeisGestureAttr* attrs) {
+}
+
+void device_added_func(void* cookie, GeisInputDeviceId deviceId, void* attrs) {
+  Geis1DeviceTests* fixture = reinterpret_cast<Geis1DeviceTests*>(cookie);
+  fixture->UseNewDevice();
+}
+
+void device_null_func(void* cookie, GeisInputDeviceId deviceId, void* attrs) {
+}
+
+} // namespace
+
+void Geis1DeviceTests::GestureUpdate(GeisGestureType type, GeisGestureId id,
+                                     GeisSize count, GeisGestureAttr* attrs)
+{
+  saw_events_ = true;
+}
+
+void Geis1DeviceTests::CreateNewDevice() {
+  new_device_.reset(new Testsuite::EvemuDevice(TEST_DEVICE_PROP_FILE));
+}
+
+void Geis1DeviceTests::UseNewDevice() {
+  new_device_->play(TEST_DEVICE_EVENTS_FILE);
+}
+
+/*
+ * Test case for lp:1009270 -- Geis v1 does not report gestures for new devices
+ *
+ * Creates a subscription before a device is present. A device is added, and
+ * then events are played. Gesture events should be detected.
+ */
+TEST_F(Geis1DeviceTests, addDeviceSubscription)
+{
+
+  static const char* gestures[] =
+  {
+    GEIS_GESTURE_TYPE_DRAG2,
+    NULL
+  };
+
+  static GeisGestureFuncs callbacks = {
+    &gesture_null_func,
+    &gesture_null_func,
+    &gesture_null_func,
+    &gesture_update_func,
+    &gesture_null_func,
+  };
+
+  static GeisInputFuncs inputfuncs = {
+    &device_added_func,
+    &device_null_func,
+    &device_null_func,
+  };
+
+  ASSERT_EQ(GEIS_STATUS_SUCCESS, geis_input_devices(geis(), &inputfuncs, this));
+
+  ASSERT_EQ(GEIS_STATUS_SUCCESS,
+            geis_subscribe(geis(), GEIS_ALL_INPUT_DEVICES, gestures, &callbacks,
+                           this));
+
+  CreateNewDevice();
+
+  while (1) {
+    fd_set read_fds;
+    FD_ZERO(&read_fds);
+    FD_SET(geis_fd(), &read_fds);
+    timeval tmo = { 1, 0 };
+    int sstat = select(geis_fd() + 1, &read_fds, NULL, NULL, &tmo);
+    EXPECT_GT(sstat, -1) << "error in select";
+    if (sstat == 0)
+      break;
+    ASSERT_EQ(GEIS_STATUS_SUCCESS, geis_event_dispatch(geis()));
+  }
+
+  EXPECT_TRUE(saw_events_);
+}