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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: dbus/values_util_unittest.cc

Issue 16012018: Cleanup: Put DBus unit tests in the dbus namespace, so one does not need to write dbus:: everywhere… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dbus/test_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/values_util_unittest.cc
===================================================================
--- dbus/values_util_unittest.cc (revision 205628)
+++ dbus/values_util_unittest.cc (working copy)
@@ -13,10 +13,12 @@
#include "dbus/message.h"
#include "testing/gtest/include/gtest/gtest.h"
+namespace dbus {
+
TEST(ValuesUtilTest, PopBasicTypes) {
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
+ scoped_ptr<Response> response(Response::CreateEmpty());
// Append basic type values.
- dbus::MessageWriter writer(response.get());
+ MessageWriter writer(response.get());
const uint8 kByteValue = 42;
writer.AppendByte(kByteValue);
const bool kBoolValue = true;
@@ -39,81 +41,81 @@
writer.AppendString(kStringValue);
const std::string kEmptyStringValue;
writer.AppendString(kEmptyStringValue);
- const dbus::ObjectPath kObjectPathValue("/ObjectPath");
+ const ObjectPath kObjectPathValue("/ObjectPath");
writer.AppendObjectPath(kObjectPathValue);
- dbus::MessageReader reader(response.get());
+ MessageReader reader(response.get());
scoped_ptr<base::Value> value;
scoped_ptr<base::Value> expected_value;
// Pop a byte.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kByteValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop a bool.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kBoolValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop an int16.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kInt16Value));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop a uint16.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kUint16Value));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop an int32.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kInt32Value));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop a uint32.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(
new base::FundamentalValue(static_cast<double>(kUint32Value)));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop an int64.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(
new base::FundamentalValue(static_cast<double>(kInt64Value)));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop a uint64.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(
new base::FundamentalValue(static_cast<double>(kUint64Value)));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop a double.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kDoubleValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop a string.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::StringValue(kStringValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop an empty string.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::StringValue(kEmptyStringValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop an object path.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::StringValue(kObjectPathValue.value()));
EXPECT_TRUE(value->Equals(expected_value.get()));
}
TEST(ValuesUtilTest, PopVariant) {
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
+ scoped_ptr<Response> response(Response::CreateEmpty());
// Append variant values.
- dbus::MessageWriter writer(response.get());
+ MessageWriter writer(response.get());
const bool kBoolValue = true;
writer.AppendVariantOfBool(kBoolValue);
const int32 kInt32Value = -45;
@@ -123,26 +125,26 @@
const std::string kStringValue = "fifty";
writer.AppendVariantOfString(kStringValue);
- dbus::MessageReader reader(response.get());
+ MessageReader reader(response.get());
scoped_ptr<base::Value> value;
scoped_ptr<base::Value> expected_value;
// Pop a bool.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kBoolValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop an int32.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kInt32Value));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop a double.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kDoubleValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop a string.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::StringValue(kStringValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
@@ -151,20 +153,20 @@
// Pop extremely large integers which cannot be precisely represented in
// double.
TEST(ValuesUtilTest, PopExtremelyLargeIntegers) {
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
+ scoped_ptr<Response> response(Response::CreateEmpty());
// Append large integers.
- dbus::MessageWriter writer(response.get());
+ MessageWriter writer(response.get());
const int64 kInt64Value = -123456789012345689LL;
writer.AppendInt64(kInt64Value);
const uint64 kUint64Value = 9876543210987654321ULL;
writer.AppendUint64(kUint64Value);
- dbus::MessageReader reader(response.get());
+ MessageReader reader(response.get());
scoped_ptr<base::Value> value;
scoped_ptr<base::Value> expected_value;
double double_value = 0;
// Pop an int64.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(
new base::FundamentalValue(static_cast<double>(kInt64Value)));
@@ -172,7 +174,7 @@
ASSERT_TRUE(value->GetAsDouble(&double_value));
EXPECT_NE(kInt64Value, static_cast<int64>(double_value));
// Pop a uint64.
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(
new base::FundamentalValue(static_cast<double>(kUint64Value)));
@@ -182,10 +184,10 @@
}
TEST(ValuesUtilTest, PopIntArray) {
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
+ scoped_ptr<Response> response(Response::CreateEmpty());
// Append an int32 array.
- dbus::MessageWriter writer(response.get());
- dbus::MessageWriter sub_writer(NULL);
+ MessageWriter writer(response.get());
+ MessageWriter sub_writer(NULL);
std::vector<int32> data;
data.push_back(0);
data.push_back(1);
@@ -201,17 +203,17 @@
list_value->Append(new base::FundamentalValue(data[i]));
// Pop an int32 array.
- dbus::MessageReader reader(response.get());
- scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
+ MessageReader reader(response.get());
+ scoped_ptr<base::Value> value(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(list_value.get()));
}
TEST(ValuesUtilTest, PopStringArray) {
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
+ scoped_ptr<Response> response(Response::CreateEmpty());
// Append a string array.
- dbus::MessageWriter writer(response.get());
- dbus::MessageWriter sub_writer(NULL);
+ MessageWriter writer(response.get());
+ MessageWriter sub_writer(NULL);
std::vector<std::string> data;
data.push_back("Dreamlifter");
data.push_back("Beluga");
@@ -224,17 +226,17 @@
list_value->Append(new base::StringValue(data[i]));
// Pop a string array.
- dbus::MessageReader reader(response.get());
- scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
+ MessageReader reader(response.get());
+ scoped_ptr<base::Value> value(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(list_value.get()));
}
TEST(ValuesUtilTest, PopStruct) {
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
+ scoped_ptr<Response> response(Response::CreateEmpty());
// Append a struct.
- dbus::MessageWriter writer(response.get());
- dbus::MessageWriter sub_writer(NULL);
+ MessageWriter writer(response.get());
+ MessageWriter sub_writer(NULL);
writer.OpenStruct(&sub_writer);
const bool kBoolValue = true;
sub_writer.AppendBool(kBoolValue);
@@ -254,18 +256,18 @@
list_value.Append(new base::StringValue(kStringValue));
// Pop a struct.
- dbus::MessageReader reader(response.get());
- scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
+ MessageReader reader(response.get());
+ scoped_ptr<base::Value> value(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&list_value));
}
TEST(ValuesUtilTest, PopStringToVariantDictionary) {
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
+ scoped_ptr<Response> response(Response::CreateEmpty());
// Append a dictionary.
- dbus::MessageWriter writer(response.get());
- dbus::MessageWriter sub_writer(NULL);
- dbus::MessageWriter entry_writer(NULL);
+ MessageWriter writer(response.get());
+ MessageWriter sub_writer(NULL);
+ MessageWriter entry_writer(NULL);
writer.OpenArray("{sv}", &sub_writer);
sub_writer.OpenDictEntry(&entry_writer);
const std::string kKey1 = "one";
@@ -301,18 +303,18 @@
dictionary_value.SetString(kKey4, kStringValue);
// Pop a dictinoary.
- dbus::MessageReader reader(response.get());
- scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
+ MessageReader reader(response.get());
+ scoped_ptr<base::Value> value(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&dictionary_value));
}
TEST(ValuesUtilTest, PopDictionaryWithDottedStringKey) {
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
+ scoped_ptr<Response> response(Response::CreateEmpty());
// Append a dictionary.
- dbus::MessageWriter writer(response.get());
- dbus::MessageWriter sub_writer(NULL);
- dbus::MessageWriter entry_writer(NULL);
+ MessageWriter writer(response.get());
+ MessageWriter sub_writer(NULL);
+ MessageWriter entry_writer(NULL);
writer.OpenArray("{sv}", &sub_writer);
sub_writer.OpenDictEntry(&entry_writer);
const std::string kKey1 = "www.example.com"; // String including dots.
@@ -344,8 +346,8 @@
kKey3, new base::FundamentalValue(kDoubleValue));
// Pop a dictinoary.
- dbus::MessageReader reader(response.get());
- scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
+ MessageReader reader(response.get());
+ scoped_ptr<base::Value> value(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&dictionary_value));
}
@@ -359,12 +361,12 @@
keys[i] = sqrt(values[i]);
// Append a dictionary.
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
- dbus::MessageWriter writer(response.get());
- dbus::MessageWriter sub_writer(NULL);
+ scoped_ptr<Response> response(Response::CreateEmpty());
+ MessageWriter writer(response.get());
+ MessageWriter sub_writer(NULL);
writer.OpenArray("{di}", &sub_writer);
for (size_t i = 0; i != values.size(); ++i) {
- dbus::MessageWriter entry_writer(NULL);
+ MessageWriter entry_writer(NULL);
sub_writer.OpenDictEntry(&entry_writer);
entry_writer.AppendDouble(keys[i]);
entry_writer.AppendInt32(values[i]);
@@ -383,8 +385,8 @@
}
// Pop a dictionary.
- dbus::MessageReader reader(response.get());
- scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
+ MessageReader reader(response.get());
+ scoped_ptr<base::Value> value(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&dictionary_value));
}
@@ -395,25 +397,25 @@
const base::FundamentalValue kDoubleValue(4.2);
const base::StringValue kStringValue("string");
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
- dbus::MessageWriter writer(response.get());
+ scoped_ptr<Response> response(Response::CreateEmpty());
+ MessageWriter writer(response.get());
AppendBasicTypeValueData(&writer, kBoolValue);
AppendBasicTypeValueData(&writer, kIntegerValue);
AppendBasicTypeValueData(&writer, kDoubleValue);
AppendBasicTypeValueData(&writer, kStringValue);
- dbus::MessageReader reader(response.get());
+ MessageReader reader(response.get());
scoped_ptr<base::Value> value;
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kBoolValue));
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kIntegerValue));
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kDoubleValue));
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kStringValue));
}
@@ -424,25 +426,27 @@
const base::FundamentalValue kDoubleValue(4.2);
const base::StringValue kStringValue("string");
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
- dbus::MessageWriter writer(response.get());
+ scoped_ptr<Response> response(Response::CreateEmpty());
+ MessageWriter writer(response.get());
AppendBasicTypeValueDataAsVariant(&writer, kBoolValue);
AppendBasicTypeValueDataAsVariant(&writer, kIntegerValue);
AppendBasicTypeValueDataAsVariant(&writer, kDoubleValue);
AppendBasicTypeValueDataAsVariant(&writer, kStringValue);
- dbus::MessageReader reader(response.get());
+ MessageReader reader(response.get());
scoped_ptr<base::Value> value;
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kBoolValue));
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kIntegerValue));
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kDoubleValue));
- value.reset(dbus::PopDataAsValue(&reader));
+ value.reset(PopDataAsValue(&reader));
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kStringValue));
}
+
+} // namespace dbus
« no previous file with comments | « dbus/test_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698