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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/json_schema_compiler/test/simple_api_unittest.cc

Issue 1869503004: Convert //tools to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, change iwyu fixes for converted directories to include <memory> 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
« no previous file with comments | « tools/json_schema_compiler/test/objects_unittest.cc ('k') | tools/json_schema_compiler/test/test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/json_schema_compiler/test/simple_api_unittest.cc
diff --git a/tools/json_schema_compiler/test/simple_api_unittest.cc b/tools/json_schema_compiler/test/simple_api_unittest.cc
index 8d38331c0dbf9c547e821b59b5e742f2c6460f67..3c2baa3974884cc307233c1f30cd771f79dd5d98 100644
--- a/tools/json_schema_compiler/test/simple_api_unittest.cc
+++ b/tools/json_schema_compiler/test/simple_api_unittest.cc
@@ -10,8 +10,8 @@ using namespace test::api::simple_api;
namespace {
-static scoped_ptr<base::DictionaryValue> CreateTestTypeDictionary() {
- scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
+static std::unique_ptr<base::DictionaryValue> CreateTestTypeDictionary() {
+ std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
value->SetWithoutPathExpansion("number", new base::FundamentalValue(1.1));
value->SetWithoutPathExpansion("integer", new base::FundamentalValue(4));
value->SetWithoutPathExpansion("string", new base::StringValue("bling"));
@@ -22,16 +22,17 @@ static scoped_ptr<base::DictionaryValue> CreateTestTypeDictionary() {
} // namespace
TEST(JsonSchemaCompilerSimpleTest, IncrementIntegerResultCreate) {
- scoped_ptr<base::ListValue> results = IncrementInteger::Results::Create(5);
+ std::unique_ptr<base::ListValue> results =
+ IncrementInteger::Results::Create(5);
base::ListValue expected;
expected.Append(new base::FundamentalValue(5));
EXPECT_TRUE(results->Equals(&expected));
}
TEST(JsonSchemaCompilerSimpleTest, IncrementIntegerParamsCreate) {
- scoped_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
params_value->Append(new base::FundamentalValue(6));
- scoped_ptr<IncrementInteger::Params> params(
+ std::unique_ptr<IncrementInteger::Params> params(
IncrementInteger::Params::Create(*params_value));
EXPECT_TRUE(params.get());
EXPECT_EQ(6, params->num);
@@ -39,16 +40,16 @@ TEST(JsonSchemaCompilerSimpleTest, IncrementIntegerParamsCreate) {
TEST(JsonSchemaCompilerSimpleTest, NumberOfParams) {
{
- scoped_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
params_value->Append(new base::StringValue("text"));
params_value->Append(new base::StringValue("text"));
- scoped_ptr<OptionalString::Params> params(
+ std::unique_ptr<OptionalString::Params> params(
OptionalString::Params::Create(*params_value));
EXPECT_FALSE(params.get());
}
{
- scoped_ptr<base::ListValue> params_value(new base::ListValue());
- scoped_ptr<IncrementInteger::Params> params(
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<IncrementInteger::Params> params(
IncrementInteger::Params::Create(*params_value));
EXPECT_FALSE(params.get());
}
@@ -56,16 +57,16 @@ TEST(JsonSchemaCompilerSimpleTest, NumberOfParams) {
TEST(JsonSchemaCompilerSimpleTest, OptionalStringParamsCreate) {
{
- scoped_ptr<base::ListValue> params_value(new base::ListValue());
- scoped_ptr<OptionalString::Params> params(
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<OptionalString::Params> params(
OptionalString::Params::Create(*params_value));
EXPECT_TRUE(params.get());
EXPECT_FALSE(params->str.get());
}
{
- scoped_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
params_value->Append(new base::StringValue("asdf"));
- scoped_ptr<OptionalString::Params> params(
+ std::unique_ptr<OptionalString::Params> params(
OptionalString::Params::Create(*params_value));
EXPECT_TRUE(params.get());
EXPECT_TRUE(params->str.get());
@@ -75,9 +76,9 @@ TEST(JsonSchemaCompilerSimpleTest, OptionalStringParamsCreate) {
TEST(JsonSchemaCompilerSimpleTest, OptionalParamsTakingNull) {
{
- scoped_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
params_value->Append(base::Value::CreateNullValue());
- scoped_ptr<OptionalString::Params> params(
+ std::unique_ptr<OptionalString::Params> params(
OptionalString::Params::Create(*params_value));
EXPECT_TRUE(params.get());
EXPECT_FALSE(params->str.get());
@@ -86,9 +87,9 @@ TEST(JsonSchemaCompilerSimpleTest, OptionalParamsTakingNull) {
TEST(JsonSchemaCompilerSimpleTest, OptionalStringParamsWrongType) {
{
- scoped_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
params_value->Append(new base::FundamentalValue(5));
- scoped_ptr<OptionalString::Params> params(
+ std::unique_ptr<OptionalString::Params> params(
OptionalString::Params::Create(*params_value));
EXPECT_FALSE(params.get());
}
@@ -96,10 +97,10 @@ TEST(JsonSchemaCompilerSimpleTest, OptionalStringParamsWrongType) {
TEST(JsonSchemaCompilerSimpleTest, OptionalBeforeRequired) {
{
- scoped_ptr<base::ListValue> params_value(new base::ListValue());
+ std::unique_ptr<base::ListValue> params_value(new base::ListValue());
params_value->Append(base::Value::CreateNullValue());
params_value->Append(new base::StringValue("asdf"));
- scoped_ptr<OptionalBeforeRequired::Params> params(
+ std::unique_ptr<OptionalBeforeRequired::Params> params(
OptionalBeforeRequired::Params::Create(*params_value));
EXPECT_TRUE(params.get());
EXPECT_FALSE(params->first.get());
@@ -108,15 +109,15 @@ TEST(JsonSchemaCompilerSimpleTest, OptionalBeforeRequired) {
}
TEST(JsonSchemaCompilerSimpleTest, NoParamsResultCreate) {
- scoped_ptr<base::ListValue> results = OptionalString::Results::Create();
+ std::unique_ptr<base::ListValue> results = OptionalString::Results::Create();
base::ListValue expected;
EXPECT_TRUE(results->Equals(&expected));
}
TEST(JsonSchemaCompilerSimpleTest, TestTypePopulate) {
{
- scoped_ptr<TestType> test_type(new TestType());
- scoped_ptr<base::DictionaryValue> value = CreateTestTypeDictionary();
+ std::unique_ptr<TestType> test_type(new TestType());
+ std::unique_ptr<base::DictionaryValue> value = CreateTestTypeDictionary();
EXPECT_TRUE(TestType::Populate(*value, test_type.get()));
EXPECT_EQ("bling", test_type->string);
EXPECT_EQ(1.1, test_type->number);
@@ -125,8 +126,8 @@ TEST(JsonSchemaCompilerSimpleTest, TestTypePopulate) {
EXPECT_TRUE(value->Equals(test_type->ToValue().get()));
}
{
- scoped_ptr<TestType> test_type(new TestType());
- scoped_ptr<base::DictionaryValue> value = CreateTestTypeDictionary();
+ std::unique_ptr<TestType> test_type(new TestType());
+ std::unique_ptr<base::DictionaryValue> value = CreateTestTypeDictionary();
value->Remove("number", NULL);
EXPECT_FALSE(TestType::Populate(*value, test_type.get()));
}
@@ -134,10 +135,10 @@ TEST(JsonSchemaCompilerSimpleTest, TestTypePopulate) {
TEST(JsonSchemaCompilerSimpleTest, GetTestType) {
{
- scoped_ptr<base::DictionaryValue> value = CreateTestTypeDictionary();
- scoped_ptr<TestType> test_type(new TestType());
+ std::unique_ptr<base::DictionaryValue> value = CreateTestTypeDictionary();
+ std::unique_ptr<TestType> test_type(new TestType());
EXPECT_TRUE(TestType::Populate(*value, test_type.get()));
- scoped_ptr<base::ListValue> results =
+ std::unique_ptr<base::ListValue> results =
GetTestType::Results::Create(*test_type);
base::DictionaryValue* result = NULL;
@@ -148,7 +149,7 @@ TEST(JsonSchemaCompilerSimpleTest, GetTestType) {
TEST(JsonSchemaCompilerSimpleTest, OnIntegerFiredCreate) {
{
- scoped_ptr<base::ListValue> results(OnIntegerFired::Create(5));
+ std::unique_ptr<base::ListValue> results(OnIntegerFired::Create(5));
base::ListValue expected;
expected.Append(new base::FundamentalValue(5));
EXPECT_TRUE(results->Equals(&expected));
@@ -157,7 +158,7 @@ TEST(JsonSchemaCompilerSimpleTest, OnIntegerFiredCreate) {
TEST(JsonSchemaCompilerSimpleTest, OnStringFiredCreate) {
{
- scoped_ptr<base::ListValue> results(OnStringFired::Create("yo dawg"));
+ std::unique_ptr<base::ListValue> results(OnStringFired::Create("yo dawg"));
base::ListValue expected;
expected.Append(new base::StringValue("yo dawg"));
EXPECT_TRUE(results->Equals(&expected));
@@ -167,13 +168,14 @@ TEST(JsonSchemaCompilerSimpleTest, OnStringFiredCreate) {
TEST(JsonSchemaCompilerSimpleTest, OnTestTypeFiredCreate) {
{
TestType some_test_type;
- scoped_ptr<base::DictionaryValue> expected = CreateTestTypeDictionary();
+ std::unique_ptr<base::DictionaryValue> expected =
+ CreateTestTypeDictionary();
ASSERT_TRUE(expected->GetDouble("number", &some_test_type.number));
ASSERT_TRUE(expected->GetString("string", &some_test_type.string));
ASSERT_TRUE(expected->GetInteger("integer", &some_test_type.integer));
ASSERT_TRUE(expected->GetBoolean("boolean", &some_test_type.boolean));
- scoped_ptr<base::ListValue> results(
+ std::unique_ptr<base::ListValue> results(
OnTestTypeFired::Create(some_test_type));
base::DictionaryValue* result = NULL;
results->GetDictionary(0, &result);
« no previous file with comments | « tools/json_schema_compiler/test/objects_unittest.cc ('k') | tools/json_schema_compiler/test/test_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698