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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/sticky_keys/sticky_keys_overlay_unittest.cc

Issue 255033003: Convert sticky keys to a chromeos::EventRewriter phase. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@x354034-er
Patch Set: distinguish between MouseEvent and MouseWheelEvent Created 6 years, 6 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/sticky_keys/sticky_keys_controller.cc ('k') | ash/sticky_keys/sticky_keys_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sticky_keys/sticky_keys_overlay_unittest.cc
diff --git a/ash/sticky_keys/sticky_keys_overlay_unittest.cc b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
index 678eff4f4505d29c560ab8dc8c4241a1bbc45841..0d6f1615cafefe7c90f44f151a636a3b692d9ffc 100644
--- a/ash/sticky_keys/sticky_keys_overlay_unittest.cc
+++ b/ash/sticky_keys/sticky_keys_overlay_unittest.cc
@@ -7,47 +7,14 @@
#include "ash/shell.h"
#include "ash/sticky_keys/sticky_keys_controller.h"
#include "ash/test/ash_test_base.h"
-#include "base/memory/scoped_ptr.h"
-#include "ui/aura/window_tree_host.h"
#include "ui/events/event.h"
-#include "ui/events/event_processor.h"
namespace ash {
class StickyKeysOverlayTest : public test::AshTestBase {
public:
- StickyKeysOverlayTest() :
- controller_(NULL),
- overlay_(NULL) {}
-
+ StickyKeysOverlayTest() {}
virtual ~StickyKeysOverlayTest() {}
-
- virtual void SetUp() OVERRIDE {
- test::AshTestBase::SetUp();
-
- controller_ = Shell::GetInstance()->sticky_keys_controller();
- controller_->Enable(true);
- overlay_ = controller_->GetOverlayForTest();
- ASSERT_TRUE(overlay_);
- }
-
- void PressAndReleaseKey(ui::KeyboardCode code) {
- SendKeyEvent(ui::ET_KEY_PRESSED, code);
- SendKeyEvent(ui::ET_KEY_RELEASED, code);
- }
-
- void SendKeyEvent(ui::EventType type, ui::KeyboardCode code) {
- ui::KeyEvent event(type, code, 0, false);
- ui::Event::DispatcherApi dispatcher(&event);
- dispatcher.set_target(Shell::GetInstance()->GetPrimaryRootWindow());
-
- ui::EventDispatchDetails details = Shell::GetPrimaryRootWindow()->
- GetHost()->event_processor()->OnEventFromSource(&event);
- CHECK(!details.dispatcher_destroyed);
- }
-
- StickyKeysController* controller_;
- StickyKeysOverlay* overlay_;
};
TEST_F(StickyKeysOverlayTest, OverlayVisibility) {
@@ -71,168 +38,7 @@ TEST_F(StickyKeysOverlayTest, ModifierKeyState) {
overlay.GetModifierKeyState(ui::EF_CONTROL_DOWN));
}
-TEST_F(StickyKeysOverlayTest, OneModifierEnabled) {
- EXPECT_FALSE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
-
- // Pressing modifier key should show overlay.
- PressAndReleaseKey(ui::VKEY_CONTROL);
- EXPECT_TRUE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_ENABLED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
-
- // Pressing a normal key should hide overlay.
- PressAndReleaseKey(ui::VKEY_T);
- EXPECT_FALSE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
-}
-
-TEST_F(StickyKeysOverlayTest, TwoModifiersEnabled) {
- EXPECT_FALSE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
-
- // Pressing two modifiers should show overlay.
- PressAndReleaseKey(ui::VKEY_SHIFT);
- PressAndReleaseKey(ui::VKEY_CONTROL);
- EXPECT_TRUE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_ENABLED,
- overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_ENABLED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
-
- // Pressing a normal key should hide overlay.
- PressAndReleaseKey(ui::VKEY_N);
- EXPECT_FALSE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
-}
-
-TEST_F(StickyKeysOverlayTest, LockedModifier) {
- EXPECT_FALSE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_ALT_DOWN));
-
- // Pressing a modifier key twice should lock modifier and show overlay.
- PressAndReleaseKey(ui::VKEY_LMENU);
- PressAndReleaseKey(ui::VKEY_LMENU);
- EXPECT_TRUE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_LOCKED,
- overlay_->GetModifierKeyState(ui::EF_ALT_DOWN));
-
- // Pressing a normal key should not hide overlay.
- PressAndReleaseKey(ui::VKEY_D);
- EXPECT_TRUE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_LOCKED,
- overlay_->GetModifierKeyState(ui::EF_ALT_DOWN));
-}
-
-TEST_F(StickyKeysOverlayTest, LockedAndNormalModifier) {
- EXPECT_FALSE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
-
- // Pressing a modifier key twice should lock modifier and show overlay.
- PressAndReleaseKey(ui::VKEY_CONTROL);
- PressAndReleaseKey(ui::VKEY_CONTROL);
- EXPECT_TRUE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_LOCKED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
-
- // Pressing another modifier key should still show overlay.
- PressAndReleaseKey(ui::VKEY_SHIFT);
- EXPECT_TRUE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_LOCKED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_ENABLED,
- overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
-
- // Pressing a normal key should not hide overlay but disable normal modifier.
- PressAndReleaseKey(ui::VKEY_D);
- EXPECT_TRUE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_LOCKED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
-}
-
-TEST_F(StickyKeysOverlayTest, ModifiersDisabled) {
- EXPECT_FALSE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_ALT_DOWN));
-
- // Enable modifiers.
- PressAndReleaseKey(ui::VKEY_CONTROL);
- PressAndReleaseKey(ui::VKEY_SHIFT);
- PressAndReleaseKey(ui::VKEY_SHIFT);
- PressAndReleaseKey(ui::VKEY_LMENU);
-
- EXPECT_TRUE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_ENABLED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_LOCKED,
- overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_ENABLED,
- overlay_->GetModifierKeyState(ui::EF_ALT_DOWN));
-
- // Disable modifiers and overlay should be hidden.
- PressAndReleaseKey(ui::VKEY_CONTROL);
- PressAndReleaseKey(ui::VKEY_CONTROL);
- PressAndReleaseKey(ui::VKEY_SHIFT);
- PressAndReleaseKey(ui::VKEY_LMENU);
- PressAndReleaseKey(ui::VKEY_LMENU);
-
- EXPECT_FALSE(overlay_->is_visible());
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_CONTROL_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_SHIFT_DOWN));
- EXPECT_EQ(STICKY_KEY_STATE_DISABLED,
- overlay_->GetModifierKeyState(ui::EF_ALT_DOWN));
-}
-
-TEST_F(StickyKeysOverlayTest, ModifierVisibility) {
- // All but AltGr and Mod3 should initially be visible.
- EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_CONTROL_DOWN));
- EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_SHIFT_DOWN));
- EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_ALT_DOWN));
- EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
- EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
-
- // Turn all modifiers on.
- controller_->SetModifiersEnabled(true, true);
- EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_CONTROL_DOWN));
- EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_SHIFT_DOWN));
- EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_ALT_DOWN));
- EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
- EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
-
- // Turn off Mod3.
- controller_->SetModifiersEnabled(false, true);
- EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
- EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
-
- // Turn off AltGr.
- controller_->SetModifiersEnabled(true, false);
- EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
- EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
-
- // Turn off AltGr and Mod3.
- controller_->SetModifiersEnabled(false, false);
- EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
- EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
-}
+// Additional sticky key overlay tests that depend on chromeos::EventRewriter
+// are now in chrome/browser/chromeos/events/event_rewriter_unittest.cc .
} // namespace ash
« no previous file with comments | « ash/sticky_keys/sticky_keys_controller.cc ('k') | ash/sticky_keys/sticky_keys_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698