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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/dbus/ibus/ibus_input_context_client_unittest.cc

Issue 10704118: Clean Up: Gather ibus constants to ibus_constants.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Move constants to ibus_constants.h Created 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/ibus/ibus_input_context_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
diff --git a/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc b/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
index 88f4a5760a5a41e322ff4e7d9ef1b8a10adc6333..b1d2db455b020b0be66d55c91dc487ae1aaf0c4f 100644
--- a/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_input_context_client_unittest.cc
@@ -7,6 +7,7 @@
#include <map>
#include <string>
#include "base/message_loop.h"
+#include "chromeos/dbus/ibus/ibus_constants.h"
#include "chromeos/dbus/ibus/ibus_text.h"
#include "dbus/message.h"
#include "dbus/mock_bus.h"
@@ -24,25 +25,8 @@ namespace chromeos {
using chromeos::ibus::IBusText;
namespace {
-const char kServiceName[] = "org.freedesktop.IBus";
-const char kInputContextInterface[] = "org.freedesktop.IBus.InputContext";
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.
const uint32 kCapabilities = 12345;
const int32 kCursorX = 30;
@@ -109,7 +93,7 @@ class IBusInputContextClientTest : public testing::Test {
// Create a mock proxy.
mock_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(),
- kServiceName,
+ ibus::kServiceName,
dbus::ObjectPath(kObjectPath));
// Create a client.
@@ -119,7 +103,7 @@ class IBusInputContextClientTest : public testing::Test {
// Set an expectation so mock_bus's GetObjectProxy() for the given service
// name and the object path will return mock_proxy_. The GetObjectProxy
// function is called in Initialized function.
- EXPECT_CALL(*mock_bus_, GetObjectProxy(kServiceName,
+ EXPECT_CALL(*mock_bus_, GetObjectProxy(ibus::kServiceName,
dbus::ObjectPath(kObjectPath)))
.WillOnce(Return(mock_proxy_.get()));
@@ -127,23 +111,28 @@ class IBusInputContextClientTest : public testing::Test {
// OnConnectToSignal() to run the callback. The ConnectToSignal is called in
// Initialize function.
EXPECT_CALL(*mock_proxy_, ConnectToSignal(
- kInputContextInterface, kCommitTextSignal, _, _))
+ ibus::input_context::kServiceInterface,
+ ibus::input_context::kCommitTextSignal, _, _))
.WillRepeatedly(
Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
EXPECT_CALL(*mock_proxy_, ConnectToSignal(
- kInputContextInterface, kForwardKeyEventSignal, _, _))
+ ibus::input_context::kServiceInterface,
+ ibus::input_context::kForwardKeyEventSignal, _, _))
.WillRepeatedly(
Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
EXPECT_CALL(*mock_proxy_, ConnectToSignal(
- kInputContextInterface, kHidePreeditTextSignal, _, _))
+ ibus::input_context::kServiceInterface,
+ ibus::input_context::kHidePreeditTextSignal, _, _))
.WillRepeatedly(
Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
EXPECT_CALL(*mock_proxy_, ConnectToSignal(
- kInputContextInterface, kShowPreeditTextSignal, _, _))
+ ibus::input_context::kServiceInterface,
+ ibus::input_context::kShowPreeditTextSignal, _, _))
.WillRepeatedly(
Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
EXPECT_CALL(*mock_proxy_, ConnectToSignal(
- kInputContextInterface, kUpdatePreeditTextSignal, _, _))
+ ibus::input_context::kServiceInterface,
+ ibus::input_context::kUpdatePreeditTextSignal, _, _))
.WillRepeatedly(
Invoke(this, &IBusInputContextClientTest::OnConnectToSignal));
@@ -162,8 +151,9 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) {
- EXPECT_EQ(kInputContextInterface, method_call->GetInterface());
- EXPECT_EQ(kFocusInMethod, method_call->GetMember());
+ EXPECT_EQ(ibus::input_context::kServiceInterface,
+ method_call->GetInterface());
+ EXPECT_EQ(ibus::input_context::kFocusInMethod, method_call->GetMember());
dbus::MessageReader reader(method_call);
EXPECT_FALSE(reader.HasMoreData());
@@ -175,8 +165,9 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) {
- EXPECT_EQ(kInputContextInterface, method_call->GetInterface());
- EXPECT_EQ(kFocusOutMethod, method_call->GetMember());
+ EXPECT_EQ(ibus::input_context::kServiceInterface,
+ method_call->GetInterface());
+ EXPECT_EQ(ibus::input_context::kFocusOutMethod, method_call->GetMember());
dbus::MessageReader reader(method_call);
EXPECT_FALSE(reader.HasMoreData());
@@ -188,8 +179,9 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) {
- EXPECT_EQ(kInputContextInterface, method_call->GetInterface());
- EXPECT_EQ(kResetMethod, method_call->GetMember());
+ EXPECT_EQ(ibus::input_context::kServiceInterface,
+ method_call->GetInterface());
+ EXPECT_EQ(ibus::input_context::kResetMethod, method_call->GetMember());
dbus::MessageReader reader(method_call);
EXPECT_FALSE(reader.HasMoreData());
@@ -202,8 +194,10 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) {
- EXPECT_EQ(kInputContextInterface, method_call->GetInterface());
- EXPECT_EQ(kSetCursorLocationMethod, method_call->GetMember());
+ EXPECT_EQ(ibus::input_context::kServiceInterface,
+ method_call->GetInterface());
+ EXPECT_EQ(ibus::input_context::kSetCursorLocationMethod,
+ method_call->GetMember());
dbus::MessageReader reader(method_call);
int32 x, y, width, height;
EXPECT_TRUE(reader.PopInt32(&x));
@@ -221,8 +215,10 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) {
- EXPECT_EQ(kInputContextInterface, method_call->GetInterface());
- EXPECT_EQ(kSetCapabilitiesMethod, method_call->GetMember());
+ EXPECT_EQ(ibus::input_context::kServiceInterface,
+ method_call->GetInterface());
+ EXPECT_EQ(ibus::input_context::kSetCapabilitiesMethod,
+ method_call->GetMember());
uint32 capabilities;
dbus::MessageReader reader(method_call);
EXPECT_TRUE(reader.PopUint32(&capabilities));
@@ -238,8 +234,10 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) {
- EXPECT_EQ(kInputContextInterface, method_call->GetInterface());
- EXPECT_EQ(kProcessKeyEventMethod, method_call->GetMember());
+ EXPECT_EQ(ibus::input_context::kServiceInterface,
+ method_call->GetInterface());
+ EXPECT_EQ(ibus::input_context::kProcessKeyEventMethod,
+ method_call->GetMember());
uint32 keyval, keycode, state;
dbus::MessageReader reader(method_call);
EXPECT_TRUE(reader.PopUint32(&keyval));
@@ -255,8 +253,10 @@ class IBusInputContextClientTest : public testing::Test {
int timeout_ms,
const dbus::ObjectProxy::ResponseCallback& callback,
const dbus::ObjectProxy::ErrorCallback& error_callback) {
- EXPECT_EQ(kInputContextInterface, method_call->GetInterface());
- EXPECT_EQ(kProcessKeyEventMethod, method_call->GetMember());
+ EXPECT_EQ(ibus::input_context::kServiceInterface,
+ method_call->GetInterface());
+ EXPECT_EQ(ibus::input_context::kProcessKeyEventMethod,
+ method_call->GetMember());
uint32 keyval, keycode, state;
dbus::MessageReader reader(method_call);
EXPECT_TRUE(reader.PopUint32(&keyval));
@@ -312,15 +312,17 @@ TEST_F(IBusInputContextClientTest, CommitTextHandler) {
message_loop_.RunAllPending();
// Emit signal.
- dbus::Signal signal(kInputContextInterface, kCommitTextSignal);
+ dbus::Signal signal(ibus::input_context::kServiceInterface,
+ ibus::input_context::kCommitTextSignal);
dbus::MessageWriter writer(&signal);
AppendIBusText(ibus_text, &writer);
- ASSERT_FALSE(signal_callback_map_[kCommitTextSignal].is_null());
- signal_callback_map_[kCommitTextSignal].Run(&signal);
+ ASSERT_FALSE(
+ 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.
client_->UnsetCommitTextHandler();
- signal_callback_map_[kCommitTextSignal].Run(&signal);
+ signal_callback_map_[ibus::input_context::kCommitTextSignal].Run(&signal);
}
TEST_F(IBusInputContextClientTest, ForwardKeyEventHandlerTest) {
@@ -333,17 +335,22 @@ TEST_F(IBusInputContextClientTest, ForwardKeyEventHandlerTest) {
message_loop_.RunAllPending();
// Emit signal.
- dbus::Signal signal(kInputContextInterface, kForwardKeyEventSignal);
+ dbus::Signal signal(ibus::input_context::kServiceInterface,
+ ibus::input_context::kForwardKeyEventSignal);
dbus::MessageWriter writer(&signal);
writer.AppendUint32(kKeyval);
writer.AppendUint32(kKeycode);
writer.AppendUint32(kState);
- ASSERT_FALSE(signal_callback_map_[kForwardKeyEventSignal].is_null());
- signal_callback_map_[kForwardKeyEventSignal].Run(&signal);
+ ASSERT_FALSE(
+ 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.
client_->UnsetForwardKeyEventHandler();
- signal_callback_map_[kForwardKeyEventSignal].Run(&signal);
+ signal_callback_map_[ibus::input_context::kForwardKeyEventSignal].Run(
+ &signal);
}
TEST_F(IBusInputContextClientTest, HidePreeditTextHandlerTest) {
@@ -356,13 +363,18 @@ TEST_F(IBusInputContextClientTest, HidePreeditTextHandlerTest) {
message_loop_.RunAllPending();
// Emit signal.
- dbus::Signal signal(kInputContextInterface, kHidePreeditTextSignal);
- ASSERT_FALSE(signal_callback_map_[kHidePreeditTextSignal].is_null());
- signal_callback_map_[kHidePreeditTextSignal].Run(&signal);
+ dbus::Signal signal(ibus::input_context::kServiceInterface,
+ ibus::input_context::kHidePreeditTextSignal);
+ 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.
client_->UnsetHidePreeditTextHandler();
- signal_callback_map_[kHidePreeditTextSignal].Run(&signal);
+ signal_callback_map_[ibus::input_context::kHidePreeditTextSignal].Run(
+ &signal);
}
TEST_F(IBusInputContextClientTest, ShowPreeditTextHandlerTest) {
@@ -375,13 +387,18 @@ TEST_F(IBusInputContextClientTest, ShowPreeditTextHandlerTest) {
message_loop_.RunAllPending();
// Emit signal.
- dbus::Signal signal(kInputContextInterface, kShowPreeditTextSignal);
- ASSERT_FALSE(signal_callback_map_[kShowPreeditTextSignal].is_null());
- signal_callback_map_[kShowPreeditTextSignal].Run(&signal);
+ dbus::Signal signal(ibus::input_context::kServiceInterface,
+ ibus::input_context::kShowPreeditTextSignal);
+ 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.
client_->UnsetShowPreeditTextHandler();
- signal_callback_map_[kShowPreeditTextSignal].Run(&signal);
+ signal_callback_map_[ibus::input_context::kShowPreeditTextSignal].Run(
+ &signal);
}
TEST_F(IBusInputContextClientTest, UpdatePreeditTextHandlerTest) {
@@ -400,17 +417,22 @@ TEST_F(IBusInputContextClientTest, UpdatePreeditTextHandlerTest) {
message_loop_.RunAllPending();
// Emit signal.
- dbus::Signal signal(kInputContextInterface, kUpdatePreeditTextSignal);
+ dbus::Signal signal(ibus::input_context::kServiceInterface,
+ ibus::input_context::kUpdatePreeditTextSignal);
dbus::MessageWriter writer(&signal);
AppendIBusText(ibus_text, &writer);
writer.AppendUint32(kCursorPos);
writer.AppendBool(kVisible);
- ASSERT_FALSE(signal_callback_map_[kUpdatePreeditTextSignal].is_null());
- signal_callback_map_[kUpdatePreeditTextSignal].Run(&signal);
+ ASSERT_FALSE(
+ 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.
client_->UnsetUpdatePreeditTextHandler();
- signal_callback_map_[kUpdatePreeditTextSignal].Run(&signal);
+ signal_callback_map_[ibus::input_context::kUpdatePreeditTextSignal].Run(
+ &signal);
}
TEST_F(IBusInputContextClientTest, FocusInTest) {
« no previous file with comments | « chromeos/dbus/ibus/ibus_input_context_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698