| OLD | NEW |
| 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/utf_string_conversions.h" | 6 #include "base/utf_string_conversions.h" |
| 7 #include "chrome/browser/browser_process.h" | 7 #include "chrome/browser/browser_process.h" |
| 8 #include "chrome/browser/browser_shutdown.h" | 8 #include "chrome/browser/browser_shutdown.h" |
| 9 #include "chrome/browser/chromeos/cros/cros_library.h" | 9 #include "chrome/browser/chromeos/cros/cros_library.h" |
| 10 #include "chrome/browser/chromeos/cros/network_library.h" | 10 #include "chrome/browser/chromeos/cros/network_library.h" |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); | 154 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); |
| 155 OnExit(ScreenObserver::NETWORK_CONNECTED); | 155 OnExit(ScreenObserver::NETWORK_CONNECTED); |
| 156 | 156 |
| 157 EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(), | 157 EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(), |
| 158 WizardController::default_controller()->current_screen()); | 158 WizardController::default_controller()->current_screen()); |
| 159 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1); | 159 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1); |
| 160 EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(1); | 160 EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(1); |
| 161 EXPECT_CALL(*mock_update_screen_, Show()).Times(1); | 161 EXPECT_CALL(*mock_update_screen_, Show()).Times(1); |
| 162 OnExit(ScreenObserver::EULA_ACCEPTED); | 162 OnExit(ScreenObserver::EULA_ACCEPTED); |
| 163 // Let update screen smooth time process (time = 0ms). | 163 // Let update screen smooth time process (time = 0ms). |
| 164 ui_test_utils::RunAllPendingInMessageLoop(); | 164 content::RunAllPendingInMessageLoop(); |
| 165 | 165 |
| 166 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(), | 166 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(), |
| 167 WizardController::default_controller()->current_screen()); | 167 WizardController::default_controller()->current_screen()); |
| 168 EXPECT_CALL(*mock_update_screen_, Hide()).Times(0); | 168 EXPECT_CALL(*mock_update_screen_, Hide()).Times(0); |
| 169 EXPECT_CALL(*mock_eula_screen_, Show()).Times(0); | 169 EXPECT_CALL(*mock_eula_screen_, Show()).Times(0); |
| 170 OnExit(ScreenObserver::UPDATE_INSTALLED); | 170 OnExit(ScreenObserver::UPDATE_INSTALLED); |
| 171 | 171 |
| 172 EXPECT_FALSE(ExistingUserController::current_controller() == NULL); | 172 EXPECT_FALSE(ExistingUserController::current_controller() == NULL); |
| 173 EXPECT_EQ("ethernet,wifi,cellular", | 173 EXPECT_EQ("ethernet,wifi,cellular", |
| 174 CrosLibrary::Get()->GetNetworkLibrary()->GetCheckPortalList()); | 174 CrosLibrary::Get()->GetNetworkLibrary()->GetCheckPortalList()); |
| 175 } | 175 } |
| 176 | 176 |
| 177 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) { | 177 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorUpdate) { |
| 178 EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(), | 178 EXPECT_EQ(WizardController::default_controller()->GetNetworkScreen(), |
| 179 WizardController::default_controller()->current_screen()); | 179 WizardController::default_controller()->current_screen()); |
| 180 EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(0); | 180 EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(0); |
| 181 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); | 181 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); |
| 182 EXPECT_CALL(*mock_update_screen_, Show()).Times(0); | 182 EXPECT_CALL(*mock_update_screen_, Show()).Times(0); |
| 183 EXPECT_CALL(*mock_network_screen_, Hide()).Times(1); | 183 EXPECT_CALL(*mock_network_screen_, Hide()).Times(1); |
| 184 OnExit(ScreenObserver::NETWORK_CONNECTED); | 184 OnExit(ScreenObserver::NETWORK_CONNECTED); |
| 185 | 185 |
| 186 EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(), | 186 EXPECT_EQ(WizardController::default_controller()->GetEulaScreen(), |
| 187 WizardController::default_controller()->current_screen()); | 187 WizardController::default_controller()->current_screen()); |
| 188 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1); | 188 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(1); |
| 189 EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(1); | 189 EXPECT_CALL(*mock_update_screen_, StartUpdate()).Times(1); |
| 190 EXPECT_CALL(*mock_update_screen_, Show()).Times(1); | 190 EXPECT_CALL(*mock_update_screen_, Show()).Times(1); |
| 191 OnExit(ScreenObserver::EULA_ACCEPTED); | 191 OnExit(ScreenObserver::EULA_ACCEPTED); |
| 192 // Let update screen smooth time process (time = 0ms). | 192 // Let update screen smooth time process (time = 0ms). |
| 193 ui_test_utils::RunAllPendingInMessageLoop(); | 193 content::RunAllPendingInMessageLoop(); |
| 194 | 194 |
| 195 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(), | 195 EXPECT_EQ(WizardController::default_controller()->GetUpdateScreen(), |
| 196 WizardController::default_controller()->current_screen()); | 196 WizardController::default_controller()->current_screen()); |
| 197 EXPECT_CALL(*mock_update_screen_, Hide()).Times(0); | 197 EXPECT_CALL(*mock_update_screen_, Hide()).Times(0); |
| 198 EXPECT_CALL(*mock_eula_screen_, Show()).Times(0); | 198 EXPECT_CALL(*mock_eula_screen_, Show()).Times(0); |
| 199 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(0); // last transition | 199 EXPECT_CALL(*mock_eula_screen_, Hide()).Times(0); // last transition |
| 200 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING); | 200 OnExit(ScreenObserver::UPDATE_ERROR_UPDATING); |
| 201 | 201 |
| 202 EXPECT_FALSE(ExistingUserController::current_controller() == NULL); | 202 EXPECT_FALSE(ExistingUserController::current_controller() == NULL); |
| 203 } | 203 } |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 // Run the tasks posted to complete the login: | 304 // Run the tasks posted to complete the login: |
| 305 MessageLoop::current()->RunAllPending(); | 305 MessageLoop::current()->RunAllPending(); |
| 306 } | 306 } |
| 307 | 307 |
| 308 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 | 308 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 |
| 309 | 309 |
| 310 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 13, | 310 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 13, |
| 311 add_tests_for_new_control_flow_you_just_introduced); | 311 add_tests_for_new_control_flow_you_just_introduced); |
| 312 | 312 |
| 313 } // namespace chromeos | 313 } // namespace chromeos |
| OLD | NEW |