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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc

Issue 14200032: Decouple l10n_util from InputMethodUtil. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: /MockInputMethodDelegate/FakeInputMethodDelegate/ Created 7 years, 8 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/input_method/input_method_manager_impl.h" 5 #include "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/message_loop.h" 13 #include "base/message_loop.h"
14 #include "chrome/browser/chromeos/input_method/mock_candidate_window_controller. h" 14 #include "chrome/browser/chromeos/input_method/mock_candidate_window_controller. h"
15 #include "chrome/browser/chromeos/input_method/mock_ibus_controller.h" 15 #include "chrome/browser/chromeos/input_method/mock_ibus_controller.h"
16 #include "chromeos/dbus/ibus/mock_ibus_client.h" 16 #include "chromeos/dbus/ibus/mock_ibus_client.h"
17 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h" 17 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
18 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h" 18 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
19 #include "chromeos/ime/extension_ime_util.h" 19 #include "chromeos/ime/extension_ime_util.h"
20 #include "chromeos/ime/fake_input_method_delegate.h"
20 #include "chromeos/ime/mock_component_extension_ime_manager_delegate.h" 21 #include "chromeos/ime/mock_component_extension_ime_manager_delegate.h"
21 #include "chromeos/ime/mock_ibus_daemon_controller.h" 22 #include "chromeos/ime/mock_ibus_daemon_controller.h"
22 #include "chromeos/ime/mock_input_method_delegate.h"
23 #include "chromeos/ime/mock_xkeyboard.h" 23 #include "chromeos/ime/mock_xkeyboard.h"
24 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
25 #include "ui/base/accelerators/accelerator.h" 25 #include "ui/base/accelerators/accelerator.h"
26 #include "ui/base/ime/text_input_test_support.h" 26 #include "ui/base/ime/text_input_test_support.h"
27 #include "ui/base/keycodes/keyboard_codes.h" 27 #include "ui/base/keycodes/keyboard_codes.h"
28 28
29 namespace chromeos { 29 namespace chromeos {
30 30
31 namespace input_method { 31 namespace input_method {
32 namespace { 32 namespace {
(...skipping 12 matching lines...) Expand all
45 mock_ibus_daemon_controller_ = new chromeos::MockIBusDaemonController(); 45 mock_ibus_daemon_controller_ = new chromeos::MockIBusDaemonController();
46 chromeos::IBusDaemonController::InitializeForTesting( 46 chromeos::IBusDaemonController::InitializeForTesting(
47 mock_ibus_daemon_controller_); 47 mock_ibus_daemon_controller_);
48 mock_dbus_thread_manager_ = 48 mock_dbus_thread_manager_ =
49 new chromeos::MockDBusThreadManagerWithoutGMock(); 49 new chromeos::MockDBusThreadManagerWithoutGMock();
50 chromeos::DBusThreadManager::InitializeForTesting( 50 chromeos::DBusThreadManager::InitializeForTesting(
51 mock_dbus_thread_manager_); 51 mock_dbus_thread_manager_);
52 mock_ibus_client_ = mock_dbus_thread_manager_->mock_ibus_client(); 52 mock_ibus_client_ = mock_dbus_thread_manager_->mock_ibus_client();
53 mock_ibus_input_context_client_ = 53 mock_ibus_input_context_client_ =
54 mock_dbus_thread_manager_->mock_ibus_input_context_client(); 54 mock_dbus_thread_manager_->mock_ibus_input_context_client();
55 delegate_ = new MockInputMethodDelegate(); 55 delegate_ = new FakeInputMethodDelegate();
56 manager_.reset(new InputMethodManagerImpl( 56 manager_.reset(new InputMethodManagerImpl(
57 scoped_ptr<InputMethodDelegate>(delegate_))); 57 scoped_ptr<InputMethodDelegate>(delegate_)));
58 controller_ = new MockIBusController; 58 controller_ = new MockIBusController;
59 manager_->SetIBusControllerForTesting(controller_); 59 manager_->SetIBusControllerForTesting(controller_);
60 candidate_window_controller_ = new MockCandidateWindowController; 60 candidate_window_controller_ = new MockCandidateWindowController;
61 manager_->SetCandidateWindowControllerForTesting( 61 manager_->SetCandidateWindowControllerForTesting(
62 candidate_window_controller_); 62 candidate_window_controller_);
63 xkeyboard_ = new MockXKeyboard; 63 xkeyboard_ = new MockXKeyboard;
64 manager_->SetXKeyboardForTesting(xkeyboard_); 64 manager_->SetXKeyboardForTesting(xkeyboard_);
65 65
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 106
107 protected: 107 protected:
108 void ComponentExtensionInitialize() { 108 void ComponentExtensionInitialize() {
109 mock_delegate_ = new MockComponentExtIMEManagerDelegate(); 109 mock_delegate_ = new MockComponentExtIMEManagerDelegate();
110 mock_delegate_->set_ime_list(ime_list_); 110 mock_delegate_->set_ime_list(ime_list_);
111 scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate(mock_delegate_); 111 scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate(mock_delegate_);
112 manager_->InitializeComponentExtensionForTesting(delegate.Pass()); 112 manager_->InitializeComponentExtensionForTesting(delegate.Pass());
113 } 113 }
114 114
115 scoped_ptr<InputMethodManagerImpl> manager_; 115 scoped_ptr<InputMethodManagerImpl> manager_;
116 MockInputMethodDelegate* delegate_; 116 FakeInputMethodDelegate* delegate_;
117 MockIBusController* controller_; 117 MockIBusController* controller_;
118 MockCandidateWindowController* candidate_window_controller_; 118 MockCandidateWindowController* candidate_window_controller_;
119 MockIBusDaemonController* mock_ibus_daemon_controller_; 119 MockIBusDaemonController* mock_ibus_daemon_controller_;
120 MockIBusInputContextClient* mock_ibus_input_context_client_; 120 MockIBusInputContextClient* mock_ibus_input_context_client_;
121 MockIBusClient* mock_ibus_client_; 121 MockIBusClient* mock_ibus_client_;
122 MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_; 122 MockDBusThreadManagerWithoutGMock* mock_dbus_thread_manager_;
123 MockXKeyboard* xkeyboard_; 123 MockXKeyboard* xkeyboard_;
124 MessageLoop message_loop_; 124 MessageLoop message_loop_;
125 MockComponentExtIMEManagerDelegate* mock_delegate_; 125 MockComponentExtIMEManagerDelegate* mock_delegate_;
126 std::vector<ComponentExtensionIME> ime_list_; 126 std::vector<ComponentExtensionIME> ime_list_;
(...skipping 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after
1194 EXPECT_EQ(2U, manager_->GetNumActiveInputMethods()); 1194 EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
1195 EXPECT_EQ(1, controller_->change_input_method_count_); 1195 EXPECT_EQ(1, controller_->change_input_method_count_);
1196 EXPECT_EQ(ext_id1, controller_->change_input_method_id_); 1196 EXPECT_EQ(ext_id1, controller_->change_input_method_id_);
1197 manager_->ChangeInputMethod(ext_id2); 1197 manager_->ChangeInputMethod(ext_id2);
1198 EXPECT_EQ(2, controller_->change_input_method_count_); 1198 EXPECT_EQ(2, controller_->change_input_method_count_);
1199 EXPECT_EQ(ext_id2, controller_->change_input_method_id_); 1199 EXPECT_EQ(ext_id2, controller_->change_input_method_id_);
1200 } 1200 }
1201 1201
1202 } // namespace input_method 1202 } // namespace input_method
1203 } // namespace chromeos 1203 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698