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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: dbus/values_util_unittest.cc

Issue 2023633002: Change PopDataAsValue to return a std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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/values_util.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
diff --git a/dbus/values_util_unittest.cc b/dbus/values_util_unittest.cc
index 6903d51d20dbb73ed9e4a96915a92bf85bd5f447..2156c15e409a6e3ea99a1c2aa19880fce0849301 100644
--- a/dbus/values_util_unittest.cc
+++ b/dbus/values_util_unittest.cc
@@ -52,65 +52,65 @@ TEST(ValuesUtilTest, PopBasicTypes) {
std::unique_ptr<base::Value> value;
std::unique_ptr<base::Value> expected_value;
// Pop a byte.
- value.reset(PopDataAsValue(&reader));
+ value = 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(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kBoolValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop an int16_t.
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kInt16Value));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop a uint16_t.
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kUint16Value));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop an int32_t.
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kInt32Value));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop a uint32_t.
- value.reset(PopDataAsValue(&reader));
+ value = 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_t.
- value.reset(PopDataAsValue(&reader));
+ value = 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_t.
- value.reset(PopDataAsValue(&reader));
+ value = 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(PopDataAsValue(&reader));
+ value = 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(PopDataAsValue(&reader));
+ value = 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(PopDataAsValue(&reader));
+ value = 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(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::StringValue(kObjectPathValue.value()));
EXPECT_TRUE(value->Equals(expected_value.get()));
@@ -133,22 +133,22 @@ TEST(ValuesUtilTest, PopVariant) {
std::unique_ptr<base::Value> value;
std::unique_ptr<base::Value> expected_value;
// Pop a bool.
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::FundamentalValue(kBoolValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
// Pop an int32_t.
- value.reset(PopDataAsValue(&reader));
+ value = 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(PopDataAsValue(&reader));
+ value = 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(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(new base::StringValue(kStringValue));
EXPECT_TRUE(value->Equals(expected_value.get()));
@@ -170,7 +170,7 @@ TEST(ValuesUtilTest, PopExtremelyLargeIntegers) {
std::unique_ptr<base::Value> expected_value;
double double_value = 0;
// Pop an int64_t.
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(
new base::FundamentalValue(static_cast<double>(kInt64Value)));
@@ -178,7 +178,7 @@ TEST(ValuesUtilTest, PopExtremelyLargeIntegers) {
ASSERT_TRUE(value->GetAsDouble(&double_value));
EXPECT_NE(kInt64Value, static_cast<int64_t>(double_value));
// Pop a uint64_t.
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
expected_value.reset(
new base::FundamentalValue(static_cast<double>(kUint64Value)));
@@ -408,16 +408,16 @@ TEST(ValuesUtilTest, AppendBasicTypes) {
MessageReader reader(response.get());
std::unique_ptr<base::Value> value;
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kBoolValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kIntegerValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kDoubleValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kStringValue));
}
@@ -437,16 +437,16 @@ TEST(ValuesUtilTest, AppendBasicTypesAsVariant) {
MessageReader reader(response.get());
std::unique_ptr<base::Value> value;
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kBoolValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kIntegerValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kDoubleValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kStringValue));
}
@@ -466,16 +466,16 @@ TEST(ValuesUtilTest, AppendValueDataBasicTypes) {
MessageReader reader(response.get());
std::unique_ptr<base::Value> value;
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kBoolValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kIntegerValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kDoubleValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kStringValue));
}
@@ -495,16 +495,16 @@ TEST(ValuesUtilTest, AppendValueDataAsVariantBasicTypes) {
MessageReader reader(response.get());
std::unique_ptr<base::Value> value;
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kBoolValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kIntegerValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kDoubleValue));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&kStringValue));
}
@@ -548,10 +548,10 @@ TEST(ValuesUtilTest, AppendDictionary) {
// Read the data.
MessageReader reader(response.get());
std::unique_ptr<base::Value> value;
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&test_dictionary));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&int_value));
}
@@ -595,10 +595,10 @@ TEST(ValuesUtilTest, AppendDictionaryAsVariant) {
// Read the data.
MessageReader reader(response.get());
std::unique_ptr<base::Value> value;
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&test_dictionary));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&int_value));
}
@@ -638,10 +638,10 @@ TEST(ValuesUtilTest, AppendList) {
// Read the data.
MessageReader reader(response.get());
std::unique_ptr<base::Value> value;
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&test_list));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&int_value));
}
@@ -681,10 +681,10 @@ TEST(ValuesUtilTest, AppendListAsVariant) {
// Read the data.
MessageReader reader(response.get());
std::unique_ptr<base::Value> value;
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&test_list));
- value.reset(PopDataAsValue(&reader));
+ value = PopDataAsValue(&reader);
ASSERT_TRUE(value.get() != NULL);
EXPECT_TRUE(value->Equals(&int_value));
}
« no previous file with comments | « dbus/values_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698