← Back to branch summary

~chasedouglas/grail/work-in-progress

« back to all changes in this revision

Viewing changes to test/x11/no-tap-after-drag.cpp

  • Committer: Chase Douglas
  • Date: 2012-03-19 16:55:49 UTC
  • mfrom: (199.1.5 gesture-end-fix)
  • Revision ID: chase.douglas@ubuntu.com-20120319165549-n0orytbxe1rd0a3x
https://launchpad.net/bugs/957437
https://launchpad.net/bugs/949855
Merge fixes for atomic gesture timeout handling and gesture end handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/x11/no-tap-after-drag.cpp
94
94
  status = frame_device_get_property(device, UFDevicePropertyName, &name);
95
95
  ASSERT_EQ(status, UFStatusSuccess);
96
96
 
97
 
  if (strcmp(name, "Apple Wireless Trackpad") == 0) {
 
97
  if (strcmp(name, "Apple Magic Trackpad (Virtual Test Device)") == 0) {
98
98
    EXPECT_EQ(device_, nullptr);
99
99
    device_ = device;
100
100
    CreateSubscriptions();
186
186
}
187
187
 
188
188
void NoTapAfterDrag::SetupEvEmuDeviceAndRun() {
189
 
  utouch::evemu::Device device("recordings/apple-wireless-trackpad.prop");
 
189
  utouch::evemu::Device device("recordings/apple_magic_trackpad/device.prop");
190
190
 
191
191
  /* Pump once to ensure the X server has initialized the device */
192
192
  PumpEvents();
193
193
  ASSERT_NE(device_, nullptr) << "X server failed to initialize trackpad";
194
194
 
195
 
  utouch::evemu::Recording recording(device, "recordings/apple-wtrackpad-4fingers-drag.event");
 
195
  utouch::evemu::Recording recording(
 
196
      device,
 
197
      "recordings/apple_magic_trackpad/4_drag.record");
196
198
 
197
199
  /* We use the c++11 future module so any exceptions thrown by the thread can
198
200
   * be caught later on. If we used the thread module, exceptions would take the