Fix: infolist requries description title.

chromeos/dbus/ibus/ibus_text_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.
 // TODO(nona): Add more tests.
 
 #include "chromeos/dbus/ibus/ibus_text.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 128 matching lines @@
   dbus::MessageReader reader(response.get());
   PopIBusText(&reader, &ibus_text);
 
   // Check values.
   EXPECT_EQ(kSampleText, ibus_text.text());
   EXPECT_EQ(kSampleAnnotationText, ibus_text.annotation());
 }
 
 TEST(IBusTextTest, ReadDescriptionFieldTest) {
   const char kSampleText[] = "Sample Text";
-  const char kSampleDescriptionText[] = "Sample Description";
+  const char kSampleDescriptionTitleText[] = "Sample Description Title";
+  const char kSampleDescriptionBodyText[] = "Sample Description Body";
 
   // Create IBusLookupTable.
   scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(response.get());
   dbus::MessageWriter top_variant_writer(NULL);
   writer.OpenVariant("(sa{sv}sv)", &top_variant_writer);
   dbus::MessageWriter contents_writer(NULL);
   top_variant_writer.OpenStruct(&contents_writer);
   contents_writer.AppendString("IBusText");
 
   // Write attachment field.

[satorux1, 2012/11/08 08:39:30]

Maybe 

// Write attachment fields.

because we have two fields now.

[Seigo Nonaka, 2012/11/12 06:13:11]

Sure will do.
On 2012/11/08 08:39:30, satorux1 wrote:

   dbus::MessageWriter attachment_array_writer(NULL);
   contents_writer.OpenArray("{sv}", &attachment_array_writer);
-  dbus::MessageWriter entry_writer(NULL);
-  attachment_array_writer.OpenDictEntry(&entry_writer);
-  entry_writer.AppendString("description");
-  dbus::MessageWriter variant_writer(NULL);
-  entry_writer.OpenVariant("v", &variant_writer);
-  dbus::MessageWriter sub_variant_writer(NULL);
-  variant_writer.OpenVariant("s", &sub_variant_writer);
-  sub_variant_writer.AppendString(kSampleDescriptionText);
+
+  // Write description title field.
+  dbus::MessageWriter title_entry_writer(NULL);
+  attachment_array_writer.OpenDictEntry(&title_entry_writer);
+  title_entry_writer.AppendString("description_title");
+  dbus::MessageWriter title_variant_writer(NULL);
+  title_entry_writer.OpenVariant("v", &title_variant_writer);
+  dbus::MessageWriter title_sub_variant_writer(NULL);
+  title_variant_writer.OpenVariant("s", &title_sub_variant_writer);
+  title_sub_variant_writer.AppendString(kSampleDescriptionTitleText);
+  title_variant_writer.CloseContainer(&title_sub_variant_writer);
+  title_entry_writer.CloseContainer(&title_variant_writer);
+  attachment_array_writer.CloseContainer(&title_entry_writer);
+
+  // Write description body field.
+  dbus::MessageWriter body_entry_writer(NULL);
+  attachment_array_writer.OpenDictEntry(&body_entry_writer);
+  body_entry_writer.AppendString("description_body");
+  dbus::MessageWriter body_variant_writer(NULL);
+  body_entry_writer.OpenVariant("v", &body_variant_writer);
+  dbus::MessageWriter body_sub_variant_writer(NULL);
+  body_variant_writer.OpenVariant("s", &body_sub_variant_writer);
+  body_sub_variant_writer.AppendString(kSampleDescriptionBodyText);
+  body_variant_writer.CloseContainer(&body_sub_variant_writer);
+  body_entry_writer.CloseContainer(&body_variant_writer);
+  attachment_array_writer.CloseContainer(&body_entry_writer);

[satorux1, 2012/11/08 08:39:30]

Hmm, adding an attachment field seems to be a lot of code. Can you write a
helper function to do this? The function can be used elsewhere in the test.

[Seigo Nonaka, 2012/11/12 06:13:11]

Sure, and I found that we need supporting writing attachment fields for some
reasons: infolist or annotation support for Extension IME API.
So let me pending this CL until http://codereview.chromium.org/11361210/
landing.

Thanks.
On 2012/11/08 08:39:30, satorux1 wrote:

 
   // Close attachment field container.
-  variant_writer.CloseContainer(&sub_variant_writer);
-  entry_writer.CloseContainer(&variant_writer);
-  attachment_array_writer.CloseContainer(&entry_writer);
   contents_writer.CloseContainer(&attachment_array_writer);
 
   // Write IBusText contents.
   contents_writer.AppendString(kSampleText);
   IBusObjectWriter ibus_attr_list_writer("IBusAttrList", "av",
                                          &contents_writer);
   dbus::MessageWriter attribute_array_writer(NULL);
   ibus_attr_list_writer.OpenArray("v", &attribute_array_writer);
   ibus_attr_list_writer.CloseContainer(&attribute_array_writer);
   ibus_attr_list_writer.CloseAll();
 
   // Close all containers.
   top_variant_writer.CloseContainer(&contents_writer);
   writer.CloseContainer(&top_variant_writer);
 
   // Read IBusText.
   IBusText ibus_text;
   dbus::MessageReader reader(response.get());
   PopIBusText(&reader, &ibus_text);
 
   // Check values.
   EXPECT_EQ(kSampleText, ibus_text.text());
-  EXPECT_EQ(kSampleDescriptionText, ibus_text.description());
+  EXPECT_EQ(kSampleDescriptionTitleText, ibus_text.description_title());
+  EXPECT_EQ(kSampleDescriptionBodyText, ibus_text.description_body());
 }
 
 }  // namespace ibus
 }  // namespace chromeos