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

Side by Side Diff: chrome/browser/chromeos/events/event_rewriter_unittest.cc

Issue 2605843002: Add MockInputMethodManager under ui/base/ime/chromeos/ (Closed)
Patch Set: Created 3 years, 11 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
OLDNEW
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 "chrome/browser/chromeos/events/event_rewriter.h" 5 #include "chrome/browser/chromeos/events/event_rewriter.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/common/wm/window_state.h" 9 #include "ash/common/wm/window_state.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "ash/sticky_keys/sticky_keys_controller.h" 11 #include "ash/sticky_keys/sticky_keys_controller.h"
12 #include "ash/sticky_keys/sticky_keys_overlay.h" 12 #include "ash/sticky_keys/sticky_keys_overlay.h"
13 #include "ash/test/ash_test_base.h" 13 #include "ash/test/ash_test_base.h"
14 #include "ash/wm/window_state_aura.h" 14 #include "ash/wm/window_state_aura.h"
15 #include "base/command_line.h" 15 #include "base/command_line.h"
16 #include "base/macros.h" 16 #include "base/macros.h"
17 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 18 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
19 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h" 19 #include "chrome/browser/chromeos/input_method/mock_input_method_manager_impl.h"
20 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" 20 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
21 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" 21 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
22 #include "chrome/browser/chromeos/preferences.h" 22 #include "chrome/browser/chromeos/preferences.h"
23 #include "chrome/common/pref_names.h" 23 #include "chrome/common/pref_names.h"
24 #include "chromeos/chromeos_switches.h" 24 #include "chromeos/chromeos_switches.h"
25 #include "components/prefs/pref_member.h" 25 #include "components/prefs/pref_member.h"
26 #include "components/sync_preferences/testing_pref_service_syncable.h" 26 #include "components/sync_preferences/testing_pref_service_syncable.h"
27 #include "testing/gtest/include/gtest/gtest.h" 27 #include "testing/gtest/include/gtest/gtest.h"
28 #include "ui/aura/window.h" 28 #include "ui/aura/window.h"
29 #include "ui/aura/window_tree_host.h" 29 #include "ui/aura/window_tree_host.h"
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 class EventRewriterTest : public ash::test::AshTestBase { 120 class EventRewriterTest : public ash::test::AshTestBase {
121 public: 121 public:
122 EventRewriterTest() 122 EventRewriterTest()
123 : fake_user_manager_(new chromeos::FakeChromeUserManager), 123 : fake_user_manager_(new chromeos::FakeChromeUserManager),
124 user_manager_enabler_(fake_user_manager_), 124 user_manager_enabler_(fake_user_manager_),
125 input_method_manager_mock_(NULL) {} 125 input_method_manager_mock_(NULL) {}
126 ~EventRewriterTest() override {} 126 ~EventRewriterTest() override {}
127 127
128 void SetUp() override { 128 void SetUp() override {
129 input_method_manager_mock_ = 129 input_method_manager_mock_ =
130 new chromeos::input_method::MockInputMethodManager; 130 new chromeos::input_method::MockInputMethodManagerImpl;
131 chromeos::input_method::InitializeForTesting( 131 chromeos::input_method::InitializeForTesting(
132 input_method_manager_mock_); // pass ownership 132 input_method_manager_mock_); // pass ownership
sky 2017/01/03 16:29:46 Would be nice if this took a unique_ptr so ownersh
Azure Wei 2017/01/04 09:13:27 Do you mean make input_method_manager_mock_ as std
sky 2017/01/04 16:35:52 This is what you have: chromeos::input_method::In
133 133
134 AshTestBase::SetUp(); 134 AshTestBase::SetUp();
135 } 135 }
136 136
137 void TearDown() override { 137 void TearDown() override {
138 AshTestBase::TearDown(); 138 AshTestBase::TearDown();
139 // Shutdown() deletes the IME mock object. 139 // Shutdown() deletes the IME mock object.
140 chromeos::input_method::Shutdown(); 140 chromeos::input_method::Shutdown();
141 } 141 }
142 142
143 protected: 143 protected:
144 void TestRewriteNumPadKeys(); 144 void TestRewriteNumPadKeys();
145 void TestRewriteNumPadKeysOnAppleKeyboard(); 145 void TestRewriteNumPadKeysOnAppleKeyboard();
146 146
147 const ui::MouseEvent* RewriteMouseButtonEvent( 147 const ui::MouseEvent* RewriteMouseButtonEvent(
148 chromeos::EventRewriter* rewriter, 148 chromeos::EventRewriter* rewriter,
149 const ui::MouseEvent& event, 149 const ui::MouseEvent& event,
150 std::unique_ptr<ui::Event>* new_event) { 150 std::unique_ptr<ui::Event>* new_event) {
151 rewriter->RewriteMouseButtonEventForTesting(event, new_event); 151 rewriter->RewriteMouseButtonEventForTesting(event, new_event);
152 return *new_event ? new_event->get()->AsMouseEvent() : &event; 152 return *new_event ? new_event->get()->AsMouseEvent() : &event;
153 } 153 }
154 154
155 chromeos::FakeChromeUserManager* fake_user_manager_; // Not owned. 155 chromeos::FakeChromeUserManager* fake_user_manager_; // Not owned.
156 chromeos::ScopedUserManagerEnabler user_manager_enabler_; 156 chromeos::ScopedUserManagerEnabler user_manager_enabler_;
157 chromeos::input_method::MockInputMethodManager* input_method_manager_mock_; 157 chromeos::input_method::MockInputMethodManagerImpl*
158 input_method_manager_mock_;
158 }; 159 };
159 160
160 TEST_F(EventRewriterTest, TestRewriteCommandToControl) { 161 TEST_F(EventRewriterTest, TestRewriteCommandToControl) {
161 // First, test with a PC keyboard. 162 // First, test with a PC keyboard.
162 sync_preferences::TestingPrefServiceSyncable prefs; 163 sync_preferences::TestingPrefServiceSyncable prefs;
163 EventRewriter rewriter(NULL); 164 EventRewriter rewriter(NULL);
164 rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard"); 165 rewriter.KeyboardDeviceAddedForTesting(kKeyboardDeviceId, "PC Keyboard");
165 rewriter.set_last_keyboard_device_id_for_testing(kKeyboardDeviceId); 166 rewriter.set_last_keyboard_device_id_for_testing(kKeyboardDeviceId);
166 rewriter.set_pref_service_for_testing(&prefs); 167 rewriter.set_pref_service_for_testing(&prefs);
167 168
(...skipping 2520 matching lines...) Expand 10 before | Expand all | Expand 10 after
2688 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); 2689 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
2689 EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); 2690 EXPECT_TRUE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
2690 2691
2691 // Turn off AltGr and Mod3. 2692 // Turn off AltGr and Mod3.
2692 sticky_keys_controller_->SetModifiersEnabled(false, false); 2693 sticky_keys_controller_->SetModifiersEnabled(false, false);
2693 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN)); 2694 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_ALTGR_DOWN));
2694 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN)); 2695 EXPECT_FALSE(overlay_->GetModifierVisible(ui::EF_MOD3_DOWN));
2695 } 2696 }
2696 2697
2697 } // namespace chromeos 2698 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698