ash/accelerators/spoken_feedback_toggler_unittest.cc - Issue 2101263004: mash: Migrate AccessibilityDelegate access to WmShell.

Side by Side Diff: ash/accelerators/spoken_feedback_toggler_unittest.cc

Issue 2101263004: mash: Migrate AccessibilityDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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 unified diff | Download patch

« no previous file with comments | « ash/accelerators/spoken_feedback_toggler.cc ('k') | ash/ash_touch_exploration_manager_chromeos.cc » ('j') | no next file with comments »

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/accelerators/spoken_feedback_toggler.h"	5 #include "ash/accelerators/spoken_feedback_toggler.h"

6 #include "ash/common/accessibility_delegate.h"	6 #include "ash/common/accessibility_delegate.h"

7 #include "ash/shell.h"	7 #include "ash/common/wm_shell.h"

8 #include "ash/test/ash_test_base.h"	8 #include "ash/test/ash_test_base.h"

9 #include "ash/wm/window_util.h"	9 #include "ash/wm/window_util.h"

10 #include "ui/aura/test/test_window_delegate.h"	10 #include "ui/aura/test/test_window_delegate.h"

	11 #include "ui/aura/window.h"

11 #include "ui/events/test/event_generator.h"	12 #include "ui/events/test/event_generator.h"

12	13

13 namespace ash {	14 namespace ash {

14	15

15 typedef ash::test::AshTestBase SpokenFeedbackTogglerTest;	16 using SpokenFeedbackTogglerTest = test::AshTestBase;

16	17

17 TEST_F(SpokenFeedbackTogglerTest, Basic) {	18 TEST_F(SpokenFeedbackTogglerTest, Basic) {

18 SpokenFeedbackToggler::ScopedEnablerForTest scoped;	19 SpokenFeedbackToggler::ScopedEnablerForTest scoped;

19 Shell* shell = Shell::GetInstance();	20 AccessibilityDelegate* delegate = WmShell::Get()->GetAccessibilityDelegate();

20 AccessibilityDelegate* delegate = shell->accessibility_delegate();

21 ui::test::EventGenerator& generator = GetEventGenerator();	21 ui::test::EventGenerator& generator = GetEventGenerator();

22 EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());	22 EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());

23	23

24 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);	24 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);

25 EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());	25 EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());

26 generator.ReleaseKey(ui::VKEY_F6, 0);	26 generator.ReleaseKey(ui::VKEY_F6, 0);

27 EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());	27 EXPECT_FALSE(delegate->IsSpokenFeedbackEnabled());

28	28

29 // Click and hold toggles the spoken feedback.	29 // Click and hold toggles the spoken feedback.

30 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);	30 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
69	69

70 // Hotkey press and hold.	70 // Hotkey press and hold.

71 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);	71 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);

72 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);	72 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);

73 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);	73 generator.PressKey(ui::VKEY_F6, ui::EF_SHIFT_DOWN);

74 generator.ReleaseKey(ui::VKEY_F6, 0);	74 generator.ReleaseKey(ui::VKEY_F6, 0);

75 EXPECT_EQ("3 1", delegate.GetKeyCountsAndReset());	75 EXPECT_EQ("3 1", delegate.GetKeyCountsAndReset());

76 }	76 }

77	77

78 } // namespace ash	78 } // namespace ash

OLD	NEW