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

Side by Side Diff: chrome/browser/sync/sync_setup_wizard_unittest.cc

Issue 3117017: Remove deprecated wstring Get(As)String() methods from Value, etc. (Closed)
Patch Set: fix win Created 10 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
« no previous file with comments | « chrome/browser/sync/sync_setup_flow.cc ('k') | chrome/browser/tabs/pinned_tab_codec.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/sync/sync_setup_wizard.h" 5 #include "chrome/browser/sync/sync_setup_wizard.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/scoped_ptr.h" 8 #include "base/scoped_ptr.h"
9 #include "base/stl_util-inl.h" 9 #include "base/stl_util-inl.h"
10 #include "chrome/browser/browser.h" 10 #include "chrome/browser/browser.h"
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 AuthError invalid_gaia(AuthError::INVALID_GAIA_CREDENTIALS); 245 AuthError invalid_gaia(AuthError::INVALID_GAIA_CREDENTIALS);
246 service_->set_auth_state(kTestUser, invalid_gaia); 246 service_->set_auth_state(kTestUser, invalid_gaia);
247 wizard_->Step(SyncSetupWizard::GAIA_LOGIN); 247 wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
248 EXPECT_TRUE(wizard_->IsVisible()); 248 EXPECT_TRUE(wizard_->IsVisible());
249 EXPECT_FALSE(test_window_->TestAndResetWasShowHTMLDialogCalled()); 249 EXPECT_FALSE(test_window_->TestAndResetWasShowHTMLDialogCalled());
250 EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, test_window_->flow()->current_state_); 250 EXPECT_EQ(SyncSetupWizard::GAIA_LOGIN, test_window_->flow()->current_state_);
251 dialog_args.Clear(); 251 dialog_args.Clear();
252 SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args); 252 SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
253 EXPECT_EQ(5U, dialog_args.size()); 253 EXPECT_EQ(5U, dialog_args.size());
254 std::string iframe_to_show; 254 std::string iframe_to_show;
255 dialog_args.GetString(L"iframeToShow", &iframe_to_show); 255 dialog_args.GetString("iframeToShow", &iframe_to_show);
256 EXPECT_EQ("login", iframe_to_show); 256 EXPECT_EQ("login", iframe_to_show);
257 std::string actual_user; 257 std::string actual_user;
258 dialog_args.GetString(L"user", &actual_user); 258 dialog_args.GetString("user", &actual_user);
259 EXPECT_EQ(kTestUser, actual_user); 259 EXPECT_EQ(kTestUser, actual_user);
260 int error = -1; 260 int error = -1;
261 dialog_args.GetInteger(L"error", &error); 261 dialog_args.GetInteger("error", &error);
262 EXPECT_EQ(static_cast<int>(AuthError::INVALID_GAIA_CREDENTIALS), error); 262 EXPECT_EQ(static_cast<int>(AuthError::INVALID_GAIA_CREDENTIALS), error);
263 service_->set_auth_state(kTestUser, AuthError::None()); 263 service_->set_auth_state(kTestUser, AuthError::None());
264 264
265 // Simulate captcha. 265 // Simulate captcha.
266 AuthError captcha_error(AuthError::FromCaptchaChallenge( 266 AuthError captcha_error(AuthError::FromCaptchaChallenge(
267 std::string(), GURL(kTestCaptchaUrl), GURL())); 267 std::string(), GURL(kTestCaptchaUrl), GURL()));
268 service_->set_auth_state(kTestUser, captcha_error); 268 service_->set_auth_state(kTestUser, captcha_error);
269 wizard_->Step(SyncSetupWizard::GAIA_LOGIN); 269 wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
270 SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args); 270 SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
271 EXPECT_EQ(5U, dialog_args.size()); 271 EXPECT_EQ(5U, dialog_args.size());
272 dialog_args.GetString(L"iframeToShow", &iframe_to_show); 272 dialog_args.GetString("iframeToShow", &iframe_to_show);
273 EXPECT_EQ("login", iframe_to_show); 273 EXPECT_EQ("login", iframe_to_show);
274 std::string captcha_url; 274 std::string captcha_url;
275 dialog_args.GetString(L"captchaUrl", &captcha_url); 275 dialog_args.GetString("captchaUrl", &captcha_url);
276 EXPECT_EQ(kTestCaptchaUrl, GURL(captcha_url).spec()); 276 EXPECT_EQ(kTestCaptchaUrl, GURL(captcha_url).spec());
277 error = -1; 277 error = -1;
278 dialog_args.GetInteger(L"error", &error); 278 dialog_args.GetInteger("error", &error);
279 EXPECT_EQ(static_cast<int>(AuthError::CAPTCHA_REQUIRED), error); 279 EXPECT_EQ(static_cast<int>(AuthError::CAPTCHA_REQUIRED), error);
280 service_->set_auth_state(kTestUser, AuthError::None()); 280 service_->set_auth_state(kTestUser, AuthError::None());
281 281
282 // Simulate success. 282 // Simulate success.
283 wizard_->Step(SyncSetupWizard::GAIA_SUCCESS); 283 wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
284 EXPECT_TRUE(wizard_->IsVisible()); 284 EXPECT_TRUE(wizard_->IsVisible());
285 EXPECT_FALSE(test_window_->TestAndResetWasShowHTMLDialogCalled()); 285 EXPECT_FALSE(test_window_->TestAndResetWasShowHTMLDialogCalled());
286 // In a non-discrete run, GAIA_SUCCESS immediately transitions you to 286 // In a non-discrete run, GAIA_SUCCESS immediately transitions you to
287 // CHOOSE_DATA_TYPES. 287 // CHOOSE_DATA_TYPES.
288 EXPECT_EQ(SyncSetupWizard::CHOOSE_DATA_TYPES, 288 EXPECT_EQ(SyncSetupWizard::CHOOSE_DATA_TYPES,
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 wizard_->Step(SyncSetupWizard::GAIA_LOGIN); 467 wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
468 EXPECT_EQ(SyncSetupWizard::GAIA_SUCCESS, test_window_->flow()->end_state_); 468 EXPECT_EQ(SyncSetupWizard::GAIA_SUCCESS, test_window_->flow()->end_state_);
469 469
470 AuthError invalid_gaia(AuthError::INVALID_GAIA_CREDENTIALS); 470 AuthError invalid_gaia(AuthError::INVALID_GAIA_CREDENTIALS);
471 service_->set_auth_state(kTestUser, invalid_gaia); 471 service_->set_auth_state(kTestUser, invalid_gaia);
472 wizard_->Step(SyncSetupWizard::GAIA_LOGIN); 472 wizard_->Step(SyncSetupWizard::GAIA_LOGIN);
473 EXPECT_TRUE(wizard_->IsVisible()); 473 EXPECT_TRUE(wizard_->IsVisible());
474 SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args); 474 SyncSetupFlow::GetArgsForGaiaLogin(service_, &dialog_args);
475 EXPECT_EQ(5U, dialog_args.size()); 475 EXPECT_EQ(5U, dialog_args.size());
476 std::string iframe_to_show; 476 std::string iframe_to_show;
477 dialog_args.GetString(L"iframeToShow", &iframe_to_show); 477 dialog_args.GetString("iframeToShow", &iframe_to_show);
478 EXPECT_EQ("login", iframe_to_show); 478 EXPECT_EQ("login", iframe_to_show);
479 std::string actual_user; 479 std::string actual_user;
480 dialog_args.GetString(L"user", &actual_user); 480 dialog_args.GetString("user", &actual_user);
481 EXPECT_EQ(kTestUser, actual_user); 481 EXPECT_EQ(kTestUser, actual_user);
482 int error = -1; 482 int error = -1;
483 dialog_args.GetInteger(L"error", &error); 483 dialog_args.GetInteger("error", &error);
484 EXPECT_EQ(static_cast<int>(AuthError::INVALID_GAIA_CREDENTIALS), error); 484 EXPECT_EQ(static_cast<int>(AuthError::INVALID_GAIA_CREDENTIALS), error);
485 service_->set_auth_state(kTestUser, AuthError::None()); 485 service_->set_auth_state(kTestUser, AuthError::None());
486 486
487 wizard_->Step(SyncSetupWizard::GAIA_SUCCESS); 487 wizard_->Step(SyncSetupWizard::GAIA_SUCCESS);
488 EXPECT_TRUE(test_window_->TestAndResetWasShowHTMLDialogCalled()); 488 EXPECT_TRUE(test_window_->TestAndResetWasShowHTMLDialogCalled());
489 } 489 }
490 490
491 #undef SKIP_TEST_ON_MACOSX 491 #undef SKIP_TEST_ON_MACOSX
OLDNEW
« no previous file with comments | « chrome/browser/sync/sync_setup_flow.cc ('k') | chrome/browser/tabs/pinned_tab_codec.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698