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

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

Issue 4271001: Disabling WizardControllerFlowTest.Accelerators and AccountScreenTest.TestBasic for official build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: " Created 10 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
« no previous file with comments | « chrome/browser/chromeos/login/account_screen_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "app/l10n_util.h" 5 #include "app/l10n_util.h"
6 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
7 #include "chrome/browser/chromeos/login/account_screen.h" 7 #include "chrome/browser/chromeos/login/account_screen.h"
8 #include "chrome/browser/chromeos/login/eula_view.h" 8 #include "chrome/browser/chromeos/login/eula_view.h"
9 #include "chrome/browser/chromeos/login/language_switch_menu.h" 9 #include "chrome/browser/chromeos/login/language_switch_menu.h"
10 #include "chrome/browser/chromeos/login/login_screen.h" 10 #include "chrome/browser/chromeos/login/login_screen.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 } 207 }
208 208
209 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorNetwork) { 209 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, ControlFlowErrorNetwork) {
210 EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen()); 210 EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());
211 EXPECT_CALL(*mock_login_screen_, Show()).Times(1); 211 EXPECT_CALL(*mock_login_screen_, Show()).Times(1);
212 EXPECT_CALL(*mock_network_screen_, Hide()).Times(1); 212 EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
213 controller()->OnExit(chromeos::ScreenObserver::NETWORK_OFFLINE); 213 controller()->OnExit(chromeos::ScreenObserver::NETWORK_OFFLINE);
214 EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen()); 214 EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen());
215 } 215 }
216 216
217 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, Accelerators) { 217 #if defined(OFFICIAL_BUILD)
218 // This test is supposed to fail on official test.
219 #define MAYBE_Accelerators DISABLED_Accelerators
220 #else
221 #define MAYBE_Accelerators Accelerators
222 #endif
223
224 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, MAYBE_Accelerators) {
218 EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen()); 225 EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());
219 226
220 views::FocusManager* focus_manager = 227 views::FocusManager* focus_manager =
221 controller()->contents()->GetFocusManager(); 228 controller()->contents()->GetFocusManager();
222 views::Accelerator accel_account_screen(app::VKEY_A, false, true, true); 229 views::Accelerator accel_account_screen(app::VKEY_A, false, true, true);
223 views::Accelerator accel_login_screen(app::VKEY_L, false, true, true); 230 views::Accelerator accel_login_screen(app::VKEY_L, false, true, true);
224 views::Accelerator accel_network_screen(app::VKEY_N, false, true, true); 231 views::Accelerator accel_network_screen(app::VKEY_N, false, true, true);
225 views::Accelerator accel_update_screen(app::VKEY_U, false, true, true); 232 views::Accelerator accel_update_screen(app::VKEY_U, false, true, true);
226 views::Accelerator accel_image_screen(app::VKEY_I, false, true, true); 233 views::Accelerator accel_image_screen(app::VKEY_I, false, true, true);
227 views::Accelerator accel_eula_screen(app::VKEY_E, false, true, true); 234 views::Accelerator accel_eula_screen(app::VKEY_E, false, true, true);
(...skipping 27 matching lines...) Expand all
255 EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen()); 262 EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen());
256 263
257 focus_manager = controller()->contents()->GetFocusManager(); 264 focus_manager = controller()->contents()->GetFocusManager();
258 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1); 265 EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
259 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen)); 266 EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen));
260 EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen()); 267 EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen());
261 } 268 }
262 269
263 COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 18, 270 COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 18,
264 add_tests_for_new_control_flow_you_just_introduced); 271 add_tests_for_new_control_flow_you_just_introduced);
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/account_screen_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698