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

Side by Side Diff: ui/android/view_android_unittests.cc

Issue 2879713002: Reland "Refined DCHECK preventing multiple event forwarders in VA tree path" (Closed)
Patch Set: fix test Created 3 years, 7 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/android/view_android.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "base/test/gtest_util.h"
5 #include "testing/gtest/include/gtest/gtest.h" 6 #include "testing/gtest/include/gtest/gtest.h"
6 #include "ui/android/event_forwarder.h" 7 #include "ui/android/event_forwarder.h"
7 #include "ui/android/view_android.h" 8 #include "ui/android/view_android.h"
8 #include "ui/android/view_client.h" 9 #include "ui/android/view_client.h"
9 #include "ui/events/android/motion_event_android.h" 10 #include "ui/events/android/motion_event_android.h"
10 11
11 namespace ui { 12 namespace ui {
12 13
13 using base::android::JavaParamRef; 14 using base::android::JavaParamRef;
14 15
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 client1_.SetHandleEvent(false); 160 client1_.SetHandleEvent(false);
160 GenerateTouchEventAt(40, 60); 161 GenerateTouchEventAt(40, 60);
161 EXPECT_TRUE(client1_.EventCalled()); 162 EXPECT_TRUE(client1_.EventCalled());
162 ExpectHit(client2_); 163 ExpectHit(client2_);
163 164
164 GenerateTouchEventAt(100, 70); 165 GenerateTouchEventAt(100, 70);
165 EXPECT_TRUE(client1_.EventCalled()); 166 EXPECT_TRUE(client1_.EventCalled());
166 ExpectHit(client3_); 167 ExpectHit(client3_);
167 } 168 }
168 169
170 #if DCHECK_IS_ON()
171 TEST(ViewAndroidTest, ChecksMultipleEventForwarders) {
172 ViewAndroid parent;
173 ViewAndroid child;
174 parent.GetEventForwarder();
175 child.GetEventForwarder();
176 EXPECT_DCHECK_DEATH(parent.AddChild(&child));
boliu 2017/05/12 01:23:13 I think using EXPECT_DCHECK_DEATH means you don't
Jinsuk Kim 2017/05/12 01:42:57 I preferred not running this test at all but there
177
178 ViewAndroid parent2;
179 ViewAndroid child2;
180 parent2.GetEventForwarder();
181 parent2.AddChild(&child2);
182 EXPECT_DCHECK_DEATH(child2.GetEventForwarder());
183
184 ViewAndroid window;
185 ViewAndroid wcv1, wcv2;
186 ViewAndroid rwhv1a, rwhv1b, rwhv2;
187 wcv1.GetEventForwarder();
188 wcv2.GetEventForwarder();
189
190 window.AddChild(&wcv1);
191 wcv1.AddChild(&rwhv1a);
192 wcv1.AddChild(&rwhv1b);
193
194 wcv2.AddChild(&rwhv2);
195
196 // window should be able to add wcv2 since there's only one event forwarder
197 // in the path window - wcv2* - rwvh2
198 window.AddChild(&wcv2);
199
200 // Additional event forwarder will cause failure.
201 EXPECT_DCHECK_DEATH(rwhv2.GetEventForwarder());
202 }
203 #endif
204
169 } // namespace ui 205 } // namespace ui
OLDNEW
« no previous file with comments | « ui/android/view_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698