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

Side by Side Diff: chrome/browser/chromeos/ui/idle_logout_dialog_view_browsertest.cc

Issue 10825085: Move RunAllPendingInMessageLoop from ui_test_utils.h to test_utils.h, so that it can be reused by c… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
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/chromeos/ui/idle_logout_dialog_view.h" 5 #include "chrome/browser/chromeos/ui/idle_logout_dialog_view.h"
6 6
7 #include "chrome/browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h" 7 #include "chrome/browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h"
8 #include "chrome/test/base/in_process_browser_test.h" 8 #include "chrome/test/base/in_process_browser_test.h"
9 #include "chrome/test/base/ui_test_utils.h" 9 #include "chrome/test/base/ui_test_utils.h"
10 10
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 79
80 IdleLogoutDialogView::CloseDialog(); 80 IdleLogoutDialogView::CloseDialog();
81 ExpectClosedDialog(); 81 ExpectClosedDialog();
82 } 82 }
83 83
84 IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest, ShowDialogAndCloseView) { 84 IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest, ShowDialogAndCloseView) {
85 IdleLogoutDialogView::ShowDialog(); 85 IdleLogoutDialogView::ShowDialog();
86 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog()); 86 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog());
87 87
88 IdleLogoutDialogView::current_instance()->Close(); 88 IdleLogoutDialogView::current_instance()->Close();
89 ui_test_utils::RunAllPendingInMessageLoop(); 89 content::RunAllPendingInMessageLoop();
90 ExpectClosedDialog(); 90 ExpectClosedDialog();
91 } 91 }
92 92
93 IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest, ShowDialogAndCloseViewClose) { 93 IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest, ShowDialogAndCloseViewClose) {
94 IdleLogoutDialogView::ShowDialog(); 94 IdleLogoutDialogView::ShowDialog();
95 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog()); 95 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog());
96 96
97 IdleLogoutDialogView::current_instance()->Close(); 97 IdleLogoutDialogView::current_instance()->Close();
98 ui_test_utils::RunAllPendingInMessageLoop(); 98 content::RunAllPendingInMessageLoop();
99 IdleLogoutDialogView::CloseDialog(); 99 IdleLogoutDialogView::CloseDialog();
100 100
101 ExpectClosedDialog(); 101 ExpectClosedDialog();
102 } 102 }
103 103
104 IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest, 104 IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest,
105 OutOfOrderMultipleShowDialogAndClose) { 105 OutOfOrderMultipleShowDialogAndClose) {
106 IdleLogoutDialogView::CloseDialog(); 106 IdleLogoutDialogView::CloseDialog();
107 ExpectClosedDialog(); 107 ExpectClosedDialog();
108 108
109 IdleLogoutDialogView::ShowDialog(); 109 IdleLogoutDialogView::ShowDialog();
110 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog()); 110 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog());
111 IdleLogoutDialogView::ShowDialog(); 111 IdleLogoutDialogView::ShowDialog();
112 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog()); 112 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog());
113 113
114 IdleLogoutDialogView::CloseDialog(); 114 IdleLogoutDialogView::CloseDialog();
115 ExpectClosedDialog(); 115 ExpectClosedDialog();
116 IdleLogoutDialogView::CloseDialog(); 116 IdleLogoutDialogView::CloseDialog();
117 ExpectClosedDialog(); 117 ExpectClosedDialog();
118 } 118 }
119 119
120 IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest, 120 IN_PROC_BROWSER_TEST_F(IdleLogoutDialogViewTest,
121 ShowDialogAndFinishCountdown) { 121 ShowDialogAndFinishCountdown) {
122 IdleLogoutDialogView::ShowDialog(); 122 IdleLogoutDialogView::ShowDialog();
123 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog()); 123 EXPECT_NO_FATAL_FAILURE(ExpectOpenDialog());
124 124
125 ui_test_utils::RunAllPendingInMessageLoop(); 125 content::RunAllPendingInMessageLoop();
126 ExpectClosedDialog(); 126 ExpectClosedDialog();
127 } 127 }
128 128
129 } // namespace chromeos 129 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller_browsertest.cc ('k') | chrome/browser/download/download_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698