← Back to branch summary

~oif-packaging/grail/raring

« back to all changes in this revision

Viewing changes to test/x11/parallel-atomic-gestures.cpp

  • Committer: Chase Douglas
  • Date: 2012-06-21 20:30:14 UTC
  • mto: This revision was merged to the branch mainline in revision 234.
  • Revision ID: chase.douglas@ubuntu.com-20120621203014-g2uhy6mg779aufop
Rename utouch-grail to grail

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/x11/parallel-atomic-gestures.cpp
41
41
 
42
42
#include <future>
43
43
#include <gtest/gtest.h>
44
 
#include <utouch/frame_x11.h>
 
44
#include <oif/frame_x11.h>
45
45
 
46
46
/* evemu wrappers */
47
47
#include "device.h"
51
51
 
52
52
#include "x11/fixture.h"
53
53
 
54
 
using namespace utouch::grail::testing;
 
54
using namespace oif::grail::testing;
55
55
 
56
56
#define DELETE_SUBSCRIPTION(sub) \
57
57
    grail_subscription_deactivate(grail_handle(), sub); \
58
58
    grail_subscription_delete(sub); \
59
59
    sub = nullptr;
60
60
 
61
 
class ParallelAtomicGestures : public utouch::grail::x11::testing::Test {
 
61
class ParallelAtomicGestures : public oif::grail::x11::testing::Test {
62
62
 public:
63
63
  ParallelAtomicGestures();
64
64
 protected:
366
366
}
367
367
 
368
368
TEST_F(ParallelAtomicGestures, Recording) {
369
 
  utouch::evemu::Device device(TEST_ROOT_DIR "recordings/apple_magic_trackpad/device.prop");
 
369
  oif::evemu::Device device(TEST_ROOT_DIR "recordings/apple_magic_trackpad/device.prop");
370
370
 
371
371
  /* Pump once to ensure the X server has initialized the device */
372
372
  PumpEvents();
373
373
  ASSERT_NE(device_, nullptr) << "X server failed to initialize trackpad";
374
374
 
375
 
  utouch::evemu::Recording recording(
 
375
  oif::evemu::Recording recording(
376
376
      device,
377
377
      TEST_ROOT_DIR "recordings/apple_magic_trackpad/3_drag_ended_by_4th_touch.record");
378
378