Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Side by Side Diff: ui/views/mus/window_manager_connection_unittest.cc

Issue 2125663002: mus: Add watcher for all touch events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change back to support only one event matcher with TODOs and DCHECKs. Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/mus/window_manager_connection.h" 5 #include "ui/views/mus/window_manager_connection.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
11 #include "ui/events/event.h" 11 #include "ui/events/event.h"
12 #include "ui/views/pointer_watcher.h" 12 #include "ui/views/pointer_watcher.h"
13 #include "ui/views/test/scoped_views_test_helper.h" 13 #include "ui/views/test/scoped_views_test_helper.h"
14 #include "ui/views/touch_event_watcher.h"
14 15
15 namespace views { 16 namespace views {
16 namespace { 17 namespace {
17 18
18 class TestPointerWatcher : public PointerWatcher { 19 class TestPointerWatcher : public PointerWatcher {
19 public: 20 public:
20 TestPointerWatcher() {} 21 TestPointerWatcher() {}
21 ~TestPointerWatcher() override {} 22 ~TestPointerWatcher() override {}
22 23
23 bool mouse_pressed() const { return mouse_pressed_; } 24 bool mouse_pressed() const { return mouse_pressed_; }
(...skipping 18 matching lines...) Expand all
42 43
43 private: 44 private:
44 bool mouse_pressed_ = false; 45 bool mouse_pressed_ = false;
45 bool touch_pressed_ = false; 46 bool touch_pressed_ = false;
46 47
47 DISALLOW_COPY_AND_ASSIGN(TestPointerWatcher); 48 DISALLOW_COPY_AND_ASSIGN(TestPointerWatcher);
48 }; 49 };
49 50
50 } // namespace 51 } // namespace
51 52
53 namespace {
54
55 class TestTouchEventWatcher : public TouchEventWatcher {
56 public:
57 TestTouchEventWatcher() {}
58 ~TestTouchEventWatcher() override {}
59
60 bool touch_observed() const { return touch_observed_; }
61
62 void Reset() { touch_observed_ = false; }
63
64 // TouchEventWatcher:
65 void OnTouchEventObserved(const ui::LocatedEvent& event,
66 const gfx::Point& location_in_screen,
67 Widget* target) override {
68 touch_observed_ = true;
69 }
70
71 private:
72 bool touch_observed_ = false;
73
74 DISALLOW_COPY_AND_ASSIGN(TestTouchEventWatcher);
75 };
76
77 } // namespace
78
52 class WindowManagerConnectionTest : public testing::Test { 79 class WindowManagerConnectionTest : public testing::Test {
53 public: 80 public:
54 WindowManagerConnectionTest() {} 81 WindowManagerConnectionTest() {}
55 ~WindowManagerConnectionTest() override {} 82 ~WindowManagerConnectionTest() override {}
56 83
57 void OnEventObserved(const ui::Event& event) { 84 void OnEventObserved(const ui::Event& event) {
58 WindowManagerConnection::Get()->OnEventObserved(event, nullptr); 85 WindowManagerConnection::Get()->OnEventObserved(event, nullptr);
59 } 86 }
60 87
61 private: 88 private:
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 watcher1.Reset(); 135 watcher1.Reset();
109 watcher2.Reset(); 136 watcher2.Reset();
110 137
111 // Removing the last PointerWatcher stops sending events to it. 138 // Removing the last PointerWatcher stops sending events to it.
112 connection->RemovePointerWatcher(&watcher2); 139 connection->RemovePointerWatcher(&watcher2);
113 OnEventObserved(mouse_pressed); 140 OnEventObserved(mouse_pressed);
114 EXPECT_FALSE(watcher1.mouse_pressed()); 141 EXPECT_FALSE(watcher1.mouse_pressed());
115 EXPECT_FALSE(watcher1.touch_pressed()); 142 EXPECT_FALSE(watcher1.touch_pressed());
116 } 143 }
117 144
145 TEST_F(WindowManagerConnectionTest, TouchEventWatcher) {
146 base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
147 ScopedViewsTestHelper helper;
148 WindowManagerConnection* connection = WindowManagerConnection::Get();
149 ASSERT_TRUE(connection);
150
151 const ui::EventType kMouseType[] = {
152 ui::ET_MOUSE_PRESSED, ui::ET_MOUSE_DRAGGED, ui::ET_MOUSE_MOVED,
153 ui::ET_MOUSE_ENTERED, ui::ET_MOUSE_EXITED, ui::ET_MOUSE_RELEASED};
154 const ui::EventType kTouchType[] = {ui::ET_TOUCH_PRESSED, ui::ET_TOUCH_MOVED,
155 ui::ET_TOUCH_RELEASED,
156 ui::ET_TOUCH_CANCELLED};
157
158 TestTouchEventWatcher watcher1;
159 connection->AddTouchEventWatcher(&watcher1);
160
161 // TouchEventWatchers do not trigger for mouse events.
162 for (size_t i = 0; i < arraysize(kMouseType); i++) {
163 ui::MouseEvent mouse_event(kMouseType[i], gfx::Point(0, 0),
164 gfx::Point(0, 0), base::TimeTicks(), 0, 0);
165 ui::PointerEvent mouse_pointer_event(mouse_event);
166 EXPECT_TRUE(mouse_pointer_event.IsMousePointerEvent());
167 OnEventObserved(mouse_pointer_event);
168 EXPECT_FALSE(watcher1.touch_observed());
169 watcher1.Reset();
170 }
171
172 // TouchEventWatchers receive both TouchEvent and TouchPointerEvent.
173 for (size_t i = 0; i < arraysize(kTouchType); i++) {
174 ui::TouchEvent touch_event(kTouchType[i], gfx::Point(0, 0), 0,
175 base::TimeTicks());
176 EXPECT_TRUE(touch_event.IsTouchEvent());
177 OnEventObserved(touch_event);
178 EXPECT_TRUE(watcher1.touch_observed());
179 watcher1.Reset();
180
181 ui::PointerEvent touch_pointer_event(touch_event);
182 EXPECT_TRUE(touch_pointer_event.IsTouchPointerEvent());
183 OnEventObserved(touch_pointer_event);
184 EXPECT_TRUE(watcher1.touch_observed());
185 watcher1.Reset();
186 }
187
188 // Two TouchEventWatchers can both receive a single observed event.
189 TestTouchEventWatcher watcher2;
190 connection->AddTouchEventWatcher(&watcher2);
191 ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0,
192 base::TimeTicks());
193 ui::PointerEvent touch_pointer_event(touch_event);
194 OnEventObserved(touch_pointer_event);
195 EXPECT_TRUE(watcher1.touch_observed());
196 EXPECT_TRUE(watcher2.touch_observed());
197 watcher1.Reset();
198 watcher2.Reset();
199
200 // Removing the first TouchEventWatcher stops sending events to it.
201 connection->RemoveTouchEventWatcher(&watcher1);
202 OnEventObserved(touch_pointer_event);
203 EXPECT_FALSE(watcher1.touch_observed());
204 EXPECT_TRUE(watcher2.touch_observed());
205 watcher1.Reset();
206 watcher2.Reset();
207
208 // Removing the last TouchEventWatcher stops sending events to it.
209 connection->RemoveTouchEventWatcher(&watcher2);
210 OnEventObserved(touch_pointer_event);
211 EXPECT_FALSE(watcher1.touch_observed());
212 EXPECT_FALSE(watcher2.touch_observed());
213 }
214
118 } // namespace views 215 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698