diff options
author | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 16:56:20 +0000 |
---|---|---|
committer | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-16 16:56:20 +0000 |
commit | a8d3be1b117f996118ab0d469f319af5c7d2b633 (patch) | |
tree | 2028825da6b6d85eac71afa8debf4ce0fe94a047 /chrome/browser/chromeos | |
parent | 5f3dc83c13bd6d7ffe0e84af3c260e610fe989ca (diff) | |
download | chromium_src-a8d3be1b117f996118ab0d469f319af5c7d2b633.zip chromium_src-a8d3be1b117f996118ab0d469f319af5c7d2b633.tar.gz chromium_src-a8d3be1b117f996118ab0d469f319af5c7d2b633.tar.bz2 |
Added browser test for accelerators on wizard screen.
BUG=none
TEST=Run browser_tests --gtest_filter=WizardControllerFlowTest\.Accelerators
Review URL: http://codereview.chromium.org/2862006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49961 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
-rw-r--r-- | chrome/browser/chromeos/login/wizard_controller_browsertest.cc | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index 027b9e5..eae3a59 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -10,6 +10,7 @@ #include "chrome/browser/chromeos/login/mock_update_screen.h" #include "chrome/browser/chromeos/login/network_screen.h" #include "chrome/browser/chromeos/login/network_selection_view.h" +#include "chrome/browser/chromeos/login/user_image_screen.h" #include "chrome/browser/chromeos/login/wizard_controller.h" #include "chrome/browser/chromeos/login/wizard_in_process_browser_test.h" #include "chrome/common/chrome_switches.h" @@ -19,6 +20,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "unicode/locid.h" +#include "views/accelerator.h" namespace { @@ -176,5 +178,41 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorNetwork) { EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen()); } +IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, Accelerators) { + EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen()); + + views::FocusManager* focus_manager = + controller()->contents()->GetFocusManager(); + views::Accelerator accel_account_screen(base::VKEY_A, false, true, true); + views::Accelerator accel_login_screen(base::VKEY_L, false, true, true); + views::Accelerator accel_network_screen(base::VKEY_N, false, true, true); + views::Accelerator accel_update_screen(base::VKEY_U, false, true, true); + views::Accelerator accel_image_screen(base::VKEY_I, false, true, true); + + EXPECT_CALL(*mock_network_screen_, Hide()).Times(1); + EXPECT_CALL(*mock_account_screen_, Show()).Times(1); + EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_account_screen)); + EXPECT_EQ(controller()->GetAccountScreen(), controller()->current_screen()); + + EXPECT_CALL(*mock_account_screen_, Hide()).Times(1); + EXPECT_CALL(*mock_login_screen_, Show()).Times(1); + EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_login_screen)); + EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen()); + + EXPECT_CALL(*mock_login_screen_, Hide()).Times(1); + EXPECT_CALL(*mock_network_screen_, Show()).Times(1); + EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_network_screen)); + EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen()); + + EXPECT_CALL(*mock_network_screen_, Hide()).Times(1); + EXPECT_CALL(*mock_update_screen_, Show()).Times(1); + EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_update_screen)); + EXPECT_EQ(controller()->GetUpdateScreen(), controller()->current_screen()); + + EXPECT_CALL(*mock_update_screen_, Hide()).Times(1); + EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_image_screen)); + EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen()); +} + COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 14, add_tests_for_new_control_flow_you_just_introduced); |