Index: dbus/message_unittest.cc |
diff --git a/dbus/message_unittest.cc b/dbus/message_unittest.cc |
index 1e6d6684a45d9453aacedd6a58bddda4e8b9588b..1455c55151fb28a8f83c2fd8d5b83d537de911ac 100644 |
--- a/dbus/message_unittest.cc |
+++ b/dbus/message_unittest.cc |
@@ -7,6 +7,7 @@ |
#include "base/basictypes.h" |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
+#include "dbus/object_path.h" |
#include "dbus/test_proto.pb.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -62,7 +63,7 @@ TEST(MessageTest, AppendAndPopBasicDataTypes) { |
uint64 uint64_value = 0; |
double double_value = 0; |
std::string string_value; |
- std::string object_path_value; |
+ dbus::ObjectPath object_path_value; |
dbus::MessageReader reader(message.get()); |
ASSERT_TRUE(reader.HasMoreData()); |
@@ -90,7 +91,7 @@ TEST(MessageTest, AppendAndPopBasicDataTypes) { |
EXPECT_EQ(7U, uint64_value); |
EXPECT_DOUBLE_EQ(8.0, double_value); |
EXPECT_EQ("string", string_value); |
- EXPECT_EQ("/object/path", object_path_value); |
+ EXPECT_EQ("/object/path", object_path_value.value()); |
} |
// Check all variant types can be properly written and read. |
@@ -121,7 +122,7 @@ TEST(MessageTest, AppendAndPopVariantDataTypes) { |
uint64 uint64_value = 0; |
double double_value = 0; |
std::string string_value; |
- std::string object_path_value; |
+ dbus::ObjectPath object_path_value; |
dbus::MessageReader reader(message.get()); |
ASSERT_TRUE(reader.HasMoreData()); |
@@ -149,7 +150,7 @@ TEST(MessageTest, AppendAndPopVariantDataTypes) { |
EXPECT_EQ(7U, uint64_value); |
EXPECT_DOUBLE_EQ(8.0, double_value); |
EXPECT_EQ("string", string_value); |
- EXPECT_EQ("/object/path", object_path_value); |
+ EXPECT_EQ("/object/path", object_path_value.value()); |
} |
TEST(MessageTest, ArrayOfBytes) { |
@@ -211,20 +212,20 @@ TEST(MessageTest, ArrayOfStrings) { |
TEST(MessageTest, ArrayOfObjectPaths) { |
scoped_ptr<dbus::Response> message(dbus::Response::CreateEmpty()); |
dbus::MessageWriter writer(message.get()); |
- std::vector<std::string> object_paths; |
+ std::vector<dbus::ObjectPath> object_paths; |
object_paths.push_back("/object/path/1"); |
object_paths.push_back("/object/path/2"); |
object_paths.push_back("/object/path/3"); |
writer.AppendArrayOfObjectPaths(object_paths); |
dbus::MessageReader reader(message.get()); |
- std::vector<std::string> output_object_paths; |
+ std::vector<dbus::ObjectPath> 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]); |
+ EXPECT_EQ("/object/path/1", output_object_paths[0].value()); |
+ EXPECT_EQ("/object/path/2", output_object_paths[1].value()); |
+ EXPECT_EQ("/object/path/3", output_object_paths[2].value()); |
} |
TEST(MessageTest, ProtoBuf) { |
@@ -513,7 +514,7 @@ TEST(MessageTest, GetAndSetHeaders) { |
scoped_ptr<dbus::Response> message(dbus::Response::CreateEmpty()); |
EXPECT_EQ("", message->GetDestination()); |
- EXPECT_EQ("", message->GetPath()); |
+ EXPECT_EQ("", message->GetPath().value()); |
EXPECT_EQ("", message->GetInterface()); |
EXPECT_EQ("", message->GetMember()); |
EXPECT_EQ("", message->GetErrorName()); |
@@ -531,7 +532,7 @@ TEST(MessageTest, GetAndSetHeaders) { |
message->SetReplySerial(456); |
EXPECT_EQ("org.chromium.destination", message->GetDestination()); |
- EXPECT_EQ("/org/chromium/path", message->GetPath()); |
+ EXPECT_EQ("/org/chromium/path", message->GetPath().value()); |
EXPECT_EQ("org.chromium.interface", message->GetInterface()); |
EXPECT_EQ("member", message->GetMember()); |
EXPECT_EQ("org.chromium.error", message->GetErrorName()); |