Skip to content

GitLab

T
tangled
Commit 8fe7c559 authored by nona@chromium.org's avatar nona@chromium.org
Browse files
Options

Clean Up: Gather all ibus constants to ibus_constants.h 

BUG=None
TEST=ran chromeos_unittests


Review URL: https://chromiumcodereview.appspot.com/10704118

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146052 0039d316-1c4b-4281-b951-d872f2087c98
parent 391b3275
Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 117 deletions
chromeos/dbus/ibus/ibus_client.cc
View file @ 8fe7c559
...@@ -16,14 +16,13 @@ ...@@ -16,14 +16,13 @@
namespace chromeos { namespace chromeos {
namespace { namespace {
const char kIBusBusRegisterComponentMethod[] = "RegisterComponent";
// The IBusClient implementation. // The IBusClient implementation.
class IBusClientImpl : public IBusClient { class IBusClientImpl : public IBusClient {
public: public:
explicit IBusClientImpl(dbus::Bus* bus) explicit IBusClientImpl(dbus::Bus* bus)
: proxy_(bus->GetObjectProxy(kIBusServiceName, : proxy_(bus->GetObjectProxy(ibus::kServiceName,
dbus::ObjectPath(kIBusServicePath))), dbus::ObjectPath(ibus::bus::kServicePath))),
weak_ptr_factory_(this) { weak_ptr_factory_(this) {
} }
...@@ -36,8 +35,8 @@ class IBusClientImpl : public IBusClient { ...@@ -36,8 +35,8 @@ class IBusClientImpl : public IBusClient {
const ErrorCallback& error_callback) OVERRIDE { const ErrorCallback& error_callback) OVERRIDE {
DCHECK(!callback.is_null()); DCHECK(!callback.is_null());
DCHECK(!error_callback.is_null()); DCHECK(!error_callback.is_null());
dbus::MethodCall method_call(kIBusServiceInterface, dbus::MethodCall method_call(ibus::bus::kServiceInterface,
kIBusBusCreateInputContextMethod); ibus::bus::kCreateInputContextMethod);
dbus::MessageWriter writer(&method_call); dbus::MessageWriter writer(&method_call);
writer.AppendString(client_name); writer.AppendString(client_name);
proxy_->CallMethodWithErrorCallback( proxy_->CallMethodWithErrorCallback(
...@@ -59,8 +58,8 @@ class IBusClientImpl : public IBusClient { ...@@ -59,8 +58,8 @@ class IBusClientImpl : public IBusClient {
const ErrorCallback& error_callback) OVERRIDE { const ErrorCallback& error_callback) OVERRIDE {
DCHECK(!callback.is_null()); DCHECK(!callback.is_null());
DCHECK(!error_callback.is_null()); DCHECK(!error_callback.is_null());
dbus::MethodCall method_call(kIBusServiceInterface, dbus::MethodCall method_call(ibus::bus::kServiceInterface,
kIBusBusRegisterComponentMethod); ibus::bus::kRegisterComponentMethod);
dbus::MessageWriter writer(&method_call); dbus::MessageWriter writer(&method_call);
ibus::AppendIBusComponent(ibus_component, &writer); ibus::AppendIBusComponent(ibus_component, &writer);
proxy_->CallMethodWithErrorCallback( proxy_->CallMethodWithErrorCallback(
......
chromeos/dbus/ibus/ibus_client_unittest.cc
View file @ 8fe7c559
...@@ -76,10 +76,12 @@ class IBusClientTest : public testing::Test { ...@@ -76,10 +76,12 @@ class IBusClientTest : public testing::Test {
dbus::Bus::Options options; dbus::Bus::Options options;
mock_bus_ = new dbus::MockBus(options); mock_bus_ = new dbus::MockBus(options);
mock_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(), mock_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(),
kIBusServiceName, ibus::kServiceName,
dbus::ObjectPath(kIBusServicePath)); dbus::ObjectPath(
EXPECT_CALL(*mock_bus_, GetObjectProxy(kIBusServiceName, ibus::bus::kServicePath));
dbus::ObjectPath(kIBusServicePath))) EXPECT_CALL(*mock_bus_, GetObjectProxy(ibus::kServiceName,
dbus::ObjectPath(
ibus::bus::kServicePath)))
.WillOnce(Return(mock_proxy_.get())); .WillOnce(Return(mock_proxy_.get()));
EXPECT_CALL(*mock_bus_, ShutdownAndBlock()); EXPECT_CALL(*mock_bus_, ShutdownAndBlock());
......
chromeos/dbus/ibus/ibus_constants.h
View file @ 8fe7c559
...@@ -2,17 +2,38 @@ ...@@ -2,17 +2,38 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef CHROMEOS_DBUS_IBUS_IBUS_CONST_H_ #ifndef CHROMEOS_DBUS_IBUS_IBUS_CONSTANTS_H_
#define CHROMEOS_DBUS_IBUS_IBUS_CONST_H_ #define CHROMEOS_DBUS_IBUS_IBUS_CONSTANTS_H_
namespace chromeos { namespace chromeos {
const char kIBusServiceName[] = "org.freedesktop.IBus"; namespace ibus {
const char kIBusServicePath[] = "/org/freedesktop/IBus";
const char kIBusServiceInterface[] = "org.freedesktop.IBus";
const char kIBusBusCreateInputContextMethod[] = "CreateInputContext"; const char kServiceName[] = "org.freedesktop.IBus";
namespace bus {
const char kServicePath[] = "/org/freedesktop/IBus";
const char kServiceInterface[] = "org.freedesktop.IBus";
const char kCreateInputContextMethod[] = "CreateInputContext";
const char kRegisterComponentMethod[] = "RegisterComponent";
} // namespace bus
namespace input_context {
const char kServiceInterface[] = "org.freedesktop.IBus.InputContext";
const char kCommitTextSignal[] = "CommitText";
const char kForwardKeyEventSignal[] = "ForwardKeyEvent";
const char kHidePreeditTextSignal[] = "HidePreeditText";
const char kShowPreeditTextSignal[] = "ShowPreeditText";
const char kUpdatePreeditTextSignal[] = "UpdatePreeditText";
const char kFocusInMethod[] = "FocusIn";
const char kFocusOutMethod[] = "FocusOut";
const char kResetMethod[] = "Reset";
const char kSetCapabilitiesMethod[] = "SetCapabilities";
const char kSetCursorLocationMethod[] = "SetCursorLocation";
const char kProcessKeyEventMethod[] = "ProcessKeyEvent";
} // namespace input_context
} // namespace ibus
} // namespace chromeos } // namespace chromeos
#endif // CHROMEOS_DBUS_IBUS_IBUS_CONST_H_ #endif // CHROMEOS_DBUS_IBUS_IBUS_CONSTANTS_H_
chromeos/dbus/ibus/ibus_input_context_client.cc
View file @ 8fe7c559
...@@ -20,22 +20,6 @@ namespace chromeos { ...@@ -20,22 +20,6 @@ namespace chromeos {
using chromeos::ibus::IBusText; using chromeos::ibus::IBusText;
namespace { namespace {
const char kIBusInputContextInterface[] = "org.freedesktop.IBus.InputContext";
// Signal names.
const char kCommitTextSignal[] = "CommitText";
const char kForwardKeyEventSignal[] = "ForwardKeyEvent";
const char kHidePreeditTextSignal[] = "HidePreeditText";
const char kShowPreeditTextSignal[] = "ShowPreeditText";
const char kUpdatePreeditTextSignal[] = "UpdatePreeditText";
// Method names.
const char kFocusInMethod[] = "FocusIn";
const char kFocusOutMethod[] = "FocusOut";
const char kResetMethod[] = "Reset";
const char kSetCapabilitiesMethod[] = "SetCapabilities";
const char kSetCursorLocationMethod[] = "SetCursorLocation";
const char kProcessKeyEventMethod[] = "ProcessKeyEvent";
// The IBusInputContextClient implementation. // The IBusInputContextClient implementation.
class IBusInputContextClientImpl : public IBusInputContextClient { class IBusInputContextClientImpl : public IBusInputContextClient {
...@@ -55,7 +39,7 @@ class IBusInputContextClientImpl : public IBusInputContextClient { ...@@ -55,7 +39,7 @@ class IBusInputContextClientImpl : public IBusInputContextClient {
LOG(ERROR) << "IBusInputContextClient is already initialized."; LOG(ERROR) << "IBusInputContextClient is already initialized.";
return; return;
} }
proxy_ = bus->GetObjectProxy(kIBusServiceName, object_path); proxy_ = bus->GetObjectProxy(ibus::kServiceName, object_path);
ConnectSignals(); ConnectSignals();
} }
...@@ -133,42 +117,47 @@ class IBusInputContextClientImpl : public IBusInputContextClient { ...@@ -133,42 +117,47 @@ class IBusInputContextClientImpl : public IBusInputContextClient {
// IBusInputContextClient override. // IBusInputContextClient override.
virtual void SetCapabilities(uint32 capabilities) OVERRIDE { virtual void SetCapabilities(uint32 capabilities) OVERRIDE {
dbus::MethodCall method_call(kIBusInputContextInterface, dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
kSetCapabilitiesMethod); ibus::input_context::kSetCapabilitiesMethod);
dbus::MessageWriter writer(&method_call); dbus::MessageWriter writer(&method_call);
writer.AppendUint32(capabilities); writer.AppendUint32(capabilities);
CallNoResponseMethod(&method_call, kSetCapabilitiesMethod); CallNoResponseMethod(&method_call,
ibus::input_context::kSetCapabilitiesMethod);
} }
// IBusInputContextClient override. // IBusInputContextClient override.
virtual void FocusIn() OVERRIDE { virtual void FocusIn() OVERRIDE {
dbus::MethodCall method_call(kIBusInputContextInterface, kFocusInMethod); dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
CallNoResponseMethod(&method_call, kFocusInMethod); ibus::input_context::kFocusInMethod);
CallNoResponseMethod(&method_call, ibus::input_context::kFocusInMethod);
} }
// IBusInputContextClient override. // IBusInputContextClient override.
virtual void FocusOut() OVERRIDE { virtual void FocusOut() OVERRIDE {
dbus::MethodCall method_call(kIBusInputContextInterface, kFocusOutMethod); dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
CallNoResponseMethod(&method_call, kFocusOutMethod); ibus::input_context::kFocusOutMethod);
CallNoResponseMethod(&method_call, ibus::input_context::kFocusOutMethod);
} }
// IBusInputContextClient override. // IBusInputContextClient override.
virtual void Reset() OVERRIDE { virtual void Reset() OVERRIDE {
dbus::MethodCall method_call(kIBusInputContextInterface, kResetMethod); dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
CallNoResponseMethod(&method_call, kResetMethod); ibus::input_context::kResetMethod);
CallNoResponseMethod(&method_call, ibus::input_context::kResetMethod);
} }
// IBusInputContextClient override. // IBusInputContextClient override.
virtual void SetCursorLocation(int32 x, int32 y, int32 width, virtual void SetCursorLocation(int32 x, int32 y, int32 width,
int32 height) OVERRIDE { int32 height) OVERRIDE {
dbus::MethodCall method_call(kIBusInputContextInterface, dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
kSetCursorLocationMethod); ibus::input_context::kSetCursorLocationMethod);
dbus::MessageWriter writer(&method_call); dbus::MessageWriter writer(&method_call);
writer.AppendInt32(x); writer.AppendInt32(x);
writer.AppendInt32(y); writer.AppendInt32(y);
writer.AppendInt32(width); writer.AppendInt32(width);
writer.AppendInt32(height); writer.AppendInt32(height);
CallNoResponseMethod(&method_call, kSetCursorLocationMethod); CallNoResponseMethod(&method_call,
ibus::input_context::kSetCursorLocationMethod);
} }
// IBusInputContextClient override. // IBusInputContextClient override.
...@@ -178,8 +167,8 @@ class IBusInputContextClientImpl : public IBusInputContextClient { ...@@ -178,8 +167,8 @@ class IBusInputContextClientImpl : public IBusInputContextClient {
uint32 state, uint32 state,
const ProcessKeyEventCallback& callback, const ProcessKeyEventCallback& callback,
const ErrorCallback& error_callback) OVERRIDE { const ErrorCallback& error_callback) OVERRIDE {
dbus::MethodCall method_call(kIBusInputContextInterface, dbus::MethodCall method_call(ibus::input_context::kServiceInterface,
kProcessKeyEventMethod); ibus::input_context::kProcessKeyEventMethod);
dbus::MessageWriter writer(&method_call); dbus::MessageWriter writer(&method_call);
writer.AppendUint32(keyval); writer.AppendUint32(keyval);
writer.AppendUint32(keycode); writer.AppendUint32(keycode);
...@@ -313,40 +302,40 @@ class IBusInputContextClientImpl : public IBusInputContextClient { ...@@ -313,40 +302,40 @@ class IBusInputContextClientImpl : public IBusInputContextClient {
// Connects signals to signal handlers. // Connects signals to signal handlers.
void ConnectSignals() { void ConnectSignals() {
proxy_->ConnectToSignal( proxy_->ConnectToSignal(
kIBusInputContextInterface, ibus::input_context::kServiceInterface,
kCommitTextSignal, ibus::input_context::kCommitTextSignal,
base::Bind(&IBusInputContextClientImpl::OnCommitText, base::Bind(&IBusInputContextClientImpl::OnCommitText,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),
base::Bind(&IBusInputContextClientImpl::OnSignalConnected, base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
proxy_->ConnectToSignal( proxy_->ConnectToSignal(
kIBusInputContextInterface, ibus::input_context::kServiceInterface,
kForwardKeyEventSignal, ibus::input_context::kForwardKeyEventSignal,
base::Bind(&IBusInputContextClientImpl::OnForwardKeyEvent, base::Bind(&IBusInputContextClientImpl::OnForwardKeyEvent,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),
base::Bind(&IBusInputContextClientImpl::OnSignalConnected, base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
proxy_->ConnectToSignal( proxy_->ConnectToSignal(
kIBusInputContextInterface, ibus::input_context::kServiceInterface,
kUpdatePreeditTextSignal, ibus::input_context::kUpdatePreeditTextSignal,
base::Bind(&IBusInputContextClientImpl::OnUpdatePreeditText, base::Bind(&IBusInputContextClientImpl::OnUpdatePreeditText,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),
base::Bind(&IBusInputContextClientImpl::OnSignalConnected, base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
proxy_->ConnectToSignal( proxy_->ConnectToSignal(
kIBusInputContextInterface, ibus::input_context::kServiceInterface,
kShowPreeditTextSignal, ibus::input_context::kShowPreeditTextSignal,
base::Bind(&IBusInputContextClientImpl::OnShowPreeditText, base::Bind(&IBusInputContextClientImpl::OnShowPreeditText,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),
base::Bind(&IBusInputContextClientImpl::OnSignalConnected, base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
weak_ptr_factory_.GetWeakPtr())); weak_ptr_factory_.GetWeakPtr()));
proxy_->ConnectToSignal( proxy_->ConnectToSignal(
kIBusInputContextInterface, ibus::input_context::kServiceInterface,
kHidePreeditTextSignal, ibus::input_context::kHidePreeditTextSignal,
base::Bind(&IBusInputContextClientImpl::OnHidePreeditText, base::Bind(&IBusInputContextClientImpl::OnHidePreeditText,
weak_ptr_factory_.GetWeakPtr()), weak_ptr_factory_.GetWeakPtr()),
base::Bind(&IBusInputContextClientImpl::OnSignalConnected, base::Bind(&IBusInputContextClientImpl::OnSignalConnected,
......
chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
View file @ 8fe7c559
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <map> #include <map>
#include <string> #include <string>
#include "base/message_loop.h" #include "base/message_loop.h"
#include "chromeos/dbus/ibus/ibus_constants.h"
#include "chromeos/dbus/ibus/ibus_text.h" #include "chromeos/dbus/ibus/ibus_text.h"
#include "dbus/message.h" #include "dbus/message.h"
#include "dbus/mock_bus.h" #include "dbus/mock_bus.h"
...@@ -24,25 +25,8 @@ namespace chromeos { ...@@ -24,25 +25,8 @@ namespace chromeos {
using chromeos::ibus::IBusText; using chromeos::ibus::IBusText;
namespace { namespace {
const char kServiceName[] = "org.freedesktop.IBus";
const char kInputContextInterface[] = "org.freedesktop.IBus.InputContext";
const char kObjectPath[] = "/org/freedesktop/IBus/InputContext_1010"; const char kObjectPath[] = "/org/freedesktop/IBus/InputContext_1010";
// Signal names.
const char kCommitTextSignal[] = "CommitText";
const char kForwardKeyEventSignal[] = "ForwardKeyEvent";
const char kHidePreeditTextSignal[] = "HidePreeditText";
const char kShowPreeditTextSignal[] = "ShowPreeditText";
const char kUpdatePreeditTextSignal[] = "UpdatePreeditText";
// Method names.
const char kFocusInMethod[] = "FocusIn";
const char kFocusOutMethod[] = "FocusOut";
const char kResetMethod[] = "Reset";
const char kSetCapabilitiesMethod[] = "SetCapabilities";
const char kSetCursorLocationMethod[] = "SetCursorLocation";
const char kProcessKeyEventMethod[] = "ProcessKeyEvent";
// Following variables are used in callback expectations. // Following variables are used in callback expectations.
const uint32 kCapabilities = 12345; const uint32 kCapabilities = 12345;
const int32 kCursorX = 30; const int32 kCursorX = 30;
...@@ -109,7 +93,7 @@ class IBusInputContextClientTest : public testing::Test { ...@@ -109,7 +93,7 @@ class IBusInputContextClientTest : public testing::Test {
// Create a mock proxy. // Create a mock proxy.
mock_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(), mock_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(),
kServiceName, ibus::kServiceName,
dbus::ObjectPath(kObjectPath)); dbus::ObjectPath(kObjectPath));
// Create a client. // Create a client.
...@@ -119,7 +103,7 @@ class IBusInputContextClientTest : public testing::Test { ...@@ -119,7 +103,7 @@ class IBusInputContextClientTest : public testing::Test {
// Set an expectation so mock_bus's GetObjectProxy() for the given service // Set an expectation so mock_bus's GetObjectProxy() for the given service
// name and the object path will return mock_proxy_. The GetObjectProxy // name and the object path will return mock_proxy_. The GetObjectProxy
// function is called in Initialized function. // function is called in Initialized function.
EXPECT_CALL(*mock_bus_, GetObjectProxy(kServiceName, EXPECT_CALL(*mock_bus_, GetObjectProxy(ibus::kServiceName,
dbus::ObjectPath(kObjectPath))) dbus::ObjectPath(kObjectPath)))
.WillOnce(Return(mock_proxy_.get())); .WillOnce(Return(mock_proxy_.get()));
...@@ -127,23 +111,28 @@ class IBusInputContextClientTest : public testing::Test { ...@@ -127,23 +111,28 @@ class IBusInputContextClientTest : public testing::Test {
// OnConnectToSignal() to run the callback. The ConnectToSignal is called in // OnConnectToSignal() to run the callback. The ConnectToSignal is called in
// Initialize function. // Initialize function.
EXPECT_CALL(*mock_proxy_, ConnectToSignal( EXPECT_CALL(*mock_proxy_, ConnectToSignal(
kInputContextInterface, kCommitTextSignal, _, _)) ibus::input_context::kServiceInterface,
ibus::input_context::kCommitTextSignal, _, _))
.WillRepeatedly( .WillRepeatedly(
Invoke(this, &IBusInputContextClientTest::OnConnectToSignal)); Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
EXPECT_CALL(*mock_proxy_, ConnectToSignal( EXPECT_CALL(*mock_proxy_, ConnectToSignal(
kInputContextInterface, kForwardKeyEventSignal, _, _)) ibus::input_context::kServiceInterface,
ibus::input_context::kForwardKeyEventSignal, _, _))
.WillRepeatedly( .WillRepeatedly(
Invoke(this, &IBusInputContextClientTest::OnConnectToSignal)); Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
EXPECT_CALL(*mock_proxy_, ConnectToSignal( EXPECT_CALL(*mock_proxy_, ConnectToSignal(
kInputContextInterface, kHidePreeditTextSignal, _, _)) ibus::input_context::kServiceInterface,
ibus::input_context::kHidePreeditTextSignal, _, _))
.WillRepeatedly( .WillRepeatedly(
Invoke(this, &IBusInputContextClientTest::OnConnectToSignal)); Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
EXPECT_CALL(*mock_proxy_, ConnectToSignal( EXPECT_CALL(*mock_proxy_, ConnectToSignal(
kInputContextInterface, kShowPreeditTextSignal, _, _)) ibus::input_context::kServiceInterface,
ibus::input_context::kShowPreeditTextSignal, _, _))
.WillRepeatedly( .WillRepeatedly(
Invoke(this, &IBusInputContextClientTest::OnConnectToSignal)); Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
EXPECT_CALL(*mock_proxy_, ConnectToSignal( EXPECT_CALL(*mock_proxy_, ConnectToSignal(
kInputContextInterface, kUpdatePreeditTextSignal, _, _)) ibus::input_context::kServiceInterface,
ibus::input_context::kUpdatePreeditTextSignal, _, _))
.WillRepeatedly( .WillRepeatedly(
Invoke(this, &IBusInputContextClientTest::OnConnectToSignal)); Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
...@@ -162,8 +151,9 @@ class IBusInputContextClientTest : public testing::Test { ...@@ -162,8 +151,9 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms, int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback, const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) { const dbus::ObjectProxy::ErrorCallback& error_callback) {
EXPECT_EQ(kInputContextInterface, method_call->GetInterface()); EXPECT_EQ(ibus::input_context::kServiceInterface,
EXPECT_EQ(kFocusInMethod, method_call->GetMember()); method_call->GetInterface());
EXPECT_EQ(ibus::input_context::kFocusInMethod, method_call->GetMember());
dbus::MessageReader reader(method_call); dbus::MessageReader reader(method_call);
EXPECT_FALSE(reader.HasMoreData()); EXPECT_FALSE(reader.HasMoreData());
...@@ -175,8 +165,9 @@ class IBusInputContextClientTest : public testing::Test { ...@@ -175,8 +165,9 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms, int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback, const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) { const dbus::ObjectProxy::ErrorCallback& error_callback) {
EXPECT_EQ(kInputContextInterface, method_call->GetInterface()); EXPECT_EQ(ibus::input_context::kServiceInterface,
EXPECT_EQ(kFocusOutMethod, method_call->GetMember()); method_call->GetInterface());
EXPECT_EQ(ibus::input_context::kFocusOutMethod, method_call->GetMember());
dbus::MessageReader reader(method_call); dbus::MessageReader reader(method_call);
EXPECT_FALSE(reader.HasMoreData()); EXPECT_FALSE(reader.HasMoreData());
...@@ -188,8 +179,9 @@ class IBusInputContextClientTest : public testing::Test { ...@@ -188,8 +179,9 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms, int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback, const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) { const dbus::ObjectProxy::ErrorCallback& error_callback) {
EXPECT_EQ(kInputContextInterface, method_call->GetInterface()); EXPECT_EQ(ibus::input_context::kServiceInterface,
EXPECT_EQ(kResetMethod, method_call->GetMember()); method_call->GetInterface());
EXPECT_EQ(ibus::input_context::kResetMethod, method_call->GetMember());
dbus::MessageReader reader(method_call); dbus::MessageReader reader(method_call);
EXPECT_FALSE(reader.HasMoreData()); EXPECT_FALSE(reader.HasMoreData());
...@@ -202,8 +194,10 @@ class IBusInputContextClientTest : public testing::Test { ...@@ -202,8 +194,10 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms, int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback, const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) { const dbus::ObjectProxy::ErrorCallback& error_callback) {
EXPECT_EQ(kInputContextInterface, method_call->GetInterface()); EXPECT_EQ(ibus::input_context::kServiceInterface,
EXPECT_EQ(kSetCursorLocationMethod, method_call->GetMember()); method_call->GetInterface());
EXPECT_EQ(ibus::input_context::kSetCursorLocationMethod,
method_call->GetMember());
dbus::MessageReader reader(method_call); dbus::MessageReader reader(method_call);
int32 x, y, width, height; int32 x, y, width, height;
EXPECT_TRUE(reader.PopInt32(&x)); EXPECT_TRUE(reader.PopInt32(&x));
...@@ -221,8 +215,10 @@ class IBusInputContextClientTest : public testing::Test { ...@@ -221,8 +215,10 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms, int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback, const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) { const dbus::ObjectProxy::ErrorCallback& error_callback) {
EXPECT_EQ(kInputContextInterface, method_call->GetInterface()); EXPECT_EQ(ibus::input_context::kServiceInterface,
EXPECT_EQ(kSetCapabilitiesMethod, method_call->GetMember()); method_call->GetInterface());
EXPECT_EQ(ibus::input_context::kSetCapabilitiesMethod,
method_call->GetMember());
uint32 capabilities; uint32 capabilities;
dbus::MessageReader reader(method_call); dbus::MessageReader reader(method_call);
EXPECT_TRUE(reader.PopUint32(&capabilities)); EXPECT_TRUE(reader.PopUint32(&capabilities));
...@@ -238,8 +234,10 @@ class IBusInputContextClientTest : public testing::Test { ...@@ -238,8 +234,10 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms, int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback, const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) { const dbus::ObjectProxy::ErrorCallback& error_callback) {
EXPECT_EQ(kInputContextInterface, method_call->GetInterface()); EXPECT_EQ(ibus::input_context::kServiceInterface,
EXPECT_EQ(kProcessKeyEventMethod, method_call->GetMember()); method_call->GetInterface());
EXPECT_EQ(ibus::input_context::kProcessKeyEventMethod,
method_call->GetMember());
uint32 keyval, keycode, state; uint32 keyval, keycode, state;
dbus::MessageReader reader(method_call); dbus::MessageReader reader(method_call);
EXPECT_TRUE(reader.PopUint32(&keyval)); EXPECT_TRUE(reader.PopUint32(&keyval));
...@@ -255,8 +253,10 @@ class IBusInputContextClientTest : public testing::Test { ...@@ -255,8 +253,10 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms, int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback, const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) { const dbus::ObjectProxy::ErrorCallback& error_callback) {
EXPECT_EQ(kInputContextInterface, method_call->GetInterface()); EXPECT_EQ(ibus::input_context::kServiceInterface,
EXPECT_EQ(kProcessKeyEventMethod, method_call->GetMember()); method_call->GetInterface());
EXPECT_EQ(ibus::input_context::kProcessKeyEventMethod,
method_call->GetMember());
uint32 keyval, keycode, state; uint32 keyval, keycode, state;
dbus::MessageReader reader(method_call); dbus::MessageReader reader(method_call);
EXPECT_TRUE(reader.PopUint32(&keyval)); EXPECT_TRUE(reader.PopUint32(&keyval));
...@@ -312,15 +312,17 @@ TEST_F(IBusInputContextClientTest, CommitTextHandler) { ...@@ -312,15 +312,17 @@ TEST_F(IBusInputContextClientTest, CommitTextHandler) {
message_loop_.RunAllPending(); message_loop_.RunAllPending();
// Emit signal. // Emit signal.
dbus::Signal signal(kInputContextInterface, kCommitTextSignal); dbus::Signal signal(ibus::input_context::kServiceInterface,
ibus::input_context::kCommitTextSignal);
dbus::MessageWriter writer(&signal); dbus::MessageWriter writer(&signal);
AppendIBusText(ibus_text, &writer); AppendIBusText(ibus_text, &writer);
ASSERT_FALSE(signal_callback_map_[kCommitTextSignal].is_null()); ASSERT_FALSE(
signal_callback_map_[kCommitTextSignal].Run(&signal); signal_callback_map_[ibus::input_context::kCommitTextSignal].is_null());
signal_callback_map_[ibus::input_context::kCommitTextSignal].Run(&signal);
// Unset the handler so expect not calling handler. // Unset the handler so expect not calling handler.
client_->UnsetCommitTextHandler(); client_->UnsetCommitTextHandler();
signal_callback_map_[kCommitTextSignal].Run(&signal); signal_callback_map_[ibus::input_context::kCommitTextSignal].Run(&signal);
} }
TEST_F(IBusInputContextClientTest, ForwardKeyEventHandlerTest) { TEST_F(IBusInputContextClientTest, ForwardKeyEventHandlerTest) {
...@@ -333,17 +335,22 @@ TEST_F(IBusInputContextClientTest, ForwardKeyEventHandlerTest) { ...@@ -333,17 +335,22 @@ TEST_F(IBusInputContextClientTest, ForwardKeyEventHandlerTest) {
message_loop_.RunAllPending(); message_loop_.RunAllPending();
// Emit signal. // Emit signal.
dbus::Signal signal(kInputContextInterface, kForwardKeyEventSignal); dbus::Signal signal(ibus::input_context::kServiceInterface,
ibus::input_context::kForwardKeyEventSignal);
dbus::MessageWriter writer(&signal); dbus::MessageWriter writer(&signal);
writer.AppendUint32(kKeyval); writer.AppendUint32(kKeyval);
writer.AppendUint32(kKeycode); writer.AppendUint32(kKeycode);
writer.AppendUint32(kState); writer.AppendUint32(kState);
ASSERT_FALSE(signal_callback_map_[kForwardKeyEventSignal].is_null()); ASSERT_FALSE(
signal_callback_map_[kForwardKeyEventSignal].Run(&signal); signal_callback_map_[ibus::input_context::kForwardKeyEventSignal]
.is_null());
signal_callback_map_[ibus::input_context::kForwardKeyEventSignal].Run(
&signal);
// Unset the handler so expect not calling handler. // Unset the handler so expect not calling handler.
client_->UnsetForwardKeyEventHandler(); client_->UnsetForwardKeyEventHandler();
signal_callback_map_[kForwardKeyEventSignal].Run(&signal); signal_callback_map_[ibus::input_context::kForwardKeyEventSignal].Run(
&signal);
} }
TEST_F(IBusInputContextClientTest, HidePreeditTextHandlerTest) { TEST_F(IBusInputContextClientTest, HidePreeditTextHandlerTest) {
...@@ -356,13 +363,18 @@ TEST_F(IBusInputContextClientTest, HidePreeditTextHandlerTest) { ...@@ -356,13 +363,18 @@ TEST_F(IBusInputContextClientTest, HidePreeditTextHandlerTest) {
message_loop_.RunAllPending(); message_loop_.RunAllPending();
// Emit signal. // Emit signal.
dbus::Signal signal(kInputContextInterface, kHidePreeditTextSignal); dbus::Signal signal(ibus::input_context::kServiceInterface,
ASSERT_FALSE(signal_callback_map_[kHidePreeditTextSignal].is_null()); ibus::input_context::kHidePreeditTextSignal);
signal_callback_map_[kHidePreeditTextSignal].Run(&signal); ASSERT_FALSE(
signal_callback_map_[ibus::input_context::kHidePreeditTextSignal]
.is_null());
signal_callback_map_[ibus::input_context::kHidePreeditTextSignal].Run(
&signal);
// Unset the handler so expect not calling handler. // Unset the handler so expect not calling handler.
client_->UnsetHidePreeditTextHandler(); client_->UnsetHidePreeditTextHandler();
signal_callback_map_[kHidePreeditTextSignal].Run(&signal); signal_callback_map_[ibus::input_context::kHidePreeditTextSignal].Run(
&signal);
} }
TEST_F(IBusInputContextClientTest, ShowPreeditTextHandlerTest) { TEST_F(IBusInputContextClientTest, ShowPreeditTextHandlerTest) {
...@@ -375,13 +387,18 @@ TEST_F(IBusInputContextClientTest, ShowPreeditTextHandlerTest) { ...@@ -375,13 +387,18 @@ TEST_F(IBusInputContextClientTest, ShowPreeditTextHandlerTest) {
message_loop_.RunAllPending(); message_loop_.RunAllPending();
// Emit signal. // Emit signal.
dbus::Signal signal(kInputContextInterface, kShowPreeditTextSignal); dbus::Signal signal(ibus::input_context::kServiceInterface,
ASSERT_FALSE(signal_callback_map_[kShowPreeditTextSignal].is_null()); ibus::input_context::kShowPreeditTextSignal);
signal_callback_map_[kShowPreeditTextSignal].Run(&signal); ASSERT_FALSE(
signal_callback_map_[ibus::input_context::kShowPreeditTextSignal]
.is_null());
signal_callback_map_[ibus::input_context::kShowPreeditTextSignal].Run(
&signal);
// Unset the handler so expect not calling handler. // Unset the handler so expect not calling handler.
client_->UnsetShowPreeditTextHandler(); client_->UnsetShowPreeditTextHandler();
signal_callback_map_[kShowPreeditTextSignal].Run(&signal); signal_callback_map_[ibus::input_context::kShowPreeditTextSignal].Run(
&signal);
} }
TEST_F(IBusInputContextClientTest, UpdatePreeditTextHandlerTest) { TEST_F(IBusInputContextClientTest, UpdatePreeditTextHandlerTest) {
...@@ -400,17 +417,22 @@ TEST_F(IBusInputContextClientTest, UpdatePreeditTextHandlerTest) { ...@@ -400,17 +417,22 @@ TEST_F(IBusInputContextClientTest, UpdatePreeditTextHandlerTest) {
message_loop_.RunAllPending(); message_loop_.RunAllPending();
// Emit signal. // Emit signal.
dbus::Signal signal(kInputContextInterface, kUpdatePreeditTextSignal); dbus::Signal signal(ibus::input_context::kServiceInterface,
ibus::input_context::kUpdatePreeditTextSignal);
dbus::MessageWriter writer(&signal); dbus::MessageWriter writer(&signal);
AppendIBusText(ibus_text, &writer); AppendIBusText(ibus_text, &writer);
writer.AppendUint32(kCursorPos); writer.AppendUint32(kCursorPos);
writer.AppendBool(kVisible); writer.AppendBool(kVisible);
ASSERT_FALSE(signal_callback_map_[kUpdatePreeditTextSignal].is_null()); ASSERT_FALSE(
signal_callback_map_[kUpdatePreeditTextSignal].Run(&signal); signal_callback_map_[ibus::input_context::kUpdatePreeditTextSignal]
.is_null());
signal_callback_map_[ibus::input_context::kUpdatePreeditTextSignal].Run(
&signal);
// Unset the handler so expect not calling handler. // Unset the handler so expect not calling handler.
client_->UnsetUpdatePreeditTextHandler(); client_->UnsetUpdatePreeditTextHandler();
signal_callback_map_[kUpdatePreeditTextSignal].Run(&signal); signal_callback_map_[ibus::input_context::kUpdatePreeditTextSignal].Run(
&signal);
} }
TEST_F(IBusInputContextClientTest, FocusInTest) { TEST_F(IBusInputContextClientTest, FocusInTest) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment