Index: ui/events/x/events_x_unittest.cc |
diff --git a/ui/events/x/events_x_unittest.cc b/ui/events/x/events_x_unittest.cc |
index 5047c59b19c4dd25cf638bc9b65e9623973b3466..0078651d8b6e3f30ed0a20b19409358682dba46a 100644 |
--- a/ui/events/x/events_x_unittest.cc |
+++ b/ui/events/x/events_x_unittest.cc |
@@ -18,6 +18,7 @@ |
#include "ui/events/event_constants.h" |
#include "ui/events/event_utils.h" |
#include "ui/events/test/events_test_utils_x11.h" |
+#include "ui/events/x/device_data_manager_x11.h" |
#include "ui/gfx/point.h" |
namespace ui { |
@@ -75,7 +76,19 @@ bool HasFunctionKeyFlagSetIfSupported(Display* display, int x_keysym) { |
} // namespace |
-TEST(EventsXTest, ButtonEvents) { |
+class EventsXTest : public testing::Test { |
+ public: |
+ EventsXTest() {} |
+ virtual ~EventsXTest() {} |
+ |
+ virtual void SetUp() OVERRIDE { |
+ DeviceDataManagerX11::CreateInstance(); |
+ } |
+ private: |
+ DISALLOW_COPY_AND_ASSIGN(EventsXTest); |
+}; |
+ |
+TEST_F(EventsXTest, ButtonEvents) { |
XEvent event; |
gfx::Point location(5, 10); |
gfx::Vector2d offset; |
@@ -136,7 +149,7 @@ TEST(EventsXTest, ButtonEvents) { |
// TODO(derat): Test XInput code. |
} |
-TEST(EventsXTest, AvoidExtraEventsOnWheelRelease) { |
+TEST_F(EventsXTest, AvoidExtraEventsOnWheelRelease) { |
XEvent event; |
gfx::Point location(5, 10); |
@@ -151,7 +164,7 @@ TEST(EventsXTest, AvoidExtraEventsOnWheelRelease) { |
// TODO(derat): Test XInput code. |
} |
-TEST(EventsXTest, EnterLeaveEvent) { |
+TEST_F(EventsXTest, EnterLeaveEvent) { |
XEvent event; |
event.xcrossing.type = EnterNotify; |
event.xcrossing.x = 10; |
@@ -176,7 +189,7 @@ TEST(EventsXTest, EnterLeaveEvent) { |
EXPECT_EQ("230,240", ui::EventSystemLocationFromNative(&event).ToString()); |
} |
-TEST(EventsXTest, ClickCount) { |
+TEST_F(EventsXTest, ClickCount) { |
XEvent event; |
gfx::Point location(5, 10); |
@@ -198,16 +211,17 @@ TEST(EventsXTest, ClickCount) { |
} |
#if defined(USE_XI2_MT) |
-TEST(EventsXTest, TouchEventBasic) { |
+TEST_F(EventsXTest, TouchEventBasic) { |
std::vector<unsigned int> devices; |
devices.push_back(0); |
ui::SetUpTouchDevicesForTest(devices); |
std::vector<Valuator> valuators; |
// Init touch begin with tracking id 5, touch id 0. |
- valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_MAJOR, 20)); |
- valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_ORIENTATION, 0.3f)); |
- valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_PRESSURE, 100)); |
+ valuators.push_back(Valuator(DeviceDataManagerX11::DT_TOUCH_MAJOR, 20)); |
+ valuators.push_back( |
+ Valuator(DeviceDataManagerX11::DT_TOUCH_ORIENTATION, 0.3f)); |
+ valuators.push_back(Valuator(DeviceDataManagerX11::DT_TOUCH_PRESSURE, 100)); |
ui::ScopedXI2Event scoped_xevent; |
scoped_xevent.InitTouchEvent( |
0, XI_TouchBegin, 5, gfx::Point(10, 10), valuators); |
@@ -220,7 +234,8 @@ TEST(EventsXTest, TouchEventBasic) { |
// Touch update, with new orientation info. |
valuators.clear(); |
- valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_ORIENTATION, 0.5f)); |
+ valuators.push_back( |
+ Valuator(DeviceDataManagerX11::DT_TOUCH_ORIENTATION, 0.5f)); |
scoped_xevent.InitTouchEvent( |
0, XI_TouchUpdate, 5, gfx::Point(20, 20), valuators); |
EXPECT_EQ(ui::ET_TOUCH_MOVED, ui::EventTypeFromNative(scoped_xevent)); |
@@ -232,9 +247,10 @@ TEST(EventsXTest, TouchEventBasic) { |
// Another touch with tracking id 6, touch id 1. |
valuators.clear(); |
- valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_MAJOR, 100)); |
- valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_ORIENTATION, 0.9f)); |
- valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_PRESSURE, 500)); |
+ valuators.push_back(Valuator(DeviceDataManagerX11::DT_TOUCH_MAJOR, 100)); |
+ valuators.push_back(Valuator( |
+ DeviceDataManagerX11::DT_TOUCH_ORIENTATION, 0.9f)); |
+ valuators.push_back(Valuator(DeviceDataManagerX11::DT_TOUCH_PRESSURE, 500)); |
scoped_xevent.InitTouchEvent( |
0, XI_TouchBegin, 6, gfx::Point(200, 200), valuators); |
EXPECT_EQ(ui::ET_TOUCH_PRESSED, ui::EventTypeFromNative(scoped_xevent)); |
@@ -247,7 +263,7 @@ TEST(EventsXTest, TouchEventBasic) { |
// Touch with tracking id 5 should have old radius/angle value and new pressue |
// value. |
valuators.clear(); |
- valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_PRESSURE, 50)); |
+ valuators.push_back(Valuator(DeviceDataManagerX11::DT_TOUCH_PRESSURE, 50)); |
scoped_xevent.InitTouchEvent( |
0, XI_TouchEnd, 5, gfx::Point(30, 30), valuators); |
EXPECT_EQ(ui::ET_TOUCH_RELEASED, ui::EventTypeFromNative(scoped_xevent)); |
@@ -260,7 +276,7 @@ TEST(EventsXTest, TouchEventBasic) { |
// Touch with tracking id 6 should have old angle/pressure value and new |
// radius value. |
valuators.clear(); |
- valuators.push_back(Valuator(DeviceDataManager::DT_TOUCH_MAJOR, 50)); |
+ valuators.push_back(Valuator(DeviceDataManagerX11::DT_TOUCH_MAJOR, 50)); |
scoped_xevent.InitTouchEvent( |
0, XI_TouchEnd, 6, gfx::Point(200, 200), valuators); |
EXPECT_EQ(ui::ET_TOUCH_RELEASED, ui::EventTypeFromNative(scoped_xevent)); |
@@ -272,7 +288,7 @@ TEST(EventsXTest, TouchEventBasic) { |
} |
#endif |
-TEST(EventsXTest, NumpadKeyEvents) { |
+TEST_F(EventsXTest, NumpadKeyEvents) { |
XEvent event; |
Display* display = gfx::GetXDisplay(); |
@@ -383,7 +399,7 @@ TEST(EventsXTest, NumpadKeyEvents) { |
} |
} |
-TEST(EventsXTest, FunctionKeyEvents) { |
+TEST_F(EventsXTest, FunctionKeyEvents) { |
Display* display = gfx::GetXDisplay(); |
// Min function key code minus 1. |
@@ -429,7 +445,7 @@ TEST(EventsXTest, FunctionKeyEvents) { |
} |
#if !defined(OS_CHROMEOS) |
-TEST(EventsXTest, ImeFabricatedKeyEvents) { |
+TEST_F(EventsXTest, ImeFabricatedKeyEvents) { |
Display* display = gfx::GetXDisplay(); |
unsigned int state_to_be_fabricated[] = { |