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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 494473003: Generalize screen getting/instantiation code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/chromeos/login/wizard_controller.h ('K') | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 2e265212620c219d0a53dec892b006c95f9ae150..082ad566b37fc3b34231f5b709344a4c87c28be4 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -212,11 +212,12 @@ class MockOutShowHide : public T {
scoped_ptr<H> actor_;
};
-#define MOCK(mock_var, screen_name, mocked_class, actor_class) \
- mock_var = new MockOutShowHide<mocked_class, actor_class>( \
- WizardController::default_controller(), new actor_class); \
- WizardController::default_controller()->screen_name.reset(mock_var); \
- EXPECT_CALL(*mock_var, Show()).Times(0); \
+#define MOCK(mock_var, screen_name, mocked_class, actor_class) \
+ mock_var = new MockOutShowHide<mocked_class, actor_class>( \
+ WizardController::default_controller(), new actor_class); \
+ WizardController::default_controller() \
+ ->screens_[WizardController::screen_name] = make_linked_ptr(mock_var); \
+ EXPECT_CALL(*mock_var, Show()).Times(0); \
EXPECT_CALL(*mock_var, Hide()).Times(0);
class WizardControllerTest : public WizardInProcessBrowserTest {
@@ -270,6 +271,11 @@ class WizardControllerTest : public WizardInProcessBrowserTest {
return result;
}
+ void CheckCurrentScreen(const std::string& screen_name) {
+ EXPECT_EQ(WizardController::default_controller()->GetScreen(screen_name),
+ WizardController::default_controller()->current_screen());
+ }
+
private:
DISALLOW_COPY_AND_ASSIGN(WizardControllerTest);
};
@@ -390,15 +396,26 @@ class WizardControllerFlowTest : public WizardControllerTest {
NetworkHandler::Get()->network_state_handler()->SetCheckPortalList("");
// Set up the mocks for all screens.
- MOCK(mock_network_screen_, network_screen_,
- MockNetworkScreen, MockNetworkScreenActor);
- MOCK(mock_update_screen_, update_screen_,
- MockUpdateScreen, MockUpdateScreenActor);
- MOCK(mock_eula_screen_, eula_screen_, MockEulaScreen, MockEulaScreenActor);
- MOCK(mock_enrollment_screen_, enrollment_screen_,
- MockEnrollmentScreen, MockEnrollmentScreenActor);
- MOCK(mock_auto_enrollment_check_screen_, auto_enrollment_check_screen_,
- MockAutoEnrollmentCheckScreen, MockAutoEnrollmentCheckScreenActor);
+ MOCK(mock_network_screen_,
+ kNetworkScreenName,
+ MockNetworkScreen,
+ MockNetworkScreenActor);
+ MOCK(mock_update_screen_,
+ kUpdateScreenName,
+ MockUpdateScreen,
+ MockUpdateScreenActor);
+ MOCK(mock_eula_screen_,
+ kEulaScreenName,
+ MockEulaScreen,
+ MockEulaScreenActor);
+ MOCK(mock_enrollment_screen_,
+ kEnrollmentScreenName,
+ MockEnrollmentScreen,
+ MockEnrollmentScreenActor);
+ MOCK(mock_auto_enrollment_check_screen_,
+ kAutoEnrollmentCheckScreenName,
+ MockAutoEnrollmentCheckScreen,
+ MockAutoEnrollmentCheckScreenActor);
// Switch to the initial screen.
EXPECT_EQ(NULL, WizardController::default_controller()->current_screen());
@@ -459,8 +476,8 @@ class WizardControllerFlowTest : public WizardControllerTest {
}
void ResetAutoEnrollmentCheckScreen() {
- WizardController::default_controller()->
- auto_enrollment_check_screen_.reset();
+ WizardController::default_controller()->screens_.erase(
+ WizardController::kAutoEnrollmentCheckScreenName);
}
MockOutShowHide<MockNetworkScreen, MockNetworkScreenActor>*
@@ -485,8 +502,7 @@ class WizardControllerFlowTest : public WizardControllerTest {
IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
EXPECT_TRUE(ExistingUserController::current_controller() == NULL);
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
WaitUntilJSIsReady();
@@ -497,8 +513,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
OnExit(ScreenObserver::NETWORK_CONNECTED);
- EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEulaScreenName);
// Header bar should still be visible.
ASSERT_FALSE(JSExecuteBooleanExpression("$('login-header-bar').hidden"));
@@ -513,15 +528,12 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
- EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
OnExit(ScreenObserver::UPDATE_INSTALLED);
- EXPECT_EQ(
- WizardController::default_controller()->GetAutoEnrollmentCheckScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(0);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
@@ -538,16 +550,14 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowMain) {
}
IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
OnExit(ScreenObserver::NETWORK_CONNECTED);
- EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
@@ -555,15 +565,12 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
- EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
OnExit(ScreenObserver::UPDATE_ERROR_UPDATING);
- EXPECT_EQ(
- WizardController::default_controller()->GetAutoEnrollmentCheckScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(0);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(0);
OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
@@ -572,16 +579,14 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) {
}
IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowSkipUpdateEnroll) {
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
OnExit(ScreenObserver::NETWORK_CONNECTED);
- EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
EXPECT_CALL(*mock_update_screen_, Show()).Times(0);
@@ -595,17 +600,14 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowSkipUpdateEnroll) {
OnExit(ScreenObserver::EULA_ACCEPTED);
content::RunAllPendingInMessageLoop();
- EXPECT_EQ(
- WizardController::default_controller()->GetAutoEnrollmentCheckScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Hide()).Times(0);
OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
content::RunAllPendingInMessageLoop();
- EXPECT_EQ(WizardController::default_controller()->GetEnrollmentScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEnrollmentScreenName);
EXPECT_TRUE(ExistingUserController::current_controller() == NULL);
EXPECT_EQ("ethernet,wifi,cellular",
NetworkHandler::Get()->network_state_handler()
@@ -613,28 +615,24 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowSkipUpdateEnroll) {
}
IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowEulaDeclined) {
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
OnExit(ScreenObserver::NETWORK_CONNECTED);
- EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(0); // last transition
OnExit(ScreenObserver::EULA_BACK);
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
}
IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
ControlFlowEnrollmentCompleted) {
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
EXPECT_CALL(*mock_enrollment_screen_->actor(),
SetParameters(mock_enrollment_screen_,
@@ -646,9 +644,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
WizardController::default_controller()->AdvanceToScreen(
WizardController::kEnrollmentScreenName);
- EnrollmentScreen* screen =
- WizardController::default_controller()->GetEnrollmentScreen();
- EXPECT_EQ(screen, WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEnrollmentScreenName);
OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
@@ -657,8 +653,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
ControlFlowAutoEnrollmentCompleted) {
WizardController::default_controller()->SkipPostLoginScreensForTesting();
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(0);
UserContext user_context(kUsername);
@@ -679,9 +674,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
// Run the tasks posted to complete the login:
base::MessageLoop::current()->RunUntilIdle();
- EnrollmentScreen* screen =
- WizardController::default_controller()->GetEnrollmentScreen();
- EXPECT_EQ(screen, WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEnrollmentScreenName);
// This is the main expectation: after auto-enrollment, login is resumed.
EXPECT_CALL(mock_consumer, OnAuthSuccess(_)).Times(1);
OnExit(ScreenObserver::ENTERPRISE_AUTO_MAGIC_ENROLLMENT_COMPLETED);
@@ -693,16 +686,13 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest,
ControlFlowWrongHWIDScreenFromLogin) {
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
LoginDisplayHostImpl::default_host()->StartSignInScreen(LoginScreenContext());
EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
ExistingUserController::current_controller()->ShowWrongHWIDScreen();
- WrongHWIDScreen* screen =
- WizardController::default_controller()->GetWrongHWIDScreen();
- EXPECT_EQ(screen, WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kWrongHWIDScreenName);
// After warning is skipped, user returns to sign-in screen.
// And this destroys WizardController.
@@ -732,14 +722,12 @@ class WizardControllerEnrollmentFlowTest : public WizardControllerFlowTest {
IN_PROC_BROWSER_TEST_F(WizardControllerEnrollmentFlowTest,
ControlFlowForcedReEnrollment) {
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
OnExit(ScreenObserver::NETWORK_CONNECTED);
- EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
@@ -747,8 +735,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerEnrollmentFlowTest,
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
- EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
OnExit(ScreenObserver::UPDATE_INSTALLED);
@@ -781,8 +768,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerEnrollmentFlowTest,
ResetAutoEnrollmentCheckScreen();
// Make sure enterprise enrollment page shows up.
- EXPECT_EQ(WizardController::default_controller()->GetEnrollmentScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEnrollmentScreenName);
OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
EXPECT_TRUE(StartupUtils::IsOobeCompleted());
@@ -902,8 +888,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerProxyAuthOnSigninTest,
chrome::NOTIFICATION_AUTH_NEEDED,
content::NotificationService::AllSources());
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
LoginDisplayHostImpl::default_host()->StartSignInScreen(LoginScreenContext());
auth_needed_waiter.Wait();
@@ -936,14 +921,12 @@ IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
.Times(1);
EXPECT_TRUE(ExistingUserController::current_controller() == NULL);
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
OnExit(ScreenObserver::NETWORK_CONNECTED);
- EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
@@ -951,15 +934,12 @@ IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
- EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
OnExit(ScreenObserver::UPDATE_INSTALLED);
- EXPECT_EQ(
- WizardController::default_controller()->GetAutoEnrollmentCheckScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
OnExit(ScreenObserver::ENTERPRISE_AUTO_ENROLLMENT_CHECK_COMPLETED);
@@ -968,9 +948,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
EXPECT_FALSE(StartupUtils::IsOobeCompleted());
// Make sure enterprise enrollment page shows up right after update screen.
- EnrollmentScreen* screen =
- WizardController::default_controller()->GetEnrollmentScreen();
- EXPECT_EQ(screen, WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEnrollmentScreenName);
OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED);
EXPECT_TRUE(StartupUtils::IsOobeCompleted());
@@ -986,15 +964,13 @@ IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
.Times(1);
EXPECT_TRUE(ExistingUserController::current_controller() == NULL);
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
OnExit(ScreenObserver::NETWORK_CONNECTED);
- EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEulaScreenName);
EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_update_screen_, StartNetworkCheck()).Times(1);
EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
@@ -1002,15 +978,12 @@ IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
// Let update screen smooth time process (time = 0ms).
content::RunAllPendingInMessageLoop();
- EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kUpdateScreenName);
EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Show()).Times(1);
OnExit(ScreenObserver::UPDATE_INSTALLED);
- EXPECT_EQ(
- WizardController::default_controller()->GetAutoEnrollmentCheckScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kAutoEnrollmentCheckScreenName);
EXPECT_CALL(*mock_auto_enrollment_check_screen_, Hide()).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Hide()).Times(1);
@@ -1019,13 +992,10 @@ IN_PROC_BROWSER_TEST_F(WizardControllerKioskFlowTest,
EXPECT_FALSE(StartupUtils::IsOobeCompleted());
// Make sure enterprise enrollment page shows up right after update screen.
- EnrollmentScreen* screen =
- WizardController::default_controller()->GetEnrollmentScreen();
- EXPECT_EQ(screen, WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEnrollmentScreenName);
OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_BACK);
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_FALSE(StartupUtils::IsOobeCompleted());
}
@@ -1043,10 +1013,14 @@ class WizardControllerOobeResumeTest : public WizardControllerTest {
NetworkHandler::Get()->network_state_handler()->SetCheckPortalList("");
// Set up the mocks for all screens.
- MOCK(mock_network_screen_, network_screen_,
- MockNetworkScreen, MockNetworkScreenActor);
- MOCK(mock_enrollment_screen_, enrollment_screen_,
- MockEnrollmentScreen, MockEnrollmentScreenActor);
+ MOCK(mock_network_screen_,
+ kNetworkScreenName,
+ MockNetworkScreen,
+ MockNetworkScreenActor);
+ MOCK(mock_enrollment_screen_,
+ kEnrollmentScreenName,
+ MockEnrollmentScreen,
+ MockEnrollmentScreenActor);
}
void OnExit(ScreenObserver::ExitCodes exit_code) {
@@ -1072,20 +1046,17 @@ IN_PROC_BROWSER_TEST_F(WizardControllerOobeResumeTest,
EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
WizardController::default_controller()->AdvanceToScreen(
WizardController::kNetworkScreenName);
- EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kNetworkScreenName);
EXPECT_CALL(*mock_enrollment_screen_->actor(),
SetParameters(mock_enrollment_screen_,
EnrollmentScreenActor::ENROLLMENT_MODE_MANUAL,
- ""))
- .Times(1);
+ "")).Times(1);
EXPECT_CALL(*mock_enrollment_screen_, Show()).Times(1);
EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
WizardController::default_controller()->AdvanceToScreen(
WizardController::kEnrollmentScreenName);
- EXPECT_EQ(WizardController::default_controller()->GetEnrollmentScreen(),
- WizardController::default_controller()->current_screen());
+ CheckCurrentScreen(WizardController::kEnrollmentScreenName);
}
IN_PROC_BROWSER_TEST_F(WizardControllerOobeResumeTest,
« chrome/browser/chromeos/login/wizard_controller.h ('K') | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698