Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: dbus/message_unittest.cc

Issue 7453041: Fix linux build break (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "dbus/message.h"
6
7 #include "base/basictypes.h"
5 #include "base/logging.h" 8 #include "base/logging.h"
6 #include "dbus/message.h"
7 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
8 10
9 // Test that a byte can be properly written and read. We only have this 11 // Test that a byte can be properly written and read. We only have this
10 // test for byte, as repeating this for other basic types is too redundant. 12 // test for byte, as repeating this for other basic types is too redundant.
11 TEST(MessageTest, AppendAndPopByte) { 13 TEST(MessageTest, AppendAndPopByte) {
12 dbus::Message message; 14 dbus::Message message;
13 message.reset_raw_message(dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_CALL)); 15 message.reset_raw_message(dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_CALL));
14 dbus::MessageWriter writer(&message); 16 dbus::MessageWriter writer(&message);
15 writer.AppendByte(123); // The input is 123. 17 writer.AppendByte(123); // The input is 123.
16 18
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 array_writer.OpenVariant("a{sx}", &variant_writer); 247 array_writer.OpenVariant("a{sx}", &variant_writer);
246 { 248 {
247 // Opens an array of string-to-int64 dict entries. 249 // Opens an array of string-to-int64 dict entries.
248 dbus::MessageWriter dict_array_writer(&message); 250 dbus::MessageWriter dict_array_writer(&message);
249 variant_writer.OpenArray("{sx}", &dict_array_writer); 251 variant_writer.OpenArray("{sx}", &dict_array_writer);
250 { 252 {
251 // Opens a string-to-int64 dict entries. 253 // Opens a string-to-int64 dict entries.
252 dbus::MessageWriter dict_entry_writer(&message); 254 dbus::MessageWriter dict_entry_writer(&message);
253 dict_array_writer.OpenDictEntry(&dict_entry_writer); 255 dict_array_writer.OpenDictEntry(&dict_entry_writer);
254 dict_entry_writer.AppendString("foo"); 256 dict_entry_writer.AppendString("foo");
255 dict_entry_writer.AppendInt64(1234567890123456789); 257 dict_entry_writer.AppendInt64(GG_INT64_C(1234567890123456789));
256 dict_array_writer.CloseContainer(&dict_entry_writer); 258 dict_array_writer.CloseContainer(&dict_entry_writer);
257 } 259 }
258 variant_writer.CloseContainer(&dict_array_writer); 260 variant_writer.CloseContainer(&dict_array_writer);
259 } 261 }
260 array_writer.CloseContainer(&variant_writer); 262 array_writer.CloseContainer(&variant_writer);
261 } 263 }
262 } 264 }
263 writer.CloseContainer(&array_writer); 265 writer.CloseContainer(&array_writer);
264 } 266 }
265 // What we have created looks like this: 267 // What we have created looks like this:
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 dbus::MessageReader dict_array_reader(&message); 317 dbus::MessageReader dict_array_reader(&message);
316 ASSERT_TRUE(variant_reader.PopArray(&dict_array_reader)); 318 ASSERT_TRUE(variant_reader.PopArray(&dict_array_reader));
317 { 319 {
318 dbus::MessageReader dict_entry_reader(&message); 320 dbus::MessageReader dict_entry_reader(&message);
319 ASSERT_TRUE(dict_array_reader.PopDictEntry(&dict_entry_reader)); 321 ASSERT_TRUE(dict_array_reader.PopDictEntry(&dict_entry_reader));
320 std::string string_value; 322 std::string string_value;
321 ASSERT_TRUE(dict_entry_reader.PopString(&string_value)); 323 ASSERT_TRUE(dict_entry_reader.PopString(&string_value));
322 EXPECT_EQ("foo", string_value); 324 EXPECT_EQ("foo", string_value);
323 int64 int64_value = 0; 325 int64 int64_value = 0;
324 ASSERT_TRUE(dict_entry_reader.PopInt64(&int64_value)); 326 ASSERT_TRUE(dict_entry_reader.PopInt64(&int64_value));
325 EXPECT_EQ(1234567890123456789, int64_value); 327 EXPECT_EQ(GG_INT64_C(1234567890123456789), int64_value);
326 } 328 }
327 ASSERT_FALSE(dict_array_reader.HasMoreData()); 329 ASSERT_FALSE(dict_array_reader.HasMoreData());
328 } 330 }
329 ASSERT_FALSE(variant_reader.HasMoreData()); 331 ASSERT_FALSE(variant_reader.HasMoreData());
330 } 332 }
331 ASSERT_FALSE(array_reader.HasMoreData()); 333 ASSERT_FALSE(array_reader.HasMoreData());
332 ASSERT_FALSE(reader.HasMoreData()); 334 ASSERT_FALSE(reader.HasMoreData());
333 } 335 }
334 336
335 TEST(MessageTest, Message) { 337 TEST(MessageTest, Message) {
(...skipping 27 matching lines...) Expand all
363 EXPECT_TRUE(response.raw_message() == NULL); 365 EXPECT_TRUE(response.raw_message() == NULL);
364 response.reset_raw_message( 366 response.reset_raw_message(
365 dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN)); 367 dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN));
366 EXPECT_EQ(dbus::Message::MESSAGE_METHOD_RETURN, response.GetMessageType()); 368 EXPECT_EQ(dbus::Message::MESSAGE_METHOD_RETURN, response.GetMessageType());
367 } 369 }
368 370
369 TEST(MessageTest, ToString_EmptyMessage) { 371 TEST(MessageTest, ToString_EmptyMessage) {
370 dbus::Message message; 372 dbus::Message message;
371 EXPECT_EQ("", message.ToString()); 373 EXPECT_EQ("", message.ToString());
372 } 374 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698