← Back to branch summary

~oif-packaging/grail/raring

« back to all changes in this revision

Viewing changes to test/x11/tap-touch-accept.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/tap-touch-accept.cpp
41
41
#include "device.h"
42
42
#include "recording.h"
43
43
#include "x11/fixture.h"
44
 
#include "utouch/frame_x11.h"
 
44
#include "oif/frame_x11.h"
45
45
 
46
 
using namespace utouch::grail::x11::testing;
 
46
using namespace oif::grail::x11::testing;
47
47
 
48
48
class TapTouchAccept : public Test {
49
49
 public:
63
63
};
64
64
 
65
65
void TapTouchAccept::SetUp() {
66
 
  ASSERT_NO_FATAL_FAILURE(utouch::grail::x11::testing::Test::SetUp());
 
66
  ASSERT_NO_FATAL_FAILURE(oif::grail::x11::testing::Test::SetUp());
67
67
 
68
68
  Window root = DefaultRootWindow(Display());
69
69
 
204
204
}
205
205
 
206
206
TEST_F(TapTouchAccept, Recording) {
207
 
  utouch::evemu::Device device(TEST_ROOT_DIR "recordings/ntrig_dell_xt2/device.prop");
 
207
  oif::evemu::Device device(TEST_ROOT_DIR "recordings/ntrig_dell_xt2/device.prop");
208
208
 
209
209
  /* Pump once to ensure the X server has initialized the device */
210
210
  PumpEvents();
211
211
  ASSERT_NE(nullptr, device_) << "X server failed to initialize touchscreen";
212
212
 
213
 
  utouch::evemu::Recording recording(device,
 
213
  oif::evemu::Recording recording(device,
214
214
                                     TEST_ROOT_DIR "recordings/ntrig_dell_xt2/1_tap.record");
215
215
 
216
216
  recording.Play();