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

Side by Side Diff: ui/views/bubble/bubble_dialog_delegate_unittest.cc

Issue 1891823004: MacViews: Fix BubbleDialogDelegateTest.CloseMethods (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move call to Widget::Show() to CreateTestWidget(). Created 4 years, 8 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 | « no previous file | 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 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/bubble/bubble_dialog_delegate.h" 5 #include "ui/views/bubble/bubble_dialog_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "ui/base/hit_test.h" 10 #include "ui/base/hit_test.h"
(...skipping 30 matching lines...) Expand all
41 View* view_; 41 View* view_;
42 42
43 DISALLOW_COPY_AND_ASSIGN(TestBubbleDialogDelegateView); 43 DISALLOW_COPY_AND_ASSIGN(TestBubbleDialogDelegateView);
44 }; 44 };
45 45
46 class BubbleDialogDelegateTest : public ViewsTestBase { 46 class BubbleDialogDelegateTest : public ViewsTestBase {
47 public: 47 public:
48 BubbleDialogDelegateTest() {} 48 BubbleDialogDelegateTest() {}
49 ~BubbleDialogDelegateTest() override {} 49 ~BubbleDialogDelegateTest() override {}
50 50
51 // Creates a test widget that owns its native widget. 51 // Creates and shows a test widget that owns its native widget.
52 Widget* CreateTestWidget() { 52 Widget* CreateTestWidget() {
53 Widget* widget = new Widget(); 53 Widget* widget = new Widget();
54 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW); 54 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
55 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; 55 params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
56 widget->Init(params); 56 widget->Init(params);
57 widget->Show();
57 return widget; 58 return widget;
58 } 59 }
59 60
60 private: 61 private:
61 DISALLOW_COPY_AND_ASSIGN(BubbleDialogDelegateTest); 62 DISALLOW_COPY_AND_ASSIGN(BubbleDialogDelegateTest);
62 }; 63 };
63 64
64 } // namespace 65 } // namespace
65 66
66 TEST_F(BubbleDialogDelegateTest, CreateDelegate) { 67 TEST_F(BubbleDialogDelegateTest, CreateDelegate) {
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
241 242
242 TEST_F(BubbleDialogDelegateTest, VisibleWhenAnchorWidgetBoundsChanged) { 243 TEST_F(BubbleDialogDelegateTest, VisibleWhenAnchorWidgetBoundsChanged) {
243 std::unique_ptr<Widget> anchor_widget(CreateTestWidget()); 244 std::unique_ptr<Widget> anchor_widget(CreateTestWidget());
244 BubbleDialogDelegateView* bubble_delegate = 245 BubbleDialogDelegateView* bubble_delegate =
245 new TestBubbleDialogDelegateView(anchor_widget->GetContentsView()); 246 new TestBubbleDialogDelegateView(anchor_widget->GetContentsView());
246 Widget* bubble_widget = 247 Widget* bubble_widget =
247 BubbleDialogDelegateView::CreateBubble(bubble_delegate); 248 BubbleDialogDelegateView::CreateBubble(bubble_delegate);
248 test::TestWidgetObserver bubble_observer(bubble_widget); 249 test::TestWidgetObserver bubble_observer(bubble_widget);
249 EXPECT_FALSE(bubble_observer.widget_closed()); 250 EXPECT_FALSE(bubble_observer.widget_closed());
250 251
251 anchor_widget->Show();
252 bubble_widget->Show(); 252 bubble_widget->Show();
253 EXPECT_TRUE(bubble_widget->IsVisible()); 253 EXPECT_TRUE(bubble_widget->IsVisible());
254 anchor_widget->SetBounds(gfx::Rect(10, 10, 100, 100)); 254 anchor_widget->SetBounds(gfx::Rect(10, 10, 100, 100));
255 EXPECT_TRUE(bubble_widget->IsVisible()); 255 EXPECT_TRUE(bubble_widget->IsVisible());
256 } 256 }
257 257
258 // Test that setting WidgetDelegate::set_can_activate() to false makes the 258 // Test that setting WidgetDelegate::set_can_activate() to false makes the
259 // widget created via BubbleDialogDelegateView::CreateBubble() not activatable. 259 // widget created via BubbleDialogDelegateView::CreateBubble() not activatable.
260 TEST_F(BubbleDialogDelegateTest, NotActivatable) { 260 TEST_F(BubbleDialogDelegateTest, NotActivatable) {
261 std::unique_ptr<Widget> anchor_widget(CreateTestWidget()); 261 std::unique_ptr<Widget> anchor_widget(CreateTestWidget());
262 BubbleDialogDelegateView* bubble_delegate = 262 BubbleDialogDelegateView* bubble_delegate =
263 new TestBubbleDialogDelegateView(anchor_widget->GetContentsView()); 263 new TestBubbleDialogDelegateView(anchor_widget->GetContentsView());
264 bubble_delegate->set_can_activate(false); 264 bubble_delegate->set_can_activate(false);
265 Widget* bubble_widget = 265 Widget* bubble_widget =
266 BubbleDialogDelegateView::CreateBubble(bubble_delegate); 266 BubbleDialogDelegateView::CreateBubble(bubble_delegate);
267 bubble_widget->Show(); 267 bubble_widget->Show();
268 EXPECT_FALSE(bubble_widget->CanActivate()); 268 EXPECT_FALSE(bubble_widget->CanActivate());
269 } 269 }
270 270
271 TEST_F(BubbleDialogDelegateTest, CloseMethods) { 271 TEST_F(BubbleDialogDelegateTest, CloseMethods) {
272 { 272 {
273 std::unique_ptr<Widget> anchor_widget(CreateTestWidget()); 273 std::unique_ptr<Widget> anchor_widget(CreateTestWidget());
274 BubbleDialogDelegateView* bubble_delegate = 274 BubbleDialogDelegateView* bubble_delegate =
275 new TestBubbleDialogDelegateView(anchor_widget->GetContentsView()); 275 new TestBubbleDialogDelegateView(anchor_widget->GetContentsView());
276 bubble_delegate->set_close_on_deactivate(true); 276 bubble_delegate->set_close_on_deactivate(true);
277 Widget* bubble_widget = 277 Widget* bubble_widget =
278 BubbleDialogDelegateView::CreateBubble(bubble_delegate); 278 BubbleDialogDelegateView::CreateBubble(bubble_delegate);
279 anchor_widget->Show();
280 bubble_widget->Show(); 279 bubble_widget->Show();
281 anchor_widget->Activate(); 280 anchor_widget->Activate();
282 EXPECT_TRUE(bubble_widget->IsClosed()); 281 EXPECT_TRUE(bubble_widget->IsClosed());
283 } 282 }
284 283
285 { 284 {
286 std::unique_ptr<Widget> anchor_widget(CreateTestWidget()); 285 std::unique_ptr<Widget> anchor_widget(CreateTestWidget());
287 BubbleDialogDelegateView* bubble_delegate = 286 BubbleDialogDelegateView* bubble_delegate =
288 new TestBubbleDialogDelegateView(anchor_widget->GetContentsView()); 287 new TestBubbleDialogDelegateView(anchor_widget->GetContentsView());
289 Widget* bubble_widget = 288 Widget* bubble_widget =
(...skipping 17 matching lines...) Expand all
307 ASSERT_TRUE(close_button); 306 ASSERT_TRUE(close_button);
308 frame_view->ButtonPressed( 307 frame_view->ButtonPressed(
309 close_button, 308 close_button,
310 ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(), 309 ui::MouseEvent(ui::ET_MOUSE_PRESSED, gfx::Point(), gfx::Point(),
311 ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE)); 310 ui::EventTimeForNow(), ui::EF_NONE, ui::EF_NONE));
312 EXPECT_TRUE(bubble_widget->IsClosed()); 311 EXPECT_TRUE(bubble_widget->IsClosed());
313 } 312 }
314 } 313 }
315 314
316 } // namespace views 315 } // namespace views
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698