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

Side by Side Diff: tools/json_schema_compiler/test/crossref_unittest.cc

Issue 2051663003: base::ListValue::Append cleanup: pass unique_ptr instead of the released pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "tools/json_schema_compiler/test/crossref.h" 5 #include "tools/json_schema_compiler/test/crossref.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility>
8 9
9 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
10 #include "tools/json_schema_compiler/test/simple_api.h" 11 #include "tools/json_schema_compiler/test/simple_api.h"
11 12
12 using namespace test::api; 13 using namespace test::api;
13 14
14 namespace { 15 namespace {
15 16
16 std::unique_ptr<base::DictionaryValue> CreateTestTypeValue() { 17 std::unique_ptr<base::DictionaryValue> CreateTestTypeValue() {
17 std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue()); 18 std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
(...skipping 25 matching lines...) Expand all
43 44
44 // Test ToValue of the compiled type --> value. 45 // Test ToValue of the compiled type --> value.
45 std::unique_ptr<base::DictionaryValue> crossref_value = 46 std::unique_ptr<base::DictionaryValue> crossref_value =
46 crossref_type.ToValue(); 47 crossref_type.ToValue();
47 ASSERT_TRUE(crossref_value); 48 ASSERT_TRUE(crossref_value);
48 EXPECT_TRUE(crossref_orig.Equals(crossref_value.get())); 49 EXPECT_TRUE(crossref_orig.Equals(crossref_value.get()));
49 } 50 }
50 51
51 TEST(JsonSchemaCompilerCrossrefTest, TestTypeOptionalParamCreate) { 52 TEST(JsonSchemaCompilerCrossrefTest, TestTypeOptionalParamCreate) {
52 std::unique_ptr<base::ListValue> params_value(new base::ListValue()); 53 std::unique_ptr<base::ListValue> params_value(new base::ListValue());
53 params_value->Append(CreateTestTypeValue().release()); 54 params_value->Append(CreateTestTypeValue());
54 std::unique_ptr<crossref::TestTypeOptionalParam::Params> params( 55 std::unique_ptr<crossref::TestTypeOptionalParam::Params> params(
55 crossref::TestTypeOptionalParam::Params::Create(*params_value)); 56 crossref::TestTypeOptionalParam::Params::Create(*params_value));
56 EXPECT_TRUE(params.get()); 57 EXPECT_TRUE(params.get());
57 EXPECT_TRUE(params->test_type.get()); 58 EXPECT_TRUE(params->test_type.get());
58 EXPECT_TRUE( 59 EXPECT_TRUE(
59 CreateTestTypeValue()->Equals(params->test_type->ToValue().get())); 60 CreateTestTypeValue()->Equals(params->test_type->ToValue().get()));
60 } 61 }
61 62
62 TEST(JsonSchemaCompilerCrossrefTest, TestTypeOptionalParamFail) { 63 TEST(JsonSchemaCompilerCrossrefTest, TestTypeOptionalParamFail) {
63 std::unique_ptr<base::ListValue> params_value(new base::ListValue()); 64 std::unique_ptr<base::ListValue> params_value(new base::ListValue());
64 std::unique_ptr<base::DictionaryValue> test_type_value = 65 std::unique_ptr<base::DictionaryValue> test_type_value =
65 CreateTestTypeValue(); 66 CreateTestTypeValue();
66 test_type_value->RemoveWithoutPathExpansion("number", NULL); 67 test_type_value->RemoveWithoutPathExpansion("number", NULL);
67 params_value->Append(test_type_value.release()); 68 params_value->Append(std::move(test_type_value));
68 std::unique_ptr<crossref::TestTypeOptionalParam::Params> params( 69 std::unique_ptr<crossref::TestTypeOptionalParam::Params> params(
69 crossref::TestTypeOptionalParam::Params::Create(*params_value)); 70 crossref::TestTypeOptionalParam::Params::Create(*params_value));
70 EXPECT_FALSE(params.get()); 71 EXPECT_FALSE(params.get());
71 } 72 }
72 73
73 TEST(JsonSchemaCompilerCrossrefTest, GetTestType) { 74 TEST(JsonSchemaCompilerCrossrefTest, GetTestType) {
74 std::unique_ptr<base::DictionaryValue> value = CreateTestTypeValue(); 75 std::unique_ptr<base::DictionaryValue> value = CreateTestTypeValue();
75 std::unique_ptr<simple_api::TestType> test_type(new simple_api::TestType()); 76 std::unique_ptr<simple_api::TestType> test_type(new simple_api::TestType());
76 EXPECT_TRUE(simple_api::TestType::Populate(*value, test_type.get())); 77 EXPECT_TRUE(simple_api::TestType::Populate(*value, test_type.get()));
77 78
78 std::unique_ptr<base::ListValue> results = 79 std::unique_ptr<base::ListValue> results =
79 crossref::GetTestType::Results::Create(*test_type); 80 crossref::GetTestType::Results::Create(*test_type);
80 base::DictionaryValue* result_dict = NULL; 81 base::DictionaryValue* result_dict = NULL;
81 results->GetDictionary(0, &result_dict); 82 results->GetDictionary(0, &result_dict);
82 EXPECT_TRUE(value->Equals(result_dict)); 83 EXPECT_TRUE(value->Equals(result_dict));
83 } 84 }
84 85
85 TEST(JsonSchemaCompilerCrossrefTest, TestTypeInObjectParamsCreate) { 86 TEST(JsonSchemaCompilerCrossrefTest, TestTypeInObjectParamsCreate) {
86 { 87 {
87 std::unique_ptr<base::ListValue> params_value(new base::ListValue()); 88 std::unique_ptr<base::ListValue> params_value(new base::ListValue());
88 std::unique_ptr<base::DictionaryValue> param_object_value( 89 std::unique_ptr<base::DictionaryValue> param_object_value(
89 new base::DictionaryValue()); 90 new base::DictionaryValue());
90 param_object_value->Set("testType", CreateTestTypeValue().release()); 91 param_object_value->Set("testType", CreateTestTypeValue().release());
91 param_object_value->Set("boolean", new base::FundamentalValue(true)); 92 param_object_value->Set("boolean", new base::FundamentalValue(true));
92 params_value->Append(param_object_value.release()); 93 params_value->Append(std::move(param_object_value));
93 std::unique_ptr<crossref::TestTypeInObject::Params> params( 94 std::unique_ptr<crossref::TestTypeInObject::Params> params(
94 crossref::TestTypeInObject::Params::Create(*params_value)); 95 crossref::TestTypeInObject::Params::Create(*params_value));
95 EXPECT_TRUE(params.get()); 96 EXPECT_TRUE(params.get());
96 EXPECT_TRUE(params->param_object.test_type.get()); 97 EXPECT_TRUE(params->param_object.test_type.get());
97 EXPECT_TRUE(params->param_object.boolean); 98 EXPECT_TRUE(params->param_object.boolean);
98 EXPECT_TRUE(CreateTestTypeValue()->Equals( 99 EXPECT_TRUE(CreateTestTypeValue()->Equals(
99 params->param_object.test_type->ToValue().get())); 100 params->param_object.test_type->ToValue().get()));
100 } 101 }
101 { 102 {
102 std::unique_ptr<base::ListValue> params_value(new base::ListValue()); 103 std::unique_ptr<base::ListValue> params_value(new base::ListValue());
103 std::unique_ptr<base::DictionaryValue> param_object_value( 104 std::unique_ptr<base::DictionaryValue> param_object_value(
104 new base::DictionaryValue()); 105 new base::DictionaryValue());
105 param_object_value->Set("boolean", new base::FundamentalValue(true)); 106 param_object_value->Set("boolean", new base::FundamentalValue(true));
106 params_value->Append(param_object_value.release()); 107 params_value->Append(std::move(param_object_value));
107 std::unique_ptr<crossref::TestTypeInObject::Params> params( 108 std::unique_ptr<crossref::TestTypeInObject::Params> params(
108 crossref::TestTypeInObject::Params::Create(*params_value)); 109 crossref::TestTypeInObject::Params::Create(*params_value));
109 EXPECT_TRUE(params.get()); 110 EXPECT_TRUE(params.get());
110 EXPECT_FALSE(params->param_object.test_type.get()); 111 EXPECT_FALSE(params->param_object.test_type.get());
111 EXPECT_TRUE(params->param_object.boolean); 112 EXPECT_TRUE(params->param_object.boolean);
112 } 113 }
113 { 114 {
114 std::unique_ptr<base::ListValue> params_value(new base::ListValue()); 115 std::unique_ptr<base::ListValue> params_value(new base::ListValue());
115 std::unique_ptr<base::DictionaryValue> param_object_value( 116 std::unique_ptr<base::DictionaryValue> param_object_value(
116 new base::DictionaryValue()); 117 new base::DictionaryValue());
117 param_object_value->Set("testType", new base::StringValue("invalid")); 118 param_object_value->Set("testType", new base::StringValue("invalid"));
118 param_object_value->Set("boolean", new base::FundamentalValue(true)); 119 param_object_value->Set("boolean", new base::FundamentalValue(true));
119 params_value->Append(param_object_value.release()); 120 params_value->Append(std::move(param_object_value));
120 std::unique_ptr<crossref::TestTypeInObject::Params> params( 121 std::unique_ptr<crossref::TestTypeInObject::Params> params(
121 crossref::TestTypeInObject::Params::Create(*params_value)); 122 crossref::TestTypeInObject::Params::Create(*params_value));
122 EXPECT_FALSE(params.get()); 123 EXPECT_FALSE(params.get());
123 } 124 }
124 { 125 {
125 std::unique_ptr<base::ListValue> params_value(new base::ListValue()); 126 std::unique_ptr<base::ListValue> params_value(new base::ListValue());
126 std::unique_ptr<base::DictionaryValue> param_object_value( 127 std::unique_ptr<base::DictionaryValue> param_object_value(
127 new base::DictionaryValue()); 128 new base::DictionaryValue());
128 param_object_value->Set("testType", CreateTestTypeValue().release()); 129 param_object_value->Set("testType", CreateTestTypeValue().release());
129 params_value->Append(param_object_value.release()); 130 params_value->Append(std::move(param_object_value));
130 std::unique_ptr<crossref::TestTypeInObject::Params> params( 131 std::unique_ptr<crossref::TestTypeInObject::Params> params(
131 crossref::TestTypeInObject::Params::Create(*params_value)); 132 crossref::TestTypeInObject::Params::Create(*params_value));
132 EXPECT_FALSE(params.get()); 133 EXPECT_FALSE(params.get());
133 } 134 }
134 } 135 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698