Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ash/sticky_keys/sticky_keys_overlay.h" | 5 #include "ash/sticky_keys/sticky_keys_overlay.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "ash/sticky_keys/sticky_keys_controller.h" | 8 #include "ash/sticky_keys/sticky_keys_controller.h" |
| 9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
| 10 #include "ui/events/event.h" | 10 #include "ui/events/event.h" |
| 11 #include "ui/views/widget/widget.h" | |
| 11 | 12 |
| 12 namespace ash { | 13 namespace ash { |
| 13 | 14 |
| 14 class StickyKeysOverlayTest : public test::AshTestBase { | 15 class StickyKeysOverlayTest : public test::AshTestBase { |
|
James Cook
2014/12/01 21:06:00
optional: This could become:
using StickyKeysOver
Tim Song
2014/12/02 20:07:05
Done.
| |
| 15 public: | 16 public: |
| 16 StickyKeysOverlayTest() {} | 17 StickyKeysOverlayTest() {} |
| 17 virtual ~StickyKeysOverlayTest() {} | 18 virtual ~StickyKeysOverlayTest() {} |
| 18 }; | 19 }; |
| 19 | 20 |
| 20 TEST_F(StickyKeysOverlayTest, OverlayVisibility) { | 21 TEST_F(StickyKeysOverlayTest, OverlayVisibility) { |
| 21 StickyKeysOverlay overlay; | 22 StickyKeysOverlay overlay; |
| 22 EXPECT_FALSE(overlay.is_visible()); | 23 EXPECT_FALSE(overlay.is_visible()); |
| 23 overlay.Show(true); | 24 overlay.Show(true); |
| 24 EXPECT_TRUE(overlay.is_visible()); | 25 EXPECT_TRUE(overlay.is_visible()); |
| 25 } | 26 } |
| 26 | 27 |
| 27 TEST_F(StickyKeysOverlayTest, ModifierKeyState) { | 28 TEST_F(StickyKeysOverlayTest, ModifierKeyState) { |
| 28 StickyKeysOverlay overlay; | 29 StickyKeysOverlay overlay; |
| 29 overlay.SetModifierKeyState(ui::EF_SHIFT_DOWN, STICKY_KEY_STATE_DISABLED); | 30 overlay.SetModifierKeyState(ui::EF_SHIFT_DOWN, STICKY_KEY_STATE_DISABLED); |
| 30 overlay.SetModifierKeyState(ui::EF_ALT_DOWN, STICKY_KEY_STATE_LOCKED); | 31 overlay.SetModifierKeyState(ui::EF_ALT_DOWN, STICKY_KEY_STATE_LOCKED); |
| 31 overlay.SetModifierKeyState(ui::EF_CONTROL_DOWN, STICKY_KEY_STATE_ENABLED); | 32 overlay.SetModifierKeyState(ui::EF_CONTROL_DOWN, STICKY_KEY_STATE_ENABLED); |
| 32 overlay.SetModifierKeyState(ui::EF_COMMAND_DOWN, STICKY_KEY_STATE_LOCKED); | 33 overlay.SetModifierKeyState(ui::EF_COMMAND_DOWN, STICKY_KEY_STATE_LOCKED); |
| 33 | 34 |
| 34 EXPECT_EQ(STICKY_KEY_STATE_DISABLED, | 35 EXPECT_EQ(STICKY_KEY_STATE_DISABLED, |
| 35 overlay.GetModifierKeyState(ui::EF_SHIFT_DOWN)); | 36 overlay.GetModifierKeyState(ui::EF_SHIFT_DOWN)); |
| 36 EXPECT_EQ(STICKY_KEY_STATE_LOCKED, | 37 EXPECT_EQ(STICKY_KEY_STATE_LOCKED, |
| 37 overlay.GetModifierKeyState(ui::EF_ALT_DOWN)); | 38 overlay.GetModifierKeyState(ui::EF_ALT_DOWN)); |
| 38 EXPECT_EQ(STICKY_KEY_STATE_ENABLED, | 39 EXPECT_EQ(STICKY_KEY_STATE_ENABLED, |
| 39 overlay.GetModifierKeyState(ui::EF_CONTROL_DOWN)); | 40 overlay.GetModifierKeyState(ui::EF_CONTROL_DOWN)); |
| 40 EXPECT_EQ(STICKY_KEY_STATE_LOCKED, | 41 EXPECT_EQ(STICKY_KEY_STATE_LOCKED, |
| 41 overlay.GetModifierKeyState(ui::EF_COMMAND_DOWN)); | 42 overlay.GetModifierKeyState(ui::EF_COMMAND_DOWN)); |
| 42 } | 43 } |
| 43 | 44 |
| 45 TEST_F(StickyKeysOverlayTest, OverlayViewOwnership) { | |
|
James Cook
2014/12/01 21:06:00
nit: Document what this test is testing. I like to
Tim Song
2014/12/02 20:07:05
Done.
| |
| 46 StickyKeysOverlay overlay; | |
| 47 views::Widget* widget = overlay.GetWidgetForTesting(); | |
| 48 ASSERT_TRUE(widget); | |
| 49 delete widget->GetNativeWindow(); | |
| 50 | |
| 51 // States should still be valid even after the native window associated with | |
| 52 // the Widget is destroyed. | |
| 53 overlay.SetModifierKeyState(ui::EF_SHIFT_DOWN, STICKY_KEY_STATE_ENABLED); | |
| 54 EXPECT_EQ(STICKY_KEY_STATE_ENABLED, | |
| 55 overlay.GetModifierKeyState(ui::EF_SHIFT_DOWN)); | |
| 56 overlay.SetModifierKeyState(ui::EF_SHIFT_DOWN, STICKY_KEY_STATE_DISABLED); | |
| 57 EXPECT_EQ(STICKY_KEY_STATE_DISABLED, | |
| 58 overlay.GetModifierKeyState(ui::EF_SHIFT_DOWN)); | |
| 59 } | |
| 60 | |
| 44 // Additional sticky key overlay tests that depend on chromeos::EventRewriter | 61 // Additional sticky key overlay tests that depend on chromeos::EventRewriter |
| 45 // are now in chrome/browser/chromeos/events/event_rewriter_unittest.cc . | 62 // are now in chrome/browser/chromeos/events/event_rewriter_unittest.cc . |
| 46 | 63 |
| 47 } // namespace ash | 64 } // namespace ash |
| OLD | NEW |