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

Side by Side Diff: tools/json_schema_compiler/test/enums_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/enums.h" 5 #include "tools/json_schema_compiler/test/enums.h"
6 6
7 #include "testing/gtest/include/gtest/gtest.h" 7 #include "testing/gtest/include/gtest/gtest.h"
8 #include "tools/json_schema_compiler/test/test_util.h" 8 #include "tools/json_schema_compiler/test/test_util.h"
9 9
10 using namespace test::api::enums; 10 using namespace test::api::enums;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 value.Set("reference_enum", new base::StringValue("one")); 66 value.Set("reference_enum", new base::StringValue("one"));
67 ASSERT_TRUE(ReferenceEnum::Populate(value, &enumeration)); 67 ASSERT_TRUE(ReferenceEnum::Populate(value, &enumeration));
68 EXPECT_TRUE(value.Equals(enumeration.ToValue().get())); 68 EXPECT_TRUE(value.Equals(enumeration.ToValue().get()));
69 } 69 }
70 } 70 }
71 71
72 TEST(JsonSchemaCompilerEnumsTest, EnumsArrayAsType) { 72 TEST(JsonSchemaCompilerEnumsTest, EnumsArrayAsType) {
73 { 73 {
74 base::ListValue params_value; 74 base::ListValue params_value;
75 params_value.Append(List(new base::StringValue("one"), 75 params_value.Append(
76 new base::StringValue("two")).release()); 76 List(new base::StringValue("one"), new base::StringValue("two")));
77 std::unique_ptr<TakesEnumArrayAsType::Params> params( 77 std::unique_ptr<TakesEnumArrayAsType::Params> params(
78 TakesEnumArrayAsType::Params::Create(params_value)); 78 TakesEnumArrayAsType::Params::Create(params_value));
79 ASSERT_TRUE(params); 79 ASSERT_TRUE(params);
80 EXPECT_EQ(2U, params->values.size()); 80 EXPECT_EQ(2U, params->values.size());
81 EXPECT_EQ(ENUMERATION_ONE, params->values[0]); 81 EXPECT_EQ(ENUMERATION_ONE, params->values[0]);
82 EXPECT_EQ(ENUMERATION_TWO, params->values[1]); 82 EXPECT_EQ(ENUMERATION_TWO, params->values[1]);
83 } 83 }
84 { 84 {
85 base::ListValue params_value; 85 base::ListValue params_value;
86 params_value.Append(List(new base::StringValue("invalid")).release()); 86 params_value.Append(List(new base::StringValue("invalid")));
87 std::unique_ptr<TakesEnumArrayAsType::Params> params( 87 std::unique_ptr<TakesEnumArrayAsType::Params> params(
88 TakesEnumArrayAsType::Params::Create(params_value)); 88 TakesEnumArrayAsType::Params::Create(params_value));
89 EXPECT_FALSE(params); 89 EXPECT_FALSE(params);
90 } 90 }
91 } 91 }
92 92
93 TEST(JsonSchemaCompilerEnumsTest, ReturnsEnumCreate) { 93 TEST(JsonSchemaCompilerEnumsTest, ReturnsEnumCreate) {
94 { 94 {
95 Enumeration state = ENUMERATION_ONE; 95 Enumeration state = ENUMERATION_ONE;
96 std::unique_ptr<base::Value> result(new base::StringValue(ToString(state))); 96 std::unique_ptr<base::Value> result(new base::StringValue(ToString(state)));
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 params_value.AppendString("invalid"); 156 params_value.AppendString("invalid");
157 std::unique_ptr<TakesEnum::Params> params( 157 std::unique_ptr<TakesEnum::Params> params(
158 TakesEnum::Params::Create(params_value)); 158 TakesEnum::Params::Create(params_value));
159 EXPECT_FALSE(params.get()); 159 EXPECT_FALSE(params.get());
160 } 160 }
161 } 161 }
162 162
163 TEST(JsonSchemaCompilerEnumsTest, TakesEnumArrayParamsCreate) { 163 TEST(JsonSchemaCompilerEnumsTest, TakesEnumArrayParamsCreate) {
164 { 164 {
165 base::ListValue params_value; 165 base::ListValue params_value;
166 params_value.Append(List(new base::StringValue("one"), 166 params_value.Append(
167 new base::StringValue("two")).release()); 167 List(new base::StringValue("one"), new base::StringValue("two")));
168 std::unique_ptr<TakesEnumArray::Params> params( 168 std::unique_ptr<TakesEnumArray::Params> params(
169 TakesEnumArray::Params::Create(params_value)); 169 TakesEnumArray::Params::Create(params_value));
170 ASSERT_TRUE(params); 170 ASSERT_TRUE(params);
171 EXPECT_EQ(2U, params->values.size()); 171 EXPECT_EQ(2U, params->values.size());
172 EXPECT_EQ(ENUMERATION_ONE, params->values[0]); 172 EXPECT_EQ(ENUMERATION_ONE, params->values[0]);
173 EXPECT_EQ(ENUMERATION_TWO, params->values[1]); 173 EXPECT_EQ(ENUMERATION_TWO, params->values[1]);
174 } 174 }
175 { 175 {
176 base::ListValue params_value; 176 base::ListValue params_value;
177 params_value.Append(List(new base::StringValue("invalid")).release()); 177 params_value.Append(List(new base::StringValue("invalid")));
178 std::unique_ptr<TakesEnumArray::Params> params( 178 std::unique_ptr<TakesEnumArray::Params> params(
179 TakesEnumArray::Params::Create(params_value)); 179 TakesEnumArray::Params::Create(params_value));
180 EXPECT_FALSE(params); 180 EXPECT_FALSE(params);
181 } 181 }
182 } 182 }
183 183
184 TEST(JsonSchemaCompilerEnumsTest, TakesOptionalEnumParamsCreate) { 184 TEST(JsonSchemaCompilerEnumsTest, TakesOptionalEnumParamsCreate) {
185 { 185 {
186 base::ListValue params_value; 186 base::ListValue params_value;
187 params_value.AppendString("three"); 187 params_value.AppendString("three");
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
264 TEST(JsonSchemaCompilerEnumsTest, OnTwoEnumsFiredCreate) { 264 TEST(JsonSchemaCompilerEnumsTest, OnTwoEnumsFiredCreate) {
265 { 265 {
266 std::unique_ptr<base::Value> results( 266 std::unique_ptr<base::Value> results(
267 OnTwoEnumsFired::Create(ENUMERATION_ONE, OTHER_ENUMERATION_HAM)); 267 OnTwoEnumsFired::Create(ENUMERATION_ONE, OTHER_ENUMERATION_HAM));
268 base::ListValue expected; 268 base::ListValue expected;
269 expected.AppendString("one"); 269 expected.AppendString("one");
270 expected.AppendString("ham"); 270 expected.AppendString("ham");
271 EXPECT_TRUE(results->Equals(&expected)); 271 EXPECT_TRUE(results->Equals(&expected));
272 } 272 }
273 } 273 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698