← Back to branch summary

~oif-packaging/grail/raring

« back to all changes in this revision

Viewing changes to test/x11/timeout.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/timeout.cpp
49
49
#include "device.h"
50
50
#include "recording.h"
51
51
#include "x11/fixture.h"
52
 
#include "utouch/frame_x11.h"
 
52
#include "oif/frame_x11.h"
53
53
 
54
54
namespace {
55
55
 
59
59
 
60
60
} // namespace
61
61
 
62
 
using namespace utouch::grail::x11::testing;
 
62
using namespace oif::grail::x11::testing;
63
63
 
64
64
class Timeout : public Test {
65
65
 public:
80
80
};
81
81
 
82
82
void Timeout::SetUp() {
83
 
  ASSERT_NO_FATAL_FAILURE(utouch::grail::x11::testing::Test::SetUp());
 
83
  ASSERT_NO_FATAL_FAILURE(oif::grail::x11::testing::Test::SetUp());
84
84
 
85
85
  Window root = DefaultRootWindow(Display());
86
86
 
228
228
}
229
229
 
230
230
TEST_F(Timeout, Recording) {
231
 
  utouch::evemu::Device device(TEST_ROOT_DIR "recordings/ntrig_dell_xt2/device.prop");
 
231
  oif::evemu::Device device(TEST_ROOT_DIR "recordings/ntrig_dell_xt2/device.prop");
232
232
 
233
233
  /* Pump once to ensure the X server has initialized the device */
234
234
  PumpEvents();
235
235
  ASSERT_NE(nullptr, device_) << "X server failed to initialize touchscreen";
236
236
 
237
 
  utouch::evemu::Recording bad_drag(device,
 
237
  oif::evemu::Recording bad_drag(device,
238
238
                                    TEST_ROOT_DIR "recordings/ntrig_dell_xt2/timeout.record");
239
239
 
240
240
  bad_drag.Play();