| Index: ui/ozone/platform/wayland/wayland_window_unittest.cc
|
| diff --git a/ui/ozone/platform/wayland/wayland_window_unittest.cc b/ui/ozone/platform/wayland/wayland_window_unittest.cc
|
| index 4a1364ff0ebcc3ccc15274980dffc9ac731e8c86..fd2a138fac4356093ab25fab82404f5a113d8189 100644
|
| --- a/ui/ozone/platform/wayland/wayland_window_unittest.cc
|
| +++ b/ui/ozone/platform/wayland/wayland_window_unittest.cc
|
| @@ -8,6 +8,7 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| +#include "ui/events/event.h"
|
| #include "ui/ozone/platform/wayland/fake_server.h"
|
| #include "ui/ozone/platform/wayland/mock_platform_window_delegate.h"
|
| #include "ui/ozone/platform/wayland/wayland_display.h"
|
| @@ -44,7 +45,13 @@ TEST(WaylandWindowInitializeTest, Initialize) {
|
| class WaylandWindowTest : public testing::Test {
|
| public:
|
| WaylandWindowTest()
|
| - : window(&delegate, &display, gfx::Rect(0, 0, 800, 600)) {}
|
| + : window(&delegate, &display, gfx::Rect(0, 0, 800, 600)),
|
| + test_mouse_event(ET_MOUSE_PRESSED,
|
| + gfx::Point(10, 15),
|
| + gfx::Point(10, 15),
|
| + base::TimeDelta::FromSeconds(123456),
|
| + EF_LEFT_MOUSE_BUTTON | EF_RIGHT_MOUSE_BUTTON,
|
| + EF_LEFT_MOUSE_BUTTON) {}
|
|
|
| void SetUp() override {
|
| ASSERT_TRUE(server.Start());
|
| @@ -79,12 +86,13 @@ class WaylandWindowTest : public testing::Test {
|
|
|
| protected:
|
| WaylandDisplay display;
|
| -
|
| MockPlatformWindowDelegate delegate;
|
| WaylandWindow window;
|
|
|
| wl::MockXdgSurface* xdg_surface;
|
|
|
| + MouseEvent test_mouse_event;
|
| +
|
| private:
|
| DISALLOW_COPY_AND_ASSIGN(WaylandWindowTest);
|
| };
|
| @@ -109,6 +117,39 @@ TEST_F(WaylandWindowTest, Restore) {
|
| window.Restore();
|
| }
|
|
|
| +TEST_F(WaylandWindowTest, CanDispatchMouseEventDefault) {
|
| + EXPECT_FALSE(window.CanDispatchEvent(&test_mouse_event));
|
| +}
|
| +
|
| +TEST_F(WaylandWindowTest, CanDispatchMouseEventFocus) {
|
| + window.set_pointer_focus(true);
|
| + EXPECT_TRUE(window.CanDispatchEvent(&test_mouse_event));
|
| +}
|
| +
|
| +TEST_F(WaylandWindowTest, CanDispatchMouseEventUnfocus) {
|
| + window.set_pointer_focus(false);
|
| + EXPECT_FALSE(window.CanDispatchEvent(&test_mouse_event));
|
| +}
|
| +
|
| +ACTION_P(CloneEvent, ptr) {
|
| + *ptr = Event::Clone(*arg0);
|
| +}
|
| +
|
| +TEST_F(WaylandWindowTest, DispatchEvent) {
|
| + scoped_ptr<Event> event;
|
| + EXPECT_CALL(delegate, DispatchEvent(_)).WillOnce(CloneEvent(&event));
|
| + window.DispatchEvent(&test_mouse_event);
|
| + ASSERT_TRUE(event);
|
| + ASSERT_TRUE(event->IsMouseEvent());
|
| + auto mouse_event = static_cast<MouseEvent*>(event.get());
|
| + EXPECT_EQ(mouse_event->location_f(), test_mouse_event.location_f());
|
| + EXPECT_EQ(mouse_event->root_location_f(), test_mouse_event.root_location_f());
|
| + EXPECT_EQ(mouse_event->time_stamp(), test_mouse_event.time_stamp());
|
| + EXPECT_EQ(mouse_event->button_flags(), test_mouse_event.button_flags());
|
| + EXPECT_EQ(mouse_event->changed_button_flags(),
|
| + test_mouse_event.changed_button_flags());
|
| +}
|
| +
|
| TEST_F(WaylandWindowTest, ConfigureEvent) {
|
| wl_array states;
|
| wl_array_init(&states);
|
|
|