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

Side by Side Diff: chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc

Issue 18179004: Dismiss action in tab modal dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make the tests pass with GTK and Cocoa Created 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h" 5 #include "chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/lifetime/application_lifetime.h" 9 #include "chrome/browser/lifetime/application_lifetime.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_dialogs.h" 11 #include "chrome/browser/ui/browser_dialogs.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" 12 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "chrome/test/base/ui_test_utils.h" 13 #include "chrome/test/base/ui_test_utils.h"
14 #include "content/public/browser/page_navigator.h"
15 #include "content/public/browser/web_contents.h"
14 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "ui/base/window_open_disposition.h"
15 18
16 MockTabModalConfirmDialogDelegate::MockTabModalConfirmDialogDelegate( 19 MockTabModalConfirmDialogDelegate::MockTabModalConfirmDialogDelegate(
17 Delegate* delegate) 20 Delegate* delegate)
18 : delegate_(delegate) { 21 : delegate_(delegate) {
19 } 22 }
20 23
21 MockTabModalConfirmDialogDelegate::~MockTabModalConfirmDialogDelegate() { 24 MockTabModalConfirmDialogDelegate::~MockTabModalConfirmDialogDelegate() {
22 } 25 }
23 26
24 string16 MockTabModalConfirmDialogDelegate::GetTitle() { 27 string16 MockTabModalConfirmDialogDelegate::GetTitle() {
25 return string16(); 28 return string16();
26 } 29 }
27 30
28 string16 MockTabModalConfirmDialogDelegate::GetMessage() { 31 string16 MockTabModalConfirmDialogDelegate::GetMessage() {
29 return string16(); 32 return string16();
30 } 33 }
31 34
32 void MockTabModalConfirmDialogDelegate::OnAccepted() { 35 void MockTabModalConfirmDialogDelegate::OnAccepted() {
33 if (delegate_) 36 if (delegate_)
34 delegate_->OnAccepted(); 37 delegate_->OnAccepted();
35 } 38 }
36 39
37 void MockTabModalConfirmDialogDelegate::OnCanceled() { 40 void MockTabModalConfirmDialogDelegate::OnCanceled() {
38 if (delegate_) 41 if (delegate_)
39 delegate_->OnCanceled(); 42 delegate_->OnCanceled();
40 } 43 }
41 44
45 void MockTabModalConfirmDialogDelegate::OnClosed() {
46 if (delegate_)
47 delegate_->OnClosed();
48 }
49
42 TabModalConfirmDialogTest::TabModalConfirmDialogTest() 50 TabModalConfirmDialogTest::TabModalConfirmDialogTest()
43 : delegate_(NULL), 51 : delegate_(NULL),
44 dialog_(NULL), 52 dialog_(NULL),
45 accepted_count_(0), 53 accepted_count_(0),
46 canceled_count_(0) { 54 canceled_count_(0),
55 closed_count_(0) {
47 } 56 }
48 57
49 void TabModalConfirmDialogTest::SetUpOnMainThread() { 58 void TabModalConfirmDialogTest::SetUpOnMainThread() {
50 delegate_ = new MockTabModalConfirmDialogDelegate(this); 59 delegate_ = new MockTabModalConfirmDialogDelegate(this);
51 dialog_ = TabModalConfirmDialog::Create( 60 dialog_ = TabModalConfirmDialog::Create(
52 delegate_, browser()->tab_strip_model()->GetActiveWebContents()); 61 delegate_, browser()->tab_strip_model()->GetActiveWebContents());
53 content::RunAllPendingInMessageLoop(); 62 content::RunAllPendingInMessageLoop();
54 } 63 }
55 64
56 void TabModalConfirmDialogTest::CleanUpOnMainThread() { 65 void TabModalConfirmDialogTest::CleanUpOnMainThread() {
57 content::RunAllPendingInMessageLoop(); 66 content::RunAllPendingInMessageLoop();
58 } 67 }
59 68
60 void TabModalConfirmDialogTest::OnAccepted() { 69 void TabModalConfirmDialogTest::OnAccepted() {
61 ++accepted_count_; 70 ++accepted_count_;
62 } 71 }
63 72
64 void TabModalConfirmDialogTest::OnCanceled() { 73 void TabModalConfirmDialogTest::OnCanceled() {
65 ++canceled_count_; 74 ++canceled_count_;
66 } 75 }
67 76
77 void TabModalConfirmDialogTest::OnClosed() {
78 ++closed_count_;
79 }
80
68 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Accept) { 81 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Accept) {
69 dialog_->AcceptTabModalDialog(); 82 dialog_->AcceptTabModalDialog();
70 EXPECT_EQ(1, accepted_count_); 83 EXPECT_EQ(1, accepted_count_);
71 EXPECT_EQ(0, canceled_count_); 84 EXPECT_EQ(0, canceled_count_);
85 EXPECT_EQ(0, closed_count_);
72 } 86 }
73 87
74 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Cancel) { 88 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Cancel) {
75 dialog_->CancelTabModalDialog(); 89 dialog_->CancelTabModalDialog();
76 EXPECT_EQ(0, accepted_count_); 90 EXPECT_EQ(0, accepted_count_);
77 EXPECT_EQ(1, canceled_count_); 91 EXPECT_EQ(1, canceled_count_);
92 EXPECT_EQ(0, closed_count_);
78 } 93 }
79 94
80 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, CancelSelf) { 95 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, CancelSelf) {
81 delegate_->Cancel(); 96 delegate_->Cancel();
82 EXPECT_EQ(0, accepted_count_); 97 EXPECT_EQ(0, accepted_count_);
83 EXPECT_EQ(1, canceled_count_); 98 EXPECT_EQ(1, canceled_count_);
99 EXPECT_EQ(0, closed_count_);
100 }
101
102 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Close) {
103 dialog_->CloseDialog();
104 EXPECT_EQ(0, accepted_count_);
105 EXPECT_EQ(0, canceled_count_);
106 EXPECT_EQ(1, closed_count_);
107 }
108
109 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Navigate) {
110 content::OpenURLParams params(GURL("about:blank"),
111 content::Referrer(),
112 CURRENT_TAB,
113 content::PAGE_TRANSITION_LINK,
114 false);
115 browser()->tab_strip_model()->GetActiveWebContents()->OpenURL(params);
116
117 EXPECT_EQ(0, accepted_count_);
118 EXPECT_EQ(0, canceled_count_);
119 EXPECT_EQ(1, closed_count_);
84 } 120 }
85 121
86 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Quit) { 122 IN_PROC_BROWSER_TEST_F(TabModalConfirmDialogTest, Quit) {
87 base::MessageLoopForUI::current()->PostTask(FROM_HERE, 123 base::MessageLoopForUI::current()->PostTask(FROM_HERE,
88 base::Bind(&chrome::AttemptExit)); 124 base::Bind(&chrome::AttemptExit));
89 content::RunMessageLoop(); 125 content::RunMessageLoop();
90 EXPECT_EQ(0, accepted_count_); 126 EXPECT_EQ(0, accepted_count_);
91 EXPECT_EQ(1, canceled_count_); 127 EXPECT_EQ(0, canceled_count_);
128 EXPECT_EQ(1, closed_count_);
92 } 129 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698