dbus/values_util_unittest.cc - Issue 1867253002: Convert //dbus from scoped_ptr to std::unique_ptr

Unified Diff: dbus/values_util_unittest.cc

Issue 1867253002: Convert //dbus from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

Index: dbus/values_util_unittest.cc

diff --git a/dbus/values_util_unittest.cc b/dbus/values_util_unittest.cc

index b2f1404da45f94864f3507345e8933b0b4ccb8d9..6903d51d20dbb73ed9e4a96915a92bf85bd5f447 100644

--- a/dbus/values_util_unittest.cc

+++ b/dbus/values_util_unittest.cc

@@ -8,11 +8,11 @@

#include <stdint.h>

#include <cmath>

+#include <memory>

#include <vector>

#include "base/json/json_writer.h"

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/values.h"

#include "dbus/message.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -20,7 +20,7 @@

namespace dbus {

TEST(ValuesUtilTest, PopBasicTypes) {

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

// Append basic type values.

MessageWriter writer(response.get());

const uint8_t kByteValue = 42;

@@ -49,8 +49,8 @@ TEST(ValuesUtilTest, PopBasicTypes) {

writer.AppendObjectPath(kObjectPathValue);

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

- scoped_ptr<base::Value> expected_value;

+ std::unique_ptr<base::Value> value;

+ std::unique_ptr<base::Value> expected_value;

// Pop a byte.

value.reset(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

@@ -117,7 +117,7 @@ TEST(ValuesUtilTest, PopBasicTypes) {

}

TEST(ValuesUtilTest, PopVariant) {

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

// Append variant values.

MessageWriter writer(response.get());

const bool kBoolValue = true;

@@ -130,8 +130,8 @@ TEST(ValuesUtilTest, PopVariant) {

writer.AppendVariantOfString(kStringValue);

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

- scoped_ptr<base::Value> expected_value;

+ std::unique_ptr<base::Value> value;

+ std::unique_ptr<base::Value> expected_value;

// Pop a bool.

value.reset(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

@@ -157,7 +157,7 @@ TEST(ValuesUtilTest, PopVariant) {

// Pop extremely large integers which cannot be precisely represented in

// double.

TEST(ValuesUtilTest, PopExtremelyLargeIntegers) {

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

// Append large integers.

MessageWriter writer(response.get());

const int64_t kInt64Value = -123456789012345689LL;

@@ -166,8 +166,8 @@ TEST(ValuesUtilTest, PopExtremelyLargeIntegers) {

writer.AppendUint64(kUint64Value);

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

- scoped_ptr<base::Value> expected_value;

+ std::unique_ptr<base::Value> value;

+ std::unique_ptr<base::Value> expected_value;

double double_value = 0;

// Pop an int64_t.

value.reset(PopDataAsValue(&reader));

@@ -188,7 +188,7 @@ TEST(ValuesUtilTest, PopExtremelyLargeIntegers) {

}

TEST(ValuesUtilTest, PopIntArray) {

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

// Append an int32_t array.

MessageWriter writer(response.get());

MessageWriter sub_writer(NULL);

@@ -202,19 +202,19 @@ TEST(ValuesUtilTest, PopIntArray) {

writer.CloseContainer(&sub_writer);

// Create the expected value.

- scoped_ptr<base::ListValue> list_value(new base::ListValue);

+ std::unique_ptr<base::ListValue> list_value(new base::ListValue);

for (size_t i = 0; i != data.size(); ++i)

list_value->Append(new base::FundamentalValue(data[i]));

// Pop an int32_t array.

MessageReader reader(response.get());

- scoped_ptr<base::Value> value(PopDataAsValue(&reader));

+ std::unique_ptr<base::Value> value(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(list_value.get()));

}

TEST(ValuesUtilTest, PopStringArray) {

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

// Append a string array.

MessageWriter writer(response.get());

MessageWriter sub_writer(NULL);

@@ -225,19 +225,19 @@ TEST(ValuesUtilTest, PopStringArray) {

writer.AppendArrayOfStrings(data);

// Create the expected value.

- scoped_ptr<base::ListValue> list_value(new base::ListValue);

+ std::unique_ptr<base::ListValue> list_value(new base::ListValue);

for (size_t i = 0; i != data.size(); ++i)

list_value->Append(new base::StringValue(data[i]));

// Pop a string array.

MessageReader reader(response.get());

- scoped_ptr<base::Value> value(PopDataAsValue(&reader));

+ std::unique_ptr<base::Value> value(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(list_value.get()));

}

TEST(ValuesUtilTest, PopStruct) {

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

// Append a struct.

MessageWriter writer(response.get());

MessageWriter sub_writer(NULL);

@@ -261,13 +261,13 @@ TEST(ValuesUtilTest, PopStruct) {

// Pop a struct.

MessageReader reader(response.get());

- scoped_ptr<base::Value> value(PopDataAsValue(&reader));

+ std::unique_ptr<base::Value> value(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&list_value));

}

TEST(ValuesUtilTest, PopStringToVariantDictionary) {

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

// Append a dictionary.

MessageWriter writer(response.get());

MessageWriter sub_writer(NULL);

@@ -308,13 +308,13 @@ TEST(ValuesUtilTest, PopStringToVariantDictionary) {

// Pop a dictinoary.

MessageReader reader(response.get());

- scoped_ptr<base::Value> value(PopDataAsValue(&reader));

+ std::unique_ptr<base::Value> value(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&dictionary_value));

}

TEST(ValuesUtilTest, PopDictionaryWithDottedStringKey) {

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

// Append a dictionary.

MessageWriter writer(response.get());

MessageWriter sub_writer(NULL);

@@ -351,7 +351,7 @@ TEST(ValuesUtilTest, PopDictionaryWithDottedStringKey) {

// Pop a dictinoary.

MessageReader reader(response.get());

- scoped_ptr<base::Value> value(PopDataAsValue(&reader));

+ std::unique_ptr<base::Value> value(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&dictionary_value));

}

@@ -365,7 +365,7 @@ TEST(ValuesUtilTest, PopDoubleToIntDictionary) {

keys[i] = std::sqrt(values[i]);

// Append a dictionary.

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

MessageWriter writer(response.get());

MessageWriter sub_writer(NULL);

writer.OpenArray("{di}", &sub_writer);

@@ -388,7 +388,7 @@ TEST(ValuesUtilTest, PopDoubleToIntDictionary) {

// Pop a dictionary.

MessageReader reader(response.get());

- scoped_ptr<base::Value> value(PopDataAsValue(&reader));

+ std::unique_ptr<base::Value> value(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&dictionary_value));

}

@@ -399,7 +399,7 @@ TEST(ValuesUtilTest, AppendBasicTypes) {

const base::FundamentalValue kDoubleValue(4.2);

const base::StringValue kStringValue("string");

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

MessageWriter writer(response.get());

AppendBasicTypeValueData(&writer, kBoolValue);

AppendBasicTypeValueData(&writer, kIntegerValue);

@@ -407,7 +407,7 @@ TEST(ValuesUtilTest, AppendBasicTypes) {

AppendBasicTypeValueData(&writer, kStringValue);

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

+ std::unique_ptr<base::Value> value;

value.reset(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&kBoolValue));

@@ -428,7 +428,7 @@ TEST(ValuesUtilTest, AppendBasicTypesAsVariant) {

const base::FundamentalValue kDoubleValue(4.2);

const base::StringValue kStringValue("string");

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

MessageWriter writer(response.get());

AppendBasicTypeValueDataAsVariant(&writer, kBoolValue);

AppendBasicTypeValueDataAsVariant(&writer, kIntegerValue);

@@ -436,7 +436,7 @@ TEST(ValuesUtilTest, AppendBasicTypesAsVariant) {

AppendBasicTypeValueDataAsVariant(&writer, kStringValue);

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

+ std::unique_ptr<base::Value> value;

value.reset(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&kBoolValue));

@@ -457,7 +457,7 @@ TEST(ValuesUtilTest, AppendValueDataBasicTypes) {

const base::FundamentalValue kDoubleValue(4.2);

const base::StringValue kStringValue("string");

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

MessageWriter writer(response.get());

AppendValueData(&writer, kBoolValue);

AppendValueData(&writer, kIntegerValue);

@@ -465,7 +465,7 @@ TEST(ValuesUtilTest, AppendValueDataBasicTypes) {

AppendValueData(&writer, kStringValue);

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

+ std::unique_ptr<base::Value> value;

value.reset(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&kBoolValue));

@@ -486,7 +486,7 @@ TEST(ValuesUtilTest, AppendValueDataAsVariantBasicTypes) {

const base::FundamentalValue kDoubleValue(4.2);

const base::StringValue kStringValue("string");

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

MessageWriter writer(response.get());

AppendValueDataAsVariant(&writer, kBoolValue);

AppendValueDataAsVariant(&writer, kIntegerValue);

@@ -494,7 +494,7 @@ TEST(ValuesUtilTest, AppendValueDataAsVariantBasicTypes) {

AppendValueDataAsVariant(&writer, kStringValue);

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

+ std::unique_ptr<base::Value> value;

value.reset(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&kBoolValue));

@@ -539,7 +539,7 @@ TEST(ValuesUtilTest, AppendDictionary) {

test_dictionary.Set(kKey5, list_value); // takes ownership

test_dictionary.Set(kKey6, dictionary_value); // takes ownership

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

MessageWriter writer(response.get());

AppendValueData(&writer, test_dictionary);

base::FundamentalValue int_value(kInt32Value);

@@ -547,7 +547,7 @@ TEST(ValuesUtilTest, AppendDictionary) {

// Read the data.

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

+ std::unique_ptr<base::Value> value;

value.reset(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&test_dictionary));

@@ -586,7 +586,7 @@ TEST(ValuesUtilTest, AppendDictionaryAsVariant) {

test_dictionary.Set(kKey5, list_value); // takes ownership

test_dictionary.Set(kKey6, dictionary_value); // takes ownership

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

MessageWriter writer(response.get());

AppendValueDataAsVariant(&writer, test_dictionary);

base::FundamentalValue int_value(kInt32Value);

@@ -594,7 +594,7 @@ TEST(ValuesUtilTest, AppendDictionaryAsVariant) {

// Read the data.

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

+ std::unique_ptr<base::Value> value;

value.reset(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&test_dictionary));

@@ -629,7 +629,7 @@ TEST(ValuesUtilTest, AppendList) {

test_list.Append(list_value); // takes ownership

test_list.Append(dictionary_value); // takes ownership

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

MessageWriter writer(response.get());

AppendValueData(&writer, test_list);

base::FundamentalValue int_value(kInt32Value);

@@ -637,7 +637,7 @@ TEST(ValuesUtilTest, AppendList) {

// Read the data.

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

+ std::unique_ptr<base::Value> value;

value.reset(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&test_list));

@@ -672,7 +672,7 @@ TEST(ValuesUtilTest, AppendListAsVariant) {

test_list.Append(list_value); // takes ownership

test_list.Append(dictionary_value); // takes ownership

- scoped_ptr<Response> response(Response::CreateEmpty());

+ std::unique_ptr<Response> response(Response::CreateEmpty());

MessageWriter writer(response.get());

AppendValueDataAsVariant(&writer, test_list);

base::FundamentalValue int_value(kInt32Value);

@@ -680,7 +680,7 @@ TEST(ValuesUtilTest, AppendListAsVariant) {

// Read the data.

MessageReader reader(response.get());

- scoped_ptr<base::Value> value;

+ std::unique_ptr<base::Value> value;

value.reset(PopDataAsValue(&reader));

ASSERT_TRUE(value.get() != NULL);

EXPECT_TRUE(value->Equals(&test_list));

« dbus/mock_object_proxy.h ('K') | « dbus/values_util.cc ('k') | no next file » | no next file with comments »