Introduce bypass logic for SetCursorLocation message.

chromeos/dbus/ibus/ibus_input_context_client_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
 
 #include <map>
 #include <string>
 #include "base/message_loop.h"
 #include "chromeos/dbus/ibus/ibus_constants.h"
@@ skipping 18 matching lines @@
 
 // Following variables are used in callback expectations.
 const uint32 kCapabilities = 12345;
 const int32 kCursorX = 30;
 const int32 kCursorY = 31;
 const int32 kCursorWidth = 32;
 const int32 kCursorHeight = 33;
 const uint32 kKeyval = 34;
 const uint32 kKeycode = 35;
 const uint32 kState = 36;
+const int32 kCompositionX = 37;
+const int32 kCompositionY = 38;
+const int32 kCompositionWidth = 39;
+const int32 kCompositionHeight = 40;
 const bool kIsKeyHandled = false;
 const char kSurroundingText[] = "Surrounding Text";
 const uint32 kCursorPos = 2;
 const uint32 kAnchorPos = 7;
 const char kPropertyKey[] = "Property Key";
 const ibus::IBusPropertyState kPropertyState =
     ibus::IBUS_PROPERTY_STATE_CHECKED;
 
 class MockInputContextHandler : public IBusInputContextHandlerInterface {
  public:
@@ skipping 18 matching lines @@
 
 MATCHER_P(IBusTextEq, expected_text, "The expected IBusText does not match") {
   // TODO(nona): Check attributes.
   return (arg.text() == expected_text->text());
 }
 
 }  // namespace
 
 class IBusInputContextClientTest : public testing::Test {
  public:
-  IBusInputContextClientTest() : response_(NULL) {}
+  IBusInputContextClientTest()
+      : response_(NULL),
+        on_set_cursor_location_call_count_(0) {}
 
   virtual void SetUp() OVERRIDE {
     // Create a mock bus.
     dbus::Bus::Options options;
     options.bus_type = dbus::Bus::SYSTEM;
     mock_bus_ = new dbus::MockBus(options);
 
     // Create a mock proxy.
     mock_proxy_ = new dbus::MockObjectProxy(mock_bus_.get(),
                                             ibus::kServiceName,
@@ skipping 85 matching lines @@
     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());
 
     message_loop_.PostTask(FROM_HERE, base::Bind(callback, response_));
   }
 
   // Handles SetCursorLocation method call.
-  void OnSetCursorLocation(
-      dbus::MethodCall* method_call,
-      int timeout_ms,
-      const dbus::ObjectProxy::ResponseCallback& callback,
-      const dbus::ObjectProxy::ErrorCallback& error_callback) {
-    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));
-    EXPECT_TRUE(reader.PopInt32(&y));
-    EXPECT_TRUE(reader.PopInt32(&width));
-    EXPECT_TRUE(reader.PopInt32(&height));
-    EXPECT_FALSE(reader.HasMoreData());
-
-    message_loop_.PostTask(FROM_HERE, base::Bind(callback, response_));
+  void OnSetCursorLocation(const ibus::Rect& cursor_location,
+                           const ibus::Rect& composition_head) {
+    ++on_set_cursor_location_call_count_;
   }
 
   // Handles SetCapabilities method call.
   void OnSetCapabilities(
       dbus::MethodCall* method_call,
       int timeout_ms,
       const dbus::ObjectProxy::ResponseCallback& callback,
       const dbus::ObjectProxy::ErrorCallback& error_callback) {
     EXPECT_EQ(ibus::input_context::kServiceInterface,
               method_call->GetInterface());
@@ skipping 106 matching lines @@
   scoped_refptr<dbus::MockBus> mock_bus_;
   // The mock object proxy.
   scoped_refptr<dbus::MockObjectProxy> mock_proxy_;
   // Response returned by mock methods.
   dbus::Response* response_;
   dbus::ErrorResponse* error_response_;
   // A message loop to emulate asynchronous behavior.
   MessageLoop message_loop_;
   // The map from signal to signal handler.
   std::map<std::string, dbus::ObjectProxy::SignalCallback> signal_callback_map_;
+  // Call count of OnSetCursorLocation.
+  int on_set_cursor_location_call_count_;
 
  private:
   // Used to implement the mock proxy.
   void OnConnectToSignal(
       const std::string& interface_name,
       const std::string& signal_name,
       const dbus::ObjectProxy::SignalCallback& signal_callback,
       const dbus::ObjectProxy::OnConnectedCallback& on_connected_callback) {
     signal_callback_map_[signal_name] = signal_callback;
     const bool success = true;
@@ skipping 182 matching lines @@
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // Call SetCapabilities.
   client_->SetCapabilities(kCapabilities);
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 
 TEST_F(IBusInputContextClientTest, SetCursorLocationTest) {
-  // Set expectations.
-  EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
-      .WillOnce(Invoke(this,
-                       &IBusInputContextClientTest::OnSetCursorLocation));
-  // Create response.
-  scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
-  response_ = response.get();
+  on_set_cursor_location_call_count_ = 0;
+  client_->SetSetCursorLocationHandler(
+      base::Bind(&IBusInputContextClientTest::OnSetCursorLocation,
+                 base::Unretained(this)));
+  const ibus::Rect cursor_location(kCursorX,
+                                   kCursorY,
+                                   kCursorWidth,
+                                   kCursorHeight);
+  const ibus::Rect composition_location(kCompositionX,
+                                        kCompositionY,
+                                        kCompositionWidth,
+                                        kCompositionHeight);
+  // Call SetCursorLocation.
+  client_->SetCursorLocation(cursor_location, composition_location);
 
-  // Call SetCursorLocation.
-  client_->SetCursorLocation(kCursorX, kCursorY, kCursorWidth, kCursorHeight);
-  // Run the message loop.
-  message_loop_.RunUntilIdle();
+  EXPECT_EQ(1, on_set_cursor_location_call_count_);
+  client_->UnsetSetCursorLocationHandler();
 }
 
 TEST_F(IBusInputContextClientTest, OnProcessKeyEvent) {
   // Set expectations.
   EXPECT_CALL(*mock_proxy_, CallMethodWithErrorCallback(_, _, _, _))
       .WillOnce(Invoke(this, &IBusInputContextClientTest::OnProcessKeyEvent));
   MockProcessKeyEventHandler callback;
   MockProcessKeyEventErrorHandler error_callback;
 
   EXPECT_CALL(callback, Run(kIsKeyHandled));
@@ skipping 67 matching lines @@
   // Create response.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   response_ = response.get();
 
   // Call SetCursorLocation.
   client_->PropertyActivate(kPropertyKey, kPropertyState);
   // Run the message loop.
   message_loop_.RunUntilIdle();
 }
 }  // namespace chromeos