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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 289133002: Add a enterprise enrollment check screen to OOBE in ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adjusted tests and replaced webkit-box with flex. Created 6 years, 6 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
11 #include "base/prefs/pref_service_factory.h" 11 #include "base/prefs/pref_service_factory.h"
12 #include "base/prefs/testing_pref_store.h" 12 #include "base/prefs/testing_pref_store.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "chrome/browser/browser_process.h" 16 #include "chrome/browser/browser_process.h"
17 #include "chrome/browser/browser_shutdown.h" 17 #include "chrome/browser/browser_shutdown.h"
18 #include "chrome/browser/chrome_notification_types.h" 18 #include "chrome/browser/chrome_notification_types.h"
19 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 19 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
20 #include "chrome/browser/chromeos/base/locale_util.h" 20 #include "chrome/browser/chromeos/base/locale_util.h"
21 #include "chrome/browser/chromeos/geolocation/simple_geolocation_provider.h" 21 #include "chrome/browser/chromeos/geolocation/simple_geolocation_provider.h"
22 #include "chrome/browser/chromeos/login/auth/key.h" 22 #include "chrome/browser/chromeos/login/auth/key.h"
23 #include "chrome/browser/chromeos/login/auth/mock_authenticator.h" 23 #include "chrome/browser/chromeos/login/auth/mock_authenticator.h"
24 #include "chrome/browser/chromeos/login/auth/mock_login_status_consumer.h" 24 #include "chrome/browser/chromeos/login/auth/mock_login_status_consumer.h"
25 #include "chrome/browser/chromeos/login/auth/user_context.h" 25 #include "chrome/browser/chromeos/login/auth/user_context.h"
26 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h" 26 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
27 #include "chrome/browser/chromeos/login/enrollment/mock_auto_enrollment_check_sc reen.h"
27 #include "chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h" 28 #include "chrome/browser/chromeos/login/enrollment/mock_enrollment_screen.h"
28 #include "chrome/browser/chromeos/login/existing_user_controller.h" 29 #include "chrome/browser/chromeos/login/existing_user_controller.h"
29 #include "chrome/browser/chromeos/login/screens/error_screen.h" 30 #include "chrome/browser/chromeos/login/screens/error_screen.h"
30 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h" 31 #include "chrome/browser/chromeos/login/screens/hid_detection_screen.h"
31 #include "chrome/browser/chromeos/login/screens/mock_eula_screen.h" 32 #include "chrome/browser/chromeos/login/screens/mock_eula_screen.h"
32 #include "chrome/browser/chromeos/login/screens/mock_network_screen.h" 33 #include "chrome/browser/chromeos/login/screens/mock_network_screen.h"
33 #include "chrome/browser/chromeos/login/screens/mock_update_screen.h" 34 #include "chrome/browser/chromeos/login/screens/mock_update_screen.h"
34 #include "chrome/browser/chromeos/login/screens/network_screen.h" 35 #include "chrome/browser/chromeos/login/screens/network_screen.h"
35 #include "chrome/browser/chromeos/login/screens/reset_screen.h" 36 #include "chrome/browser/chromeos/login/screens/reset_screen.h"
36 #include "chrome/browser/chromeos/login/screens/user_image_screen.h" 37 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 NetworkHandler::Get()->network_state_handler()->SetCheckPortalList(""); 390 NetworkHandler::Get()->network_state_handler()->SetCheckPortalList("");
390 391
391 // Set up the mocks for all screens. 392 // Set up the mocks for all screens.
392 MOCK(mock_network_screen_, network_screen_, 393 MOCK(mock_network_screen_, network_screen_,
393 MockNetworkScreen, MockNetworkScreenActor); 394 MockNetworkScreen, MockNetworkScreenActor);
394 MOCK(mock_update_screen_, update_screen_, 395 MOCK(mock_update_screen_, update_screen_,
395 MockUpdateScreen, MockUpdateScreenActor); 396 MockUpdateScreen, MockUpdateScreenActor);
396 MOCK(mock_eula_screen_, eula_screen_, MockEulaScreen, MockEulaScreenActor); 397 MOCK(mock_eula_screen_, eula_screen_, MockEulaScreen, MockEulaScreenActor);
397 MOCK(mock_enrollment_screen_, enrollment_screen_, 398 MOCK(mock_enrollment_screen_, enrollment_screen_,
398 MockEnrollmentScreen, MockEnrollmentScreenActor); 399 MockEnrollmentScreen, MockEnrollmentScreenActor);
400 MOCK(mock_auto_enrollment_check_screen_, auto_enrollment_check_screen_,
401 MockAutoEnrollmentCheckScreen, MockAutoEnrollmentCheckScreenActor);
399 402
400 // Switch to the initial screen. 403 // Switch to the initial screen.
401 EXPECT_EQ(NULL, WizardController::default_controller()->current_screen()); 404 EXPECT_EQ(NULL, WizardController::default_controller()->current_screen());
402 EXPECT_CALL(*mock_network_screen_, Show()).Times(1); 405 EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
403 WizardController::default_controller()->AdvanceToScreen( 406 WizardController::default_controller()->AdvanceToScreen(
404 WizardController::kNetworkScreenName); 407 WizardController::kNetworkScreenName);
405 } 408 }
406 409
407 virtual void TearDown() { 410 virtual void TearDown() {
408 if (fallback_fetcher_factory_) { 411 if (fallback_fetcher_factory_) {
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
450 scoped_ptr<TimeZoneTestRunner> runner(new TimeZoneTestRunner); 453 scoped_ptr<TimeZoneTestRunner> runner(new TimeZoneTestRunner);
451 if (!WizardController::default_controller() 454 if (!WizardController::default_controller()
452 ->SetOnTimeZoneResolvedForTesting( 455 ->SetOnTimeZoneResolvedForTesting(
453 base::Bind(&TimeZoneTestRunner::OnResolved, 456 base::Bind(&TimeZoneTestRunner::OnResolved,
454 base::Unretained(runner.get())))) 457 base::Unretained(runner.get()))))
455 return; 458 return;
456 459
457 runner->Run(); 460 runner->Run();
458 } 461 }
459 462
463 void ResetAutoEnrollmentCheckScreen() {
464 WizardController::default_controller()->
465 auto_enrollment_check_screen_.reset();
466 }
467
460 MockOutShowHide<MockNetworkScreen, MockNetworkScreenActor>* 468 MockOutShowHide<MockNetworkScreen, MockNetworkScreenActor>*
461 mock_network_screen_; 469 mock_network_screen_;
462 MockOutShowHide<MockUpdateScreen, MockUpdateScreenActor>* mock_update_screen_; 470 MockOutShowHide<MockUpdateScreen, MockUpdateScreenActor>* mock_update_screen_;
463 MockOutShowHide<MockEulaScreen, MockEulaScreenActor>* mock_eula_screen_; 471 MockOutShowHide<MockEulaScreen, MockEulaScreenActor>* mock_eula_screen_;
464 MockOutShowHide<MockEnrollmentScreen, 472 MockOutShowHide<MockEnrollmentScreen,
465 MockEnrollmentScreenActor>* mock_enrollment_screen_; 473 MockEnrollmentScreenActor>* mock_enrollment_screen_;
474 MockOutShowHide<MockAutoEnrollmentCheckScreen,
475 MockAutoEnrollmentCheckScreenActor>* mock_auto_enrollment_check_screen_;
466 476
467 private: 477 private:
468 NetworkPortalDetectorTestImpl* network_portal_detector_; 478 NetworkPortalDetectorTestImpl* network_portal_detector_;
469 479
470 // Use a test factory as a fallback so we don't have to deal with other 480 // Use a test factory as a fallback so we don't have to deal with other
471 // requests. 481 // requests.
472 scoped_ptr<WizardControllerTestURLFetcherFactory> fallback_fetcher_factory_; 482 scoped_ptr<WizardControllerTestURLFetcherFactory> fallback_fetcher_factory_;
473 scoped_ptr<net::FakeURLFetcherFactory> fetcher_factory_; 483 scoped_ptr<net::FakeURLFetcherFactory> fetcher_factory_;
474 484
475 DISALLOW_COPY_AND_ASSIGN(WizardControllerFlowTest); 485 DISALLOW_COPY_AND_ASSIGN(WizardControllerFlowTest);
(...skipping 24 matching lines...) Expand all
500 EXPECT_CALL(*mock_update_screen_, Show()).Times(1); 510 EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
501 // Enable TimeZone resolve 511 // Enable TimeZone resolve
502 InitTimezoneResolver(); 512 InitTimezoneResolver();
503 OnExit(ScreenObserver::EULA_ACCEPTED); 513 OnExit(ScreenObserver::EULA_ACCEPTED);
504 EXPECT_TRUE(GetGeolocationProvider()); 514 EXPECT_TRUE(GetGeolocationProvider());
505 // Let update screen smooth time process (time = 0ms). 515 // Let update screen smooth time process (time = 0ms).
506 content::RunAllPendingInMessageLoop(); 516 content::RunAllPendingInMessageLoop();
507 517
508 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(), 518 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
509 WizardController::default_controller()->current_screen()); 519 WizardController::default_controller()->current_screen());
510 EXPECT_CALL(*mock_update_screen_, Hide()).Times(0); 520 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
521 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
522 OnExit(ScreenObserver::UPDATE_INSTALLED);
523
524 EXPECT_EQ(
525 WizardController::default_controller()->GetAutoEnrollmentCheckScreen(),
526 WizardController::default_controller()->current_screen());
527 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(0);
511 EXPECT_CALL(*mock_eula_screen_, Show()).Times(0); 528 EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
512 OnExit(ScreenObserver::UPDATE_INSTALLED); 529 OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
513 530
514 EXPECT_FALSE(ExistingUserController::current_controller() == NULL); 531 EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
515 EXPECT_EQ("ethernet,wifi,cellular", 532 EXPECT_EQ("ethernet,wifi,cellular",
516 NetworkHandler::Get()->network_state_handler() 533 NetworkHandler::Get()->network_state_handler()
517 ->GetCheckPortalListForTest()); 534 ->GetCheckPortalListForTest());
518 535
519 WaitUntilTimezoneResolved(); 536 WaitUntilTimezoneResolved();
520 EXPECT_EQ("America/Anchorage", 537 EXPECT_EQ("America/Anchorage",
521 base::UTF16ToUTF8(chromeos::system::TimezoneSettings::GetInstance() 538 base::UTF16ToUTF8(chromeos::system::TimezoneSettings::GetInstance()
522 ->GetCurrentTimezoneID())); 539 ->GetCurrentTimezoneID()));
(...skipping 12 matching lines...) Expand all
535 WizardController::default_controller()->current_screen()); 552 WizardController::default_controller()->current_screen());
536 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1); 553 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
537 EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1); 554 EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
538 EXPECT_CALL(*mock_update_screen_, Show()).Times(1); 555 EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
539 OnExit(ScreenObserver::EULA_ACCEPTED); 556 OnExit(ScreenObserver::EULA_ACCEPTED);
540 // Let update screen smooth time process (time = 0ms). 557 // Let update screen smooth time process (time = 0ms).
541 content::RunAllPendingInMessageLoop(); 558 content::RunAllPendingInMessageLoop();
542 559
543 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(), 560 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
544 WizardController::default_controller()->current_screen()); 561 WizardController::default_controller()->current_screen());
545 EXPECT_CALL(*mock_update_screen_, Hide()).Times(0); 562 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
563 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
564 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING);
565
566 EXPECT_EQ(
567 WizardController::default_controller()->GetAutoEnrollmentCheckScreen(),
568 WizardController::default_controller()->current_screen());
569 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(0);
546 EXPECT_CALL(*mock_eula_screen_, Show()).Times(0); 570 EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
547 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(0); // last transition 571 OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
548 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING);
549 572
550 EXPECT_FALSE(ExistingUserController::current_controller() == NULL); 573 EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
551 } 574 }
552 575
553 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowSkipUpdateEnroll) { 576 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowSkipUpdateEnroll) {
554 EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(), 577 EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
555 WizardController::default_controller()->current_screen()); 578 WizardController::default_controller()->current_screen());
556 EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0); 579 EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
557 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); 580 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
558 EXPECT_CALL(*mock_update_screen_, Show()).Times(0); 581 EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1); 736 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
714 EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1); 737 EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
715 EXPECT_CALL(*mock_update_screen_, Show()).Times(1); 738 EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
716 OnExit(ScreenObserver::EULA_ACCEPTED); 739 OnExit(ScreenObserver::EULA_ACCEPTED);
717 // Let update screen smooth time process (time = 0ms). 740 // Let update screen smooth time process (time = 0ms).
718 content::RunAllPendingInMessageLoop(); 741 content::RunAllPendingInMessageLoop();
719 742
720 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(), 743 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
721 WizardController::default_controller()->current_screen()); 744 WizardController::default_controller()->current_screen());
722 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1); 745 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
746 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
723 OnExit(ScreenObserver::UPDATE_INSTALLED); 747 OnExit(ScreenObserver::UPDATE_INSTALLED);
724 748
749 AutoEnrollmentCheckScreen* screen =
750 WizardController::default_controller()->GetAutoEnrollmentCheckScreen();
751 EXPECT_EQ(screen,
752 WizardController::default_controller()->current_screen());
753 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
754 screen->Start();
725 // Wait for auto-enrollment controller to encounter the connection error. 755 // Wait for auto-enrollment controller to encounter the connection error.
726 WaitForAutoEnrollmentState(policy::AUTO_ENROLLMENT_STATE_CONNECTION_ERROR); 756 WaitForAutoEnrollmentState(policy::AUTO_ENROLLMENT_STATE_CONNECTION_ERROR);
727 757
728 // The error screen shows up if there's no auto-enrollment decision. 758 // The error screen shows up if there's no auto-enrollment decision.
729 EXPECT_FALSE(StartupUtils::IsOobeCompleted()); 759 EXPECT_FALSE(StartupUtils::IsOobeCompleted());
730 EXPECT_EQ(GetErrorScreen(), 760 EXPECT_EQ(GetErrorScreen(),
731 WizardController::default_controller()->current_screen()); 761 WizardController::default_controller()->current_screen());
732 base::DictionaryValue device_state; 762 base::DictionaryValue device_state;
733 device_state.SetString(policy::kDeviceStateRestoreMode, 763 device_state.SetString(policy::kDeviceStateRestoreMode,
734 policy::kDeviceStateRestoreModeReEnrollmentEnforced); 764 policy::kDeviceStateRestoreModeReEnrollmentEnforced);
735 g_browser_process->local_state()->Set(prefs::kServerBackedDeviceState, 765 g_browser_process->local_state()->Set(prefs::kServerBackedDeviceState,
736 device_state); 766 device_state);
737 EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1); 767 EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
738 EXPECT_CALL(*mock_enrollment_screen_->actor(), 768 EXPECT_CALL(*mock_enrollment_screen_->actor(),
739 SetParameters(mock_enrollment_screen_, 769 SetParameters(mock_enrollment_screen_,
740 EnrollmentScreenActor::ENROLLMENT_MODE_FORCED, 770 EnrollmentScreenActor::ENROLLMENT_MODE_FORCED,
741 "")).Times(1); 771 "")).Times(1);
742 OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED); 772 OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
743 773
774 ResetAutoEnrollmentCheckScreen();
775
744 // Make sure enterprise enrollment page shows up. 776 // Make sure enterprise enrollment page shows up.
745 EXPECT_EQ(WizardController::default_controller()->GetEnrollmentScreen(), 777 EXPECT_EQ(WizardController::default_controller()->GetEnrollmentScreen(),
746 WizardController::default_controller()->current_screen()); 778 WizardController::default_controller()->current_screen());
747 OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED); 779 OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
748 780
749 EXPECT_TRUE(StartupUtils::IsOobeCompleted()); 781 EXPECT_TRUE(StartupUtils::IsOobeCompleted());
750 } 782 }
751 783
752 class WizardControllerBrokenLocalStateTest : public WizardControllerTest { 784 class WizardControllerBrokenLocalStateTest : public WizardControllerTest {
753 protected: 785 protected:
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
908 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1); 940 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
909 EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1); 941 EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
910 EXPECT_CALL(*mock_update_screen_, Show()).Times(1); 942 EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
911 OnExit(ScreenObserver::EULA_ACCEPTED); 943 OnExit(ScreenObserver::EULA_ACCEPTED);
912 // Let update screen smooth time process (time = 0ms). 944 // Let update screen smooth time process (time = 0ms).
913 content::RunAllPendingInMessageLoop(); 945 content::RunAllPendingInMessageLoop();
914 946
915 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(), 947 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
916 WizardController::default_controller()->current_screen()); 948 WizardController::default_controller()->current_screen());
917 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1); 949 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
950 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
951 OnExit(ScreenObserver::UPDATE_INSTALLED);
952
953 EXPECT_EQ(
954 WizardController::default_controller()->GetAutoEnrollmentCheckScreen(),
955 WizardController::default_controller()->current_screen());
956 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
918 EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1); 957 EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
919 OnExit(ScreenObserver::UPDATE_INSTALLED); 958 OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
959
920 960
921 EXPECT_FALSE(StartupUtils::IsOobeCompleted()); 961 EXPECT_FALSE(StartupUtils::IsOobeCompleted());
922 962
923 // Make sure enterprise enrollment page shows up right after update screen. 963 // Make sure enterprise enrollment page shows up right after update screen.
924 EnrollmentScreen* screen = 964 EnrollmentScreen* screen =
925 WizardController::default_controller()->GetEnrollmentScreen(); 965 WizardController::default_controller()->GetEnrollmentScreen();
926 EXPECT_EQ(screen, WizardController::default_controller()->current_screen()); 966 EXPECT_EQ(screen, WizardController::default_controller()->current_screen());
927 OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED); 967 OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
928 968
929 EXPECT_TRUE(StartupUtils::IsOobeCompleted()); 969 EXPECT_TRUE(StartupUtils::IsOobeCompleted());
(...skipping 22 matching lines...) Expand all
952 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1); 992 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
953 EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1); 993 EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
954 EXPECT_CALL(*mock_update_screen_, Show()).Times(1); 994 EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
955 OnExit(ScreenObserver::EULA_ACCEPTED); 995 OnExit(ScreenObserver::EULA_ACCEPTED);
956 // Let update screen smooth time process (time = 0ms). 996 // Let update screen smooth time process (time = 0ms).
957 content::RunAllPendingInMessageLoop(); 997 content::RunAllPendingInMessageLoop();
958 998
959 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(), 999 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
960 WizardController::default_controller()->current_screen()); 1000 WizardController::default_controller()->current_screen());
961 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1); 1001 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
1002 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
1003 OnExit(ScreenObserver::UPDATE_INSTALLED);
1004
1005 EXPECT_EQ(
1006 WizardController::default_controller()->GetAutoEnrollmentCheckScreen(),
1007 WizardController::default_controller()->current_screen());
1008 EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
962 EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1); 1009 EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
963 EXPECT_CALL(*mock_enrollment_screen_, Hide()).Times(1); 1010 EXPECT_CALL(*mock_enrollment_screen_, Hide()).Times(1);
964 OnExit(ScreenObserver::UPDATE_INSTALLED); 1011 OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
965 1012
966 EXPECT_FALSE(StartupUtils::IsOobeCompleted()); 1013 EXPECT_FALSE(StartupUtils::IsOobeCompleted());
967 1014
968 // Make sure enterprise enrollment page shows up right after update screen. 1015 // Make sure enterprise enrollment page shows up right after update screen.
969 EnrollmentScreen* screen = 1016 EnrollmentScreen* screen =
970 WizardController::default_controller()->GetEnrollmentScreen(); 1017 WizardController::default_controller()->GetEnrollmentScreen();
971 EXPECT_EQ(screen, WizardController::default_controller()->current_screen()); 1018 EXPECT_EQ(screen, WizardController::default_controller()->current_screen());
972 OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_BACK); 1019 OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_BACK);
973 1020
974 EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(), 1021 EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 1091
1045 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 1092 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
1046 1093
1047 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1094 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1048 // UI and logic is ready. http://crbug.com/127016 1095 // UI and logic is ready. http://crbug.com/127016
1049 1096
1050 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 21, 1097 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 21,
1051 add_tests_for_new_control_flow_you_just_introduced); 1098 add_tests_for_new_control_flow_you_just_introduced);
1052 1099
1053 } // namespace chromeos 1100 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/resources/chromeos/login/login_resources.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698