Adding support for sending/receiving proto bufs to dbus library.

dbus/message_unittest.cc

 // Copyright (c) 2011 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 "dbus/message.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
+#include "dbus/test_proto.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Test that a byte can be properly written and read. We only have this
 // test for byte, as repeating this for other basic types is too redundant.
 TEST(MessageTest, AppendAndPopByte) {
   scoped_ptr<dbus::Response> message(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(message.get());
   writer.AppendByte(123);  // The input is 123.
 
   dbus::MessageReader reader(message.get());
@@ skipping 199 matching lines @@
   dbus::MessageReader reader(message.get());
   std::vector<std::string> output_object_paths;
   ASSERT_TRUE(reader.PopArrayOfObjectPaths(&output_object_paths));
   ASSERT_FALSE(reader.HasMoreData());
   ASSERT_EQ(3U, output_object_paths.size());
   EXPECT_EQ("/object/path/1", output_object_paths[0]);
   EXPECT_EQ("/object/path/2", output_object_paths[1]);
   EXPECT_EQ("/object/path/3", output_object_paths[2]);
 }
 
+TEST(MessageTest, ProtoBuf) {
+  scoped_ptr<dbus::Response> message(dbus::Response::CreateEmpty());
+  dbus::MessageWriter writer(message.get());
+  TestProto send_message;
+  send_message.set_text("testing");

[satorux1, 2012/02/01 19:14:57]

To make test a little more interesting, could you add one more field, like
set_int(123) ?

[rharrison, 2012/02/01 21:33:21]

Done.

+  writer.AppendProtoAsArrayOfBytes(send_message);
+
+  dbus::MessageReader reader(message.get());
+  TestProto receive_message;
+  ASSERT_TRUE(reader.PopArrayOfBytesAsProto(&receive_message));
+  EXPECT_EQ(receive_message.text(), send_message.text());

[satorux1, 2012/02/01 19:14:57]

Rather than comparing a field, it'be better to compare the whole message, like

EXPECT_EQ(receive_message.DebugString(), send_message.DebugString())

[rharrison, 2012/02/01 21:33:21]

This is not available in MessageLite objects.

+}
+
+
 // Test that an array can be properly written and read. We only have this
 // test for array, as repeating this for other container types is too
 // redundant.
 TEST(MessageTest, OpenArrayAndPopArray) {
   scoped_ptr<dbus::Response> message(dbus::Response::CreateEmpty());
   dbus::MessageWriter writer(message.get());
   dbus::MessageWriter array_writer(message.get());
   writer.OpenArray("s", &array_writer);  // Open an array of strings.
   array_writer.AppendString("foo");
   array_writer.AppendString("bar");
@@ skipping 276 matching lines @@
 
   EXPECT_EQ("org.chromium.destination", message->GetDestination());
   EXPECT_EQ("/org/chromium/path", message->GetPath());
   EXPECT_EQ("org.chromium.interface", message->GetInterface());
   EXPECT_EQ("member", message->GetMember());
   EXPECT_EQ("org.chromium.error", message->GetErrorName());
   EXPECT_EQ(":1.2", message->GetSender());
   EXPECT_EQ(123U, message->GetSerial());
   EXPECT_EQ(456U, message->GetReplySerial());
 }