Change UpdateProperties to UpdateProperty

chromeos/dbus/ibus/ibus_panel_service_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_panel_service.h"
 
 #include <map>
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/values.h"
@@ skipping 36 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockIBusPanelCandidateWindowHandler);
 };
 
 class MockIBusPanelPropertyHandler : public IBusPanelPropertyHandlerInterface {
  public:
   MockIBusPanelPropertyHandler() {}
   MOCK_METHOD1(RegisterProperties,
                void(const ibus::IBusPropertyList& properties));
-  MOCK_METHOD1(UpdateProperties,
-               void(const ibus::IBusPropertyList& properties));
+  MOCK_METHOD1(UpdateProperty, void(const ibus::IBusProperty& property));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockIBusPanelPropertyHandler);
 };
 
 class MockResponseSender {
  public:
   MOCK_METHOD1(Run, void(dbus::Response* reponse));
 };
 
@@ skipping 107 matching lines @@
     ASSERT_EQ(expected_keys_.size(), properties.size());
     for (size_t i = 0; i < properties.size(); ++i) {
       EXPECT_EQ(expected_keys_[i], properties[i]->key());
     }
   }
 
  private:
   const std::vector<std::string> expected_keys_;
 };
 
+// This class is used to verify that a method call which has a Property object.
+// This class verifies a method call has correct argument based on |key|.
+class PropertyVerifier {
+ public:
+  explicit PropertyVerifier(const std::string& key) : key_(key) {}
+
+  // Verifies the given |resposne| has IBusPropertyList.
+  void Verify(const ibus::IBusProperty& property) {
+    EXPECT_EQ(key_, property.key());
+  }
+
+ private:
+  const std::string key_;
+};
+
 }  // namespace
 
 class IBusPanelServiceTest : public testing::Test {
  public:
   IBusPanelServiceTest() {}
 
   virtual void SetUp() OVERRIDE {
     // Create a mock bus.
     dbus::Bus::Options options;
     options.bus_type = dbus::Bus::SYSTEM;
@@ skipping 46 matching lines @@
             Invoke(this, &IBusPanelServiceTest::OnMethodExported));
 
     EXPECT_CALL(*mock_exported_object_, ExportMethod(
         ibus::panel::kServiceInterface,
         ibus::panel::kRegisterPropertiesMethod, _, _))
         .WillRepeatedly(
             Invoke(this, &IBusPanelServiceTest::OnMethodExported));
 
     EXPECT_CALL(*mock_exported_object_, ExportMethod(
         ibus::panel::kServiceInterface,
-        ibus::panel::kUpdatePropertiesMethod, _, _))
+        ibus::panel::kUpdatePropertyMethod, _, _))
         .WillRepeatedly(
             Invoke(this, &IBusPanelServiceTest::OnMethodExported));
 
     // Suppress uninteresting mock function call warning.
     EXPECT_CALL(*mock_bus_.get(),
                 AssertOnOriginThread())
         .WillRepeatedly(Return());
 
     // Create a service
     service_.reset(IBusPanelService::Create(
@@ skipping 278 matching lines @@
                                ibus::panel::kRegisterPropertiesMethod);
   method_call.SetSerial(1UL);
   dbus::MessageWriter writer(&method_call);
   ibus::AppendIBusPropertyList(properties, &writer);
 
   // Call exported function.
   EXPECT_NE(method_callback_map_.find(ibus::panel::kRegisterPropertiesMethod),
             method_callback_map_.end());
   method_callback_map_[ibus::panel::kRegisterPropertiesMethod].Run(
       &method_call,
-      base::Bind(&MockResponseSender::Run,
-                 base::Unretained(&response_sender)));
+      base::Bind(&MockResponseSender::Run, base::Unretained(&response_sender)));
 }
 
-TEST_F(IBusPanelServiceTest, UpdatePropertiesTest) {
+TEST_F(IBusPanelServiceTest, UpdatePropertyTest) {
   // Set expectations.
-  std::vector<std::string> keys;
-  keys.push_back("key1");
-  keys.push_back("key2");
-  keys.push_back("key3");
-  ibus::IBusPropertyList properties;
-  for (size_t i = 0; i < keys.size(); ++i) {
-    ibus::IBusProperty* property = new ibus::IBusProperty;
-    property->set_key(keys[i]);
-    properties.push_back(property);
-  }
+  const char kKey[] = "key";
+  ibus::IBusProperty property;
+  property.set_key(kKey);
 
-  PropertyListVerifier response_expectation(keys);
-  EXPECT_CALL(*property_handler_, UpdateProperties(_))
-      .WillOnce(Invoke(&response_expectation,
-                        &PropertyListVerifier::Verify));
+  PropertyVerifier response_expectation(kKey);
+  EXPECT_CALL(*property_handler_, UpdateProperty(_))
+      .WillOnce(Invoke(&response_expectation, &PropertyVerifier::Verify));
 
   MockResponseSender response_sender;
   EXPECT_CALL(response_sender, Run(_));
 
   // Create method call;
   dbus::MethodCall method_call(ibus::panel::kServiceInterface,
-                               ibus::panel::kUpdatePropertiesMethod);
+                               ibus::panel::kUpdatePropertyMethod);
   method_call.SetSerial(1UL);
   dbus::MessageWriter writer(&method_call);
-  ibus::AppendIBusPropertyList(properties, &writer);
+  ibus::AppendIBusProperty(property, &writer);
 
   // Call exported function.
-  EXPECT_NE(method_callback_map_.find(ibus::panel::kUpdatePropertiesMethod),
+  EXPECT_NE(method_callback_map_.find(ibus::panel::kUpdatePropertyMethod),
             method_callback_map_.end());
-  method_callback_map_[ibus::panel::kUpdatePropertiesMethod].Run(
+  method_callback_map_[ibus::panel::kUpdatePropertyMethod].Run(
       &method_call,
       base::Bind(&MockResponseSender::Run,
                  base::Unretained(&response_sender)));
 }
 
 }  // namespace ibus
 }  // namespace chromeos