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

Side by Side Diff: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

Issue 14589017: Use MockDBusThreadManagerWithoutGMock for GetUpdateStatusApiTest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix another caller unittest. Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc » ('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 (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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "chrome/browser/chromeos/cros/mock_network_library.h" 7 #include "chrome/browser/chromeos/cros/mock_network_library.h"
8 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h" 8 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
9 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" 9 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
10 #include "chrome/browser/chromeos/login/screens/update_screen.h" 10 #include "chrome/browser/chromeos/login/screens/update_screen.h"
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestNoUpdate) { 158 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestNoUpdate) {
159 update_screen_->SetIgnoreIdleStatus(true); 159 update_screen_->SetIgnoreIdleStatus(true);
160 UpdateEngineClient::Status status; 160 UpdateEngineClient::Status status;
161 status.status = UpdateEngineClient::UPDATE_STATUS_IDLE; 161 status.status = UpdateEngineClient::UPDATE_STATUS_IDLE;
162 update_screen_->UpdateStatusChanged(status); 162 update_screen_->UpdateStatusChanged(status);
163 status.status = UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE; 163 status.status = UpdateEngineClient::UPDATE_STATUS_CHECKING_FOR_UPDATE;
164 update_screen_->UpdateStatusChanged(status); 164 update_screen_->UpdateStatusChanged(status);
165 status.status = UpdateEngineClient::UPDATE_STATUS_IDLE; 165 status.status = UpdateEngineClient::UPDATE_STATUS_IDLE;
166 // GetLastStatus() will be called via ExitUpdate() called from 166 // GetLastStatus() will be called via ExitUpdate() called from
167 // UpdateStatusChanged(). 167 // UpdateStatusChanged().
168 fake_update_engine_client_->set_update_engine_client_status(status); 168 fake_update_engine_client_->set_default_status(status);
169 169
170 EXPECT_CALL(*mock_screen_observer_, OnExit(ScreenObserver::UPDATE_NOUPDATE)) 170 EXPECT_CALL(*mock_screen_observer_, OnExit(ScreenObserver::UPDATE_NOUPDATE))
171 .Times(1); 171 .Times(1);
172 update_screen_->UpdateStatusChanged(status); 172 update_screen_->UpdateStatusChanged(status);
173 } 173 }
174 174
175 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestUpdateAvailable) { 175 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestUpdateAvailable) {
176 update_screen_->is_ignore_update_deadlines_ = true; 176 update_screen_->is_ignore_update_deadlines_ = true;
177 177
178 UpdateEngineClient::Status status; 178 UpdateEngineClient::Status status;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE)) 215 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
216 .Times(1); 216 .Times(1);
217 update_screen_->StartNetworkCheck(); 217 update_screen_->StartNetworkCheck();
218 } 218 }
219 219
220 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorCheckingForUpdate) { 220 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorCheckingForUpdate) {
221 UpdateEngineClient::Status status; 221 UpdateEngineClient::Status status;
222 status.status = UpdateEngineClient::UPDATE_STATUS_ERROR; 222 status.status = UpdateEngineClient::UPDATE_STATUS_ERROR;
223 // GetLastStatus() will be called via ExitUpdate() called from 223 // GetLastStatus() will be called via ExitUpdate() called from
224 // UpdateStatusChanged(). 224 // UpdateStatusChanged().
225 fake_update_engine_client_->set_update_engine_client_status(status); 225 fake_update_engine_client_->set_default_status(status);
226 226
227 EXPECT_CALL(*mock_screen_observer_, 227 EXPECT_CALL(*mock_screen_observer_,
228 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE)) 228 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
229 .Times(1); 229 .Times(1);
230 update_screen_->UpdateStatusChanged(status); 230 update_screen_->UpdateStatusChanged(status);
231 } 231 }
232 232
233 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorUpdating) { 233 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestErrorUpdating) {
234 UpdateEngineClient::Status status; 234 UpdateEngineClient::Status status;
235 status.status = UpdateEngineClient::UPDATE_STATUS_UPDATE_AVAILABLE; 235 status.status = UpdateEngineClient::UPDATE_STATUS_UPDATE_AVAILABLE;
236 status.new_version = "latest and greatest"; 236 status.new_version = "latest and greatest";
237 // GetLastStatus() will be called via ExitUpdate() called from 237 // GetLastStatus() will be called via ExitUpdate() called from
238 // UpdateStatusChanged(). 238 // UpdateStatusChanged().
239 fake_update_engine_client_->set_update_engine_client_status(status); 239 fake_update_engine_client_->set_default_status(status);
240 240
241 update_screen_->UpdateStatusChanged(status); 241 update_screen_->UpdateStatusChanged(status);
242 242
243 status.status = UpdateEngineClient::UPDATE_STATUS_ERROR; 243 status.status = UpdateEngineClient::UPDATE_STATUS_ERROR;
244 // GetLastStatus() will be called via ExitUpdate() called from 244 // GetLastStatus() will be called via ExitUpdate() called from
245 // UpdateStatusChanged(). 245 // UpdateStatusChanged().
246 fake_update_engine_client_->set_update_engine_client_status(status); 246 fake_update_engine_client_->set_default_status(status);
247 247
248 EXPECT_CALL(*mock_screen_observer_, 248 EXPECT_CALL(*mock_screen_observer_,
249 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING)) 249 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING))
250 .Times(1); 250 .Times(1);
251 update_screen_->UpdateStatusChanged(status); 251 update_screen_->UpdateStatusChanged(status);
252 } 252 }
253 253
254 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTemproraryOfflineNetwork) { 254 IN_PROC_BROWSER_TEST_F(UpdateScreenTest, TestTemproraryOfflineNetwork) {
255 EXPECT_CALL(*mock_screen_observer_, 255 EXPECT_CALL(*mock_screen_observer_,
256 OnExit(ScreenObserver::UPDATE_NOUPDATE)) 256 OnExit(ScreenObserver::UPDATE_NOUPDATE))
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 // Update screen will show message about proxy error because wifie 335 // Update screen will show message about proxy error because wifie
336 // network requires proxy authentication. 336 // network requires proxy authentication.
337 EXPECT_CALL(*mock_error_screen_actor_, 337 EXPECT_CALL(*mock_error_screen_actor_,
338 SetErrorState(ErrorScreen::ERROR_STATE_PROXY, std::string())) 338 SetErrorState(ErrorScreen::ERROR_STATE_PROXY, std::string()))
339 .Times(1); 339 .Times(1);
340 340
341 NotifyPortalDetectionCompleted(); 341 NotifyPortalDetectionCompleted();
342 } 342 }
343 343
344 } // namespace chromeos 344 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698