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

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

Issue 8436002: [cros] Remove Views implementation for login/OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
7 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h" 7 #include "chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen. h"
8 #include "chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_sc reen.h" 8 #include "chrome/browser/chromeos/login/enrollment/mock_enterprise_enrollment_sc reen.h"
9 #include "chrome/browser/chromeos/login/existing_user_controller.h" 9 #include "chrome/browser/chromeos/login/existing_user_controller.h"
10 #include "chrome/browser/chromeos/login/language_switch_menu.h" 10 #include "chrome/browser/chromeos/login/language_switch_menu.h"
11 #include "chrome/browser/chromeos/login/mock_eula_screen.h" 11 #include "chrome/browser/chromeos/login/mock_eula_screen.h"
12 #include "chrome/browser/chromeos/login/mock_network_screen.h" 12 #include "chrome/browser/chromeos/login/mock_network_screen.h"
13 #include "chrome/browser/chromeos/login/mock_update_screen.h" 13 #include "chrome/browser/chromeos/login/mock_update_screen.h"
14 #include "chrome/browser/chromeos/login/network_screen.h" 14 #include "chrome/browser/chromeos/login/network_screen.h"
15 #include "chrome/browser/chromeos/login/network_selection_view.h"
16 #include "chrome/browser/chromeos/login/user_image_screen.h" 15 #include "chrome/browser/chromeos/login/user_image_screen.h"
17 #include "chrome/browser/chromeos/login/view_screen.h" 16 #include "chrome/browser/chromeos/login/view_screen.h"
18 #include "chrome/browser/chromeos/login/views_oobe_display.h"
19 #include "chrome/browser/chromeos/login/wizard_controller.h" 17 #include "chrome/browser/chromeos/login/wizard_controller.h"
20 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" 18 #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h"
21 #include "chrome/test/base/ui_test_utils.h" 19 #include "chrome/test/base/ui_test_utils.h"
22 #include "grit/generated_resources.h" 20 #include "grit/generated_resources.h"
23 #include "testing/gmock/include/gmock/gmock.h" 21 #include "testing/gmock/include/gmock/gmock.h"
24 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
25 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
26 #include "unicode/locid.h" 24 #include "unicode/locid.h"
27 #include "views/accelerator.h" 25 #include "views/accelerator.h"
28 26
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 controller()->ShowEnterpriseEnrollmentScreen(); 232 controller()->ShowEnterpriseEnrollmentScreen();
235 EXPECT_EQ(controller()->GetEnterpriseEnrollmentScreen(), 233 EXPECT_EQ(controller()->GetEnterpriseEnrollmentScreen(),
236 controller()->current_screen()); 234 controller()->current_screen());
237 OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_CANCELLED); 235 OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_CANCELLED);
238 236
239 EXPECT_FALSE(ExistingUserController::current_controller() == NULL); 237 EXPECT_FALSE(ExistingUserController::current_controller() == NULL);
240 set_controller(NULL); 238 set_controller(NULL);
241 } 239 }
242 #endif 240 #endif
243 241
244 #if defined(OFFICIAL_BUILD) 242 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
245 // This test is supposed to fail on official build.
246 #define MAYBE_Accelerators DISABLED_Accelerators
247 #else
248 #define MAYBE_Accelerators Accelerators
249 #endif
250
251 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, MAYBE_Accelerators) {
252 //TODO(altimofeev): do not depend on the display realization.
253
254 ViewsOobeDisplay* display =
255 static_cast<ViewsOobeDisplay*>(controller()->oobe_display_);
256 views::View* contents = display->contents_;
257
258 EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());
259
260 views::Accelerator accel_network_screen(ui::VKEY_N, false, true, true);
261 views::Accelerator accel_update_screen(ui::VKEY_U, false, true, true);
262 views::Accelerator accel_image_screen(ui::VKEY_I, false, true, true);
263 views::Accelerator accel_eula_screen(ui::VKEY_E, false, true, true);
264 views::Accelerator accel_enterprise_enrollment_screen(
265 ui::VKEY_P, false, true, true);
266
267 views::FocusManager* focus_manager = NULL;
268
269 focus_manager = contents->GetFocusManager();
270 EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
271 EXPECT_CALL(*mock_enterprise_enrollment_screen_, Show()).Times(1);
272 EXPECT_TRUE(
273 focus_manager->ProcessAccelerator(accel_enterprise_enrollment_screen));
274 EXPECT_EQ(controller()->GetEnterpriseEnrollmentScreen(),
275 controller()->current_screen());
276
277 focus_manager = contents->GetFocusManager();
278 EXPECT_CALL(*mock_enterprise_enrollment_screen_, Hide()).Times(1);
279 EXPECT_CALL(*mock_network_screen_, Show()).Times(1);
280 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_network_screen));
281 EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());
282
283 focus_manager = contents->GetFocusManager();
284 EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
285 EXPECT_CALL(*mock_update_screen_, Show()).Times(1);
286 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_update_screen));
287 EXPECT_EQ(controller()->GetUpdateScreen(), controller()->current_screen());
288
289 focus_manager = contents->GetFocusManager();
290 EXPECT_CALL(*mock_update_screen_, Hide()).Times(1);
291 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_image_screen));
292 EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen());
293
294 focus_manager = contents->GetFocusManager();
295 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
296 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen));
297 EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen());
298 }
299 243
300 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15, 244 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 15,
301 add_tests_for_new_control_flow_you_just_introduced); 245 add_tests_for_new_control_flow_you_just_introduced);
302 246
303 } // namespace chromeos 247 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698