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

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: Fix a comment 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
« no previous file with comments | « ui/views/mus/window_manager_connection.cc ('k') | ui/views/pointer_watcher.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 Widget* target) override {
67 touch_observed_ = true;
68 }
69
70 private:
71 bool touch_observed_ = false;
72
73 DISALLOW_COPY_AND_ASSIGN(TestTouchEventWatcher);
74 };
75
76 } // namespace
77
52 class WindowManagerConnectionTest : public testing::Test { 78 class WindowManagerConnectionTest : public testing::Test {
53 public: 79 public:
54 WindowManagerConnectionTest() {} 80 WindowManagerConnectionTest() {}
55 ~WindowManagerConnectionTest() override {} 81 ~WindowManagerConnectionTest() override {}
56 82
57 void OnEventObserved(const ui::Event& event) { 83 void OnEventObserved(const ui::Event& event) {
58 WindowManagerConnection::Get()->OnEventObserved(event, nullptr); 84 WindowManagerConnection::Get()->OnEventObserved(event, nullptr);
59 } 85 }
60 86
61 private: 87 private:
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 watcher1.Reset(); 134 watcher1.Reset();
109 watcher2.Reset(); 135 watcher2.Reset();
110 136
111 // Removing the last PointerWatcher stops sending events to it. 137 // Removing the last PointerWatcher stops sending events to it.
112 connection->RemovePointerWatcher(&watcher2); 138 connection->RemovePointerWatcher(&watcher2);
113 OnEventObserved(mouse_pressed); 139 OnEventObserved(mouse_pressed);
114 EXPECT_FALSE(watcher1.mouse_pressed()); 140 EXPECT_FALSE(watcher1.mouse_pressed());
115 EXPECT_FALSE(watcher1.touch_pressed()); 141 EXPECT_FALSE(watcher1.touch_pressed());
116 } 142 }
117 143
144 TEST_F(WindowManagerConnectionTest, TouchEventWatcher) {
145 base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
146 ScopedViewsTestHelper helper;
147 WindowManagerConnection* connection = WindowManagerConnection::Get();
148 ASSERT_TRUE(connection);
149
150 const ui::EventType kMouseType[] = {
151 ui::ET_MOUSE_PRESSED, ui::ET_MOUSE_DRAGGED, ui::ET_MOUSE_MOVED,
152 ui::ET_MOUSE_ENTERED, ui::ET_MOUSE_EXITED, ui::ET_MOUSE_RELEASED};
153 const ui::EventType kTouchType[] = {ui::ET_TOUCH_PRESSED, ui::ET_TOUCH_MOVED,
154 ui::ET_TOUCH_RELEASED,
155 ui::ET_TOUCH_CANCELLED};
156
157 TestTouchEventWatcher watcher1;
158 connection->AddTouchEventWatcher(&watcher1);
159
160 // TouchEventWatchers do not trigger for mouse events.
161 for (size_t i = 0; i < arraysize(kMouseType); i++) {
162 ui::MouseEvent mouse_event(kMouseType[i], gfx::Point(), gfx::Point(),
163 base::TimeTicks(), 0, 0);
164 ui::PointerEvent mouse_pointer_event(mouse_event);
165 EXPECT_TRUE(mouse_pointer_event.IsMousePointerEvent());
166 OnEventObserved(mouse_pointer_event);
167 EXPECT_FALSE(watcher1.touch_observed());
168 watcher1.Reset();
169 }
170
171 // TouchEventWatchers receive both TouchEvent and TouchPointerEvent.
172 for (size_t i = 0; i < arraysize(kTouchType); i++) {
173 ui::TouchEvent touch_event(kTouchType[i], gfx::Point(), 0,
174 base::TimeTicks());
175 EXPECT_TRUE(touch_event.IsTouchEvent());
176 OnEventObserved(touch_event);
177 EXPECT_TRUE(watcher1.touch_observed());
178 watcher1.Reset();
179
180 ui::PointerEvent touch_pointer_event(touch_event);
181 EXPECT_TRUE(touch_pointer_event.IsTouchPointerEvent());
182 OnEventObserved(touch_pointer_event);
183 EXPECT_TRUE(watcher1.touch_observed());
184 watcher1.Reset();
185 }
186
187 // Two TouchEventWatchers can both receive a single observed event.
188 TestTouchEventWatcher watcher2;
189 connection->AddTouchEventWatcher(&watcher2);
190 ui::TouchEvent touch_event(ui::ET_TOUCH_PRESSED, gfx::Point(), 0,
191 base::TimeTicks());
192 ui::PointerEvent touch_pointer_event(touch_event);
193 OnEventObserved(touch_pointer_event);
194 EXPECT_TRUE(watcher1.touch_observed());
195 EXPECT_TRUE(watcher2.touch_observed());
196 watcher1.Reset();
197 watcher2.Reset();
198
199 // Removing the first TouchEventWatcher stops sending events to it.
200 connection->RemoveTouchEventWatcher(&watcher1);
201 OnEventObserved(touch_pointer_event);
202 EXPECT_FALSE(watcher1.touch_observed());
203 EXPECT_TRUE(watcher2.touch_observed());
204 watcher1.Reset();
205 watcher2.Reset();
206
207 // Removing the last TouchEventWatcher stops sending events to it.
208 connection->RemoveTouchEventWatcher(&watcher2);
209 OnEventObserved(touch_pointer_event);
210 EXPECT_FALSE(watcher1.touch_observed());
211 EXPECT_FALSE(watcher2.touch_observed());
212 }
213
118 } // namespace views 214 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/mus/window_manager_connection.cc ('k') | ui/views/pointer_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698