Unify and change logout/sleep/lock shortcuts

ash/accelerators/accelerator_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screenshot_delegate.h"
@@ skipping 303 matching lines @@
 
  protected:
   void EnableInternalDisplay() {
     test::DisplayManagerTestApi(Shell::GetInstance()->display_manager()).
         SetFirstDisplayAsInternalDisplay();
   }
 
   static AcceleratorController* GetController();
   static bool ProcessWithContext(const ui::Accelerator& accelerator);
 
+  void ExitWarningHandlerTestDoublePress();
+  void ExitWarningHandlerTestLongHold();
+  void ExitWarningHandlerTestEarlyRelease();
+  void ExitWarningHandlerTestQuickRelease();
+
  private:
   DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerTest);
 };
 
 AcceleratorController* AcceleratorControllerTest::GetController() {
   return Shell::GetInstance()->accelerator_controller();
 }
 
 bool AcceleratorControllerTest::ProcessWithContext(
     const ui::Accelerator& accelerator) {
   AcceleratorController* controller = GetController();
   controller->context()->UpdateContext(accelerator);
   return controller->Process(accelerator);
 }
 
+// Quick double press of exit key => exiting
+void AcceleratorControllerTest::ExitWarningHandlerTestDoublePress() {
+  ExitWarningHandler ewh;
+  ewh.StubTimersForTest();
+  EXPECT_EQ(ExitWarningHandler::IDLE, ewh.state());
+  EXPECT_FALSE(ewh.ui_shown());
+
+  ewh.HandleExitKey(true);
+  EXPECT_TRUE(ewh.ui_shown());
+  ewh.HandleExitKey(false);
+  ewh.HandleExitKey(true); // double press
+  ewh.Timer1Action(); // simulate double press timer expired
+  ewh.Timer2Action(); // simulate long hold timer expired
+  ewh.HandleExitKey(false);
+  EXPECT_FALSE(ewh.ui_shown());
+  EXPECT_EQ(ExitWarningHandler::EXITING, ewh.state());
+}
+
+// Long hold of exit key => exiting
+void AcceleratorControllerTest::ExitWarningHandlerTestLongHold() {
+  ExitWarningHandler ewh;
+  ewh.StubTimersForTest();
+  EXPECT_EQ(ExitWarningHandler::IDLE, ewh.state());
+  EXPECT_FALSE(ewh.ui_shown());
+
+  ewh.HandleExitKey(true);
+  EXPECT_TRUE(ewh.ui_shown());
+  ewh.Timer1Action(); // simulate double press timer expired
+  ewh.Timer2Action(); // simulate long hold timer expired
+  ewh.HandleExitKey(false); // release after long hold
+  EXPECT_FALSE(ewh.ui_shown());
+  EXPECT_EQ(ExitWarningHandler::EXITING, ewh.state());
+}
+
+// Release of exit key before hold time limit => cancel
+void AcceleratorControllerTest::ExitWarningHandlerTestEarlyRelease() {
+  ExitWarningHandler ewh;
+  ewh.StubTimersForTest();
+  EXPECT_EQ(ExitWarningHandler::IDLE, ewh.state());
+  EXPECT_FALSE(ewh.ui_shown());
+
+  ewh.HandleExitKey(true);
+  EXPECT_TRUE(ewh.ui_shown());
+  ewh.Timer1Action(); // simulate double press timer expired
+  ewh.HandleExitKey(false); // release before long hold limit
+  ewh.Timer2Action(); // simulate long hold timer expired
+  EXPECT_FALSE(ewh.ui_shown());
+  EXPECT_EQ(ExitWarningHandler::IDLE, ewh.state());
+}
+
+// Release of exit key before double press limit => cancel.
+void AcceleratorControllerTest::ExitWarningHandlerTestQuickRelease() {
+  ExitWarningHandler ewh;
+  ewh.StubTimersForTest();
+  EXPECT_EQ(ExitWarningHandler::IDLE, ewh.state());
+  EXPECT_FALSE(ewh.ui_shown());
+
+  ewh.HandleExitKey(true);
+  EXPECT_TRUE(ewh.ui_shown());
+  ewh.HandleExitKey(false); // release before double press limit
+  ewh.Timer1Action(); // simulate double press timer expired
+  ewh.Timer2Action(); // simulate long hold timer expired
+  EXPECT_FALSE(ewh.ui_shown());
+  EXPECT_EQ(ExitWarningHandler::IDLE, ewh.state());
+}
+
+TEST_F(AcceleratorControllerTest, ExitWarningHandlerTestDoublePress) {
+  ExitWarningHandlerTestDoublePress();

[sky, 2013/05/14 17:10:05]

The typical pattern is to put the assertions in your test both, not bounce to a
method that has the assertions.

[sschmitz, 2013/05/14 21:36:43]

Done. Due to the need of friendship to ExitWarningHandler, the test base class
provides some utility functions for the needed access.

+}
+
+TEST_F(AcceleratorControllerTest, ExitWarningHandlerTestLongHold) {
+  ExitWarningHandlerTestLongHold();
+}
+
+TEST_F(AcceleratorControllerTest, ExitWarningHandlerTestEarlyRelease) {
+  ExitWarningHandlerTestEarlyRelease();
+}
+
+TEST_F(AcceleratorControllerTest, ExitWarningHandlerTestQuickRelease) {
+ ExitWarningHandlerTestQuickRelease();
+}
+
 TEST_F(AcceleratorControllerTest, Register) {
   const ui::Accelerator accelerator_a(ui::VKEY_A, ui::EF_NONE);
   TestTarget target;
   GetController()->Register(accelerator_a, &target);
 
   // The registered accelerator is processed.
   EXPECT_TRUE(ProcessWithContext(accelerator_a));
   EXPECT_EQ(1, target.accelerator_pressed_count());
 }
 
@@ skipping 895 matching lines @@
     EXPECT_EQ(volume_down, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
     EXPECT_TRUE(ProcessWithContext(volume_up));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(volume_up, delegate->last_accelerator());
   }
 }
 #endif
 
 }  // namespace ash