summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus/ibus
diff options
context:
space:
mode:
authornona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-15 07:41:38 +0000
committernona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-15 07:41:38 +0000
commit400d3153e3d7a5d7ba120863de0ce3662a886962 (patch)
tree989d326d6311b67d11a1855b5010fc7483c09a51 /chromeos/dbus/ibus
parent4b4047c454eae7472e5274aa7d0a40a9bae5ab7d (diff)
downloadchromium_src-400d3153e3d7a5d7ba120863de0ce3662a886962.zip
chromium_src-400d3153e3d7a5d7ba120863de0ce3662a886962.tar.gz
chromium_src-400d3153e3d7a5d7ba120863de0ce3662a886962.tar.bz2
Introduce MockDBusThreadManagerWithoutGMock.
The reason for introducing this class is that gmock is banned in some directory like ui/*. Currently each mock object has just a empty implementation. BUG=126947 TEST=chromeos_unittests, unit_tests, aura_shell_unittests, aura_unittests Review URL: https://chromiumcodereview.appspot.com/10536167 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/dbus/ibus')
-rw-r--r--chromeos/dbus/ibus/mock_ibus_client.cc6
-rw-r--r--chromeos/dbus/ibus/mock_ibus_client.h8
-rw-r--r--chromeos/dbus/ibus/mock_ibus_input_context_client.cc69
-rw-r--r--chromeos/dbus/ibus/mock_ibus_input_context_client.h56
4 files changed, 104 insertions, 35 deletions
diff --git a/chromeos/dbus/ibus/mock_ibus_client.cc b/chromeos/dbus/ibus/mock_ibus_client.cc
index e03baee..bf97086 100644
--- a/chromeos/dbus/ibus/mock_ibus_client.cc
+++ b/chromeos/dbus/ibus/mock_ibus_client.cc
@@ -10,4 +10,10 @@ MockIBusClient::MockIBusClient() {}
MockIBusClient::~MockIBusClient() {}
+void MockIBusClient::CreateInputContext(
+ const std::string& client_name,
+ const CreateInputContextCallback& callback,
+ const ErrorCallback& error_callback) {
+}
+
} // namespace chromeos
diff --git a/chromeos/dbus/ibus/mock_ibus_client.h b/chromeos/dbus/ibus/mock_ibus_client.h
index a0ba1ac..756fe22a 100644
--- a/chromeos/dbus/ibus/mock_ibus_client.h
+++ b/chromeos/dbus/ibus/mock_ibus_client.h
@@ -8,7 +8,6 @@
#include <string>
#include "chromeos/dbus/ibus/ibus_client.h"
-#include "testing/gmock/include/gmock/gmock.h"
namespace chromeos {
@@ -17,10 +16,9 @@ class MockIBusClient : public IBusClient {
MockIBusClient();
virtual ~MockIBusClient();
- MOCK_METHOD3(CreateInputContext,
- void(const std::string& client_name,
- const CreateInputContextCallback& callback,
- const ErrorCallback& error_callback));
+ virtual void CreateInputContext(const std::string& client_name,
+ const CreateInputContextCallback& callback,
+ const ErrorCallback& error_callback) OVERRIDE;
};
} // namespace chromeos
diff --git a/chromeos/dbus/ibus/mock_ibus_input_context_client.cc b/chromeos/dbus/ibus/mock_ibus_input_context_client.cc
index 6b0eebf..16b35fe 100644
--- a/chromeos/dbus/ibus/mock_ibus_input_context_client.cc
+++ b/chromeos/dbus/ibus/mock_ibus_input_context_client.cc
@@ -10,4 +10,73 @@ MockIBusInputContextClient::MockIBusInputContextClient() {}
MockIBusInputContextClient::~MockIBusInputContextClient() {}
+void MockIBusInputContextClient::Initialize(
+ dbus::Bus* bus, const dbus::ObjectPath& object_path) {
+}
+
+void MockIBusInputContextClient::ResetObjectProxy() {
+}
+
+bool MockIBusInputContextClient::IsConnected() const {
+ return true;
+}
+
+void MockIBusInputContextClient::SetCommitTextHandler(
+ const CommitTextHandler& commit_text_handler) {
+}
+
+void MockIBusInputContextClient::SetForwardKeyEventHandler(
+ const ForwardKeyEventHandler& forward_key_event_handler) {
+}
+
+void MockIBusInputContextClient::SetUpdatePreeditTextHandler(
+ const UpdatePreeditTextHandler& update_preedit_text_handler) {
+}
+
+void MockIBusInputContextClient::SetShowPreeditTextHandler(
+ const ShowPreeditTextHandler& show_preedit_text_handler) {
+}
+
+void MockIBusInputContextClient::SetHidePreeditTextHandler(
+ const HidePreeditTextHandler& hide_preedit_text_handler) {
+}
+
+void MockIBusInputContextClient::UnsetCommitTextHandler() {
+}
+
+void MockIBusInputContextClient::UnsetForwardKeyEventHandler() {
+}
+
+void MockIBusInputContextClient::UnsetUpdatePreeditTextHandler() {
+}
+
+void MockIBusInputContextClient::UnsetShowPreeditTextHandler() {
+}
+
+void MockIBusInputContextClient::UnsetHidePreeditTextHandler() {
+}
+
+void MockIBusInputContextClient::SetCapabilities(uint32 capabilities) {
+}
+
+void MockIBusInputContextClient::FocusIn() {
+}
+
+void MockIBusInputContextClient::FocusOut() {
+}
+
+void MockIBusInputContextClient::Reset() {
+}
+
+void MockIBusInputContextClient::SetCursorLocation(
+ int32 x, int32 y, int32 w, int32 h) {
+}
+
+void MockIBusInputContextClient::ProcessKeyEvent(
+ uint32 keyval,
+ uint32 keycode,
+ uint32 state,
+ const ProcessKeyEventCallback& callback) {
+}
+
} // namespace chromeos
diff --git a/chromeos/dbus/ibus/mock_ibus_input_context_client.h b/chromeos/dbus/ibus/mock_ibus_input_context_client.h
index e3199b5..1e2a58c 100644
--- a/chromeos/dbus/ibus/mock_ibus_input_context_client.h
+++ b/chromeos/dbus/ibus/mock_ibus_input_context_client.h
@@ -6,7 +6,6 @@
#define CHROMEOS_DBUS_IBUS_MOCK_IBUS_INPUT_CONTEXT_CLIENT_H_
#include "chromeos/dbus/ibus/ibus_input_context_client.h"
-#include "testing/gmock/include/gmock/gmock.h"
namespace chromeos {
class MockIBusInputContextClient : public IBusInputContextClient {
@@ -14,35 +13,32 @@ class MockIBusInputContextClient : public IBusInputContextClient {
MockIBusInputContextClient();
virtual ~MockIBusInputContextClient();
- MOCK_METHOD2(Initialize, void(dbus::Bus* bus,
- const dbus::ObjectPath& object_path));
- MOCK_METHOD0(ResetObjectProxy, void());
- MOCK_CONST_METHOD0(IsConnected, bool());
- MOCK_METHOD1(SetCommitTextHandler,
- void(const CommitTextHandler& commit_text_handler));
- MOCK_METHOD1(SetForwardKeyEventHandler,
- void(const ForwardKeyEventHandler& forward_key_event_handler));
- MOCK_METHOD1(
- SetUpdatePreeditTextHandler,
- void(const UpdatePreeditTextHandler& update_preedit_text_handler));
- MOCK_METHOD1(SetShowPreeditTextHandler,
- void(const ShowPreeditTextHandler& show_preedit_text_handler));
- MOCK_METHOD1(SetHidePreeditTextHandler,
- void(const HidePreeditTextHandler& hide_preedit_text_handler));
- MOCK_METHOD0(UnsetCommitTextHandler, void());
- MOCK_METHOD0(UnsetForwardKeyEventHandler, void());
- MOCK_METHOD0(UnsetUpdatePreeditTextHandler, void());
- MOCK_METHOD0(UnsetShowPreeditTextHandler, void());
- MOCK_METHOD0(UnsetHidePreeditTextHandler, void());
- MOCK_METHOD1(SetCapabilities, void(uint32 capabilities));
- MOCK_METHOD0(FocusIn, void());
- MOCK_METHOD0(FocusOut, void());
- MOCK_METHOD0(Reset, void());
- MOCK_METHOD4(SetCursorLocation, void(int32 x, int32 y, int32 w, int32 h));
- MOCK_METHOD4(ProcessKeyEvent, void(uint32 keyval,
- uint32 keycode,
- uint32 state,
- const ProcessKeyEventCallback& callback));
+ virtual void Initialize(dbus::Bus* bus,
+ const dbus::ObjectPath& object_path) OVERRIDE;
+ virtual void ResetObjectProxy() OVERRIDE;
+ virtual bool IsConnected() const OVERRIDE;
+ virtual void SetCommitTextHandler(
+ const CommitTextHandler& commit_text_handler) OVERRIDE;
+ virtual void SetForwardKeyEventHandler(
+ const ForwardKeyEventHandler& forward_key_event_handler) OVERRIDE;
+ virtual void SetUpdatePreeditTextHandler(
+ const UpdatePreeditTextHandler& update_preedit_text_handler) OVERRIDE;
+ virtual void SetShowPreeditTextHandler(
+ const ShowPreeditTextHandler& show_preedit_text_handler) OVERRIDE;
+ virtual void SetHidePreeditTextHandler(
+ const HidePreeditTextHandler& hide_preedit_text_handler) OVERRIDE;
+ virtual void UnsetCommitTextHandler() OVERRIDE;
+ virtual void UnsetForwardKeyEventHandler() OVERRIDE;
+ virtual void UnsetUpdatePreeditTextHandler() OVERRIDE;
+ virtual void UnsetShowPreeditTextHandler() OVERRIDE;
+ virtual void UnsetHidePreeditTextHandler() OVERRIDE;
+ virtual void SetCapabilities(uint32 capabilities) OVERRIDE;
+ virtual void FocusIn() OVERRIDE;
+ virtual void FocusOut() OVERRIDE;
+ virtual void Reset() OVERRIDE;
+ virtual void SetCursorLocation(int32 x, int32 y, int32 w, int32 h) OVERRIDE;
+ virtual void ProcessKeyEvent(uint32 keyval, uint32 keycode, uint32 state,
+ const ProcessKeyEventCallback& callback) OVERRIDE;
};
} // namespace chromeos