Extends IBusObject.

chromeos/dbus/ibus/ibus_object_unittest.cc

Index: chromeos/dbus/ibus/ibus_object_unittest.cc
diff --git a/chromeos/dbus/ibus/ibus_object_unittest.cc b/chromeos/dbus/ibus/ibus_object_unittest.cc
index c12fac68ca1f88fda7ab2e896b345f543e83e36f..feb16813dc610cae4b828094807a0ea3850696de 100644
--- a/chromeos/dbus/ibus/ibus_object_unittest.cc
+++ b/chromeos/dbus/ibus/ibus_object_unittest.cc
@@ -13,6 +13,9 @@
 
 namespace chromeos {
 
+// TODO(nona): Remove after complete libibus removal.
+using chromeos::ibus::IBusText;

[satorux1, 2012/05/21 19:58:14]

use ibus namespace here too.

[Seigo Nonaka, 2012/05/21 20:12:00]

Done.

+
 TEST(IBusObjectTest, WriteReadTest) {
   scoped_ptr<dbus::Response> message(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(message.get());
@@ -51,22 +54,22 @@ TEST(IBusObjectTest, WriteReadTest) {
   ASSERT_TRUE(ibus_object_reader.PopString(&expected_string));
   EXPECT_EQ(kSampleText1, expected_string);
   // Check the second uint32 value.
-  uint32 expected_uint32;
+  uint32 expected_uint32 = 0UL;
   ASSERT_TRUE(ibus_object_reader.PopUint32(&expected_uint32));
   EXPECT_EQ(kSampleUint32, expected_uint32);
   // Check the third int value.
-  int32 expected_int32;
+  int32 expected_int32 = 0;
   ASSERT_TRUE(ibus_object_reader.PopInt32(&expected_int32));
   EXPECT_EQ(kSampleInt32, expected_int32);
   // Check the fourth boolean value.
-  bool expected_bool;
+  bool expected_bool = true;
   ASSERT_TRUE(ibus_object_reader.PopBool(&expected_bool));
   EXPECT_EQ(kSampleBool, expected_bool);
   // Check the fifth value which is array of uint32.
   dbus::MessageReader array_reader(NULL);
   ASSERT_TRUE(ibus_object_reader.PopArray(&array_reader));
   for (uint32 i = 0; i < kSampleArrayOfUint32Count; ++i) {
-    uint32 expected_uint32;
+    uint32 expected_uint32 = 0;
     ASSERT_TRUE(array_reader.PopUint32(&expected_uint32));
     EXPECT_EQ(i, expected_uint32);
   }
@@ -99,48 +102,59 @@ TEST(IBusObjectTest, EmptyEntryTest) {
   EXPECT_FALSE(ibus_object_reader.HasMoreData());
 }
 
-TEST(IBusObjctTest, WriteWithGetContentsWriterTest) {
-  const char kSampleTypeName[] = "IBusObject Name";
-  const char kSampleText[] = "Sample Text 1";
+TEST(IBusObjectTest, PopAppendIBusTextTest) {
+  const char kSampleTypeName[] = "Empty IBusObject Name";
+  const char kSampleString[] = "Sapmle String";
+  IBusText::SelectionAttribute selection_attribute;
+  selection_attribute.start_index = 0UL;
+  selection_attribute.end_index = 10UL;
   scoped_ptr<dbus::Response> message(dbus::Response::CreateEmpty());
 
-  // Write string by writer given by GetContentsWriter.
+  // Write IBusText.
   dbus::MessageWriter writer(message.get());
-  IBusObjectWriter ibus_object_writer(kSampleTypeName, "s", &writer);
-  dbus::MessageWriter* contents_writer = ibus_object_writer.GetContentsWriter();
-  ASSERT_TRUE(contents_writer);
-  contents_writer->AppendString(kSampleText);
+  IBusObjectWriter ibus_object_writer(kSampleTypeName, "v", &writer);
+  IBusText ibus_text;
+  ibus_text.mutable_selection_attributes()->push_back(selection_attribute);
+  ibus_text.set_text(kSampleString);
+  ibus_object_writer.AppendIBusText(ibus_text);
   ibus_object_writer.CloseAll();
 
-  // Read by IBusObjectReader to make sure string exists in same field.
+  // Read IBusText;
   dbus::MessageReader reader(message.get());
   IBusObjectReader ibus_object_reader(kSampleTypeName, &reader);
+  IBusText result_text;
   ASSERT_TRUE(ibus_object_reader.Init());
-  std::string actual_value;
-  ASSERT_TRUE(ibus_object_reader.PopString(&actual_value));
-  EXPECT_EQ(kSampleText, actual_value);
+  ASSERT_TRUE(ibus_object_reader.PopIBusText(&result_text));
+  EXPECT_FALSE(ibus_object_reader.HasMoreData());
+  EXPECT_EQ(kSampleString, result_text.text());
+  const std::vector<IBusText::SelectionAttribute>& selection_attributes =
+      result_text.selection_attributes();
+  ASSERT_EQ(1UL, selection_attributes.size());
+  EXPECT_EQ(selection_attribute.start_index,
+            selection_attributes[0].start_index);
+  EXPECT_EQ(selection_attribute.end_index,
+            selection_attributes[0].end_index);
 }
 
-TEST(IBusObjctTest, ReadWithGetContentsReaderTest) {
-  const char kSampleTypeName[] = "IBusObject Name";
-  const char kSampleText[] = "Sample Text 1";
+TEST(IBusObjectTest, PopAppendStringAsIBusText) {
+  const char kSampleTypeName[] = "Empty IBusObject Name";
+  const char kSampleString[] = "Sapmle String";
   scoped_ptr<dbus::Response> message(dbus::Response::CreateEmpty());
 
-  // Write string by IBusObject.
+  // Write string as IBusText.
   dbus::MessageWriter writer(message.get());
-  IBusObjectWriter ibus_object_writer(kSampleTypeName, "s", &writer);
-  ibus_object_writer.AppendString(kSampleText);
+  IBusObjectWriter ibus_object_writer(kSampleTypeName, "v", &writer);
+  ibus_object_writer.AppendStringAsIBusText(kSampleString);
   ibus_object_writer.CloseAll();
 
-  // Read string by reader given by GetContentsReader.
+  // Read string from IBusText;
   dbus::MessageReader reader(message.get());
   IBusObjectReader ibus_object_reader(kSampleTypeName, &reader);
+  std::string result_str;
   ASSERT_TRUE(ibus_object_reader.Init());
-  dbus::MessageReader* contents_reader = ibus_object_reader.GetContentsReader();
-  ASSERT_TRUE(contents_reader);
-  std::string actual_value;
-  ASSERT_TRUE(contents_reader->PopString(&actual_value));
-  EXPECT_EQ(kSampleText, actual_value);
+  ASSERT_TRUE(ibus_object_reader.PopStringFromIBusText(&result_str));
+  EXPECT_FALSE(ibus_object_reader.HasMoreData());
+  EXPECT_EQ(kSampleString, result_str);
 }
 
 }  // namespace chromeos