OLD | NEW |
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; |
11 using json_schema_compiler::test_util::List; | 11 using json_schema_compiler::test_util::List; |
12 | 12 |
13 TEST(JsonSchemaCompilerEnumsTest, EnumTypePopulate) { | 13 TEST(JsonSchemaCompilerEnumsTest, EnumTypePopulate) { |
14 { | 14 { |
15 EnumType enum_type; | 15 EnumType enum_type; |
16 DictionaryValue value; | 16 base::DictionaryValue value; |
17 value.Set("type", Value::CreateStringValue("one")); | 17 value.Set("type", base::Value::CreateStringValue("one")); |
18 EXPECT_TRUE(EnumType::Populate(value, &enum_type)); | 18 EXPECT_TRUE(EnumType::Populate(value, &enum_type)); |
19 EXPECT_EQ(EnumType::TYPE_ONE, enum_type.type); | 19 EXPECT_EQ(EnumType::TYPE_ONE, enum_type.type); |
20 EXPECT_TRUE(value.Equals(enum_type.ToValue().get())); | 20 EXPECT_TRUE(value.Equals(enum_type.ToValue().get())); |
21 } | 21 } |
22 { | 22 { |
23 EnumType enum_type; | 23 EnumType enum_type; |
24 DictionaryValue value; | 24 base::DictionaryValue value; |
25 value.Set("type", Value::CreateStringValue("invalid")); | 25 value.Set("type", base::Value::CreateStringValue("invalid")); |
26 EXPECT_FALSE(EnumType::Populate(value, &enum_type)); | 26 EXPECT_FALSE(EnumType::Populate(value, &enum_type)); |
27 } | 27 } |
28 } | 28 } |
29 | 29 |
30 TEST(JsonSchemaCompilerEnumsTest, EnumsAsTypes) { | 30 TEST(JsonSchemaCompilerEnumsTest, EnumsAsTypes) { |
31 { | 31 { |
32 ListValue args; | 32 base::ListValue args; |
33 args.Append(Value::CreateStringValue("one")); | 33 args.Append(base::Value::CreateStringValue("one")); |
34 | 34 |
35 scoped_ptr<TakesEnumAsType::Params> params( | 35 scoped_ptr<TakesEnumAsType::Params> params( |
36 TakesEnumAsType::Params::Create(args)); | 36 TakesEnumAsType::Params::Create(args)); |
37 ASSERT_TRUE(params.get()); | 37 ASSERT_TRUE(params.get()); |
38 EXPECT_EQ(ENUMERATION_ONE, params->enumeration); | 38 EXPECT_EQ(ENUMERATION_ONE, params->enumeration); |
39 | 39 |
40 EXPECT_TRUE(args.Equals(ReturnsEnumAsType::Results::Create( | 40 EXPECT_TRUE(args.Equals(ReturnsEnumAsType::Results::Create( |
41 ENUMERATION_ONE).get())); | 41 ENUMERATION_ONE).get())); |
42 } | 42 } |
43 { | 43 { |
44 HasEnumeration enumeration; | 44 HasEnumeration enumeration; |
45 DictionaryValue value; | 45 base::DictionaryValue value; |
46 ASSERT_FALSE(HasEnumeration::Populate(value, &enumeration)); | 46 ASSERT_FALSE(HasEnumeration::Populate(value, &enumeration)); |
47 | 47 |
48 value.Set("enumeration", Value::CreateStringValue("one")); | 48 value.Set("enumeration", base::Value::CreateStringValue("one")); |
49 ASSERT_TRUE(HasEnumeration::Populate(value, &enumeration)); | 49 ASSERT_TRUE(HasEnumeration::Populate(value, &enumeration)); |
50 EXPECT_TRUE(value.Equals(enumeration.ToValue().get())); | 50 EXPECT_TRUE(value.Equals(enumeration.ToValue().get())); |
51 | 51 |
52 value.Set("optional_enumeration", Value::CreateStringValue("two")); | 52 value.Set("optional_enumeration", base::Value::CreateStringValue("two")); |
53 ASSERT_TRUE(HasEnumeration::Populate(value, &enumeration)); | 53 ASSERT_TRUE(HasEnumeration::Populate(value, &enumeration)); |
54 EXPECT_TRUE(value.Equals(enumeration.ToValue().get())); | 54 EXPECT_TRUE(value.Equals(enumeration.ToValue().get())); |
55 } | 55 } |
56 } | 56 } |
57 | 57 |
58 TEST(JsonSchemaCompilerEnumsTest, EnumsArrayAsType) { | 58 TEST(JsonSchemaCompilerEnumsTest, EnumsArrayAsType) { |
59 { | 59 { |
60 ListValue params_value; | 60 base::ListValue params_value; |
61 params_value.Append(List(Value::CreateStringValue("one"), | 61 params_value.Append(List(base::Value::CreateStringValue("one"), |
62 Value::CreateStringValue("two")).release()); | 62 base::Value::CreateStringValue("two")).release()); |
63 scoped_ptr<TakesEnumArrayAsType::Params> params( | 63 scoped_ptr<TakesEnumArrayAsType::Params> params( |
64 TakesEnumArrayAsType::Params::Create(params_value)); | 64 TakesEnumArrayAsType::Params::Create(params_value)); |
65 ASSERT_TRUE(params); | 65 ASSERT_TRUE(params); |
66 EXPECT_EQ(2U, params->values.size()); | 66 EXPECT_EQ(2U, params->values.size()); |
67 EXPECT_EQ(ENUMERATION_ONE, params->values[0]); | 67 EXPECT_EQ(ENUMERATION_ONE, params->values[0]); |
68 EXPECT_EQ(ENUMERATION_TWO, params->values[1]); | 68 EXPECT_EQ(ENUMERATION_TWO, params->values[1]); |
69 } | 69 } |
70 { | 70 { |
71 ListValue params_value; | 71 base::ListValue params_value; |
72 params_value.Append(List(Value::CreateStringValue("invalid")).release()); | 72 params_value.Append( |
| 73 List(base::Value::CreateStringValue("invalid")).release()); |
73 scoped_ptr<TakesEnumArrayAsType::Params> params( | 74 scoped_ptr<TakesEnumArrayAsType::Params> params( |
74 TakesEnumArrayAsType::Params::Create(params_value)); | 75 TakesEnumArrayAsType::Params::Create(params_value)); |
75 EXPECT_FALSE(params); | 76 EXPECT_FALSE(params); |
76 } | 77 } |
77 } | 78 } |
78 | 79 |
79 TEST(JsonSchemaCompilerEnumsTest, ReturnsEnumCreate) { | 80 TEST(JsonSchemaCompilerEnumsTest, ReturnsEnumCreate) { |
80 { | 81 { |
81 ReturnsEnum::Results::State state = ReturnsEnum::Results::STATE_FOO; | 82 ReturnsEnum::Results::State state = ReturnsEnum::Results::STATE_FOO; |
82 scoped_ptr<Value> result( | 83 scoped_ptr<base::Value> result( |
83 new base::StringValue(ReturnsEnum::Results::ToString(state))); | 84 new base::StringValue(ReturnsEnum::Results::ToString(state))); |
84 scoped_ptr<Value> expected(Value::CreateStringValue("foo")); | 85 scoped_ptr<base::Value> expected(base::Value::CreateStringValue("foo")); |
85 EXPECT_TRUE(result->Equals(expected.get())); | 86 EXPECT_TRUE(result->Equals(expected.get())); |
86 } | 87 } |
87 { | 88 { |
88 ReturnsEnum::Results::State state = ReturnsEnum::Results::STATE_FOO; | 89 ReturnsEnum::Results::State state = ReturnsEnum::Results::STATE_FOO; |
89 scoped_ptr<ListValue> results = ReturnsEnum::Results::Create(state); | 90 scoped_ptr<base::ListValue> results = ReturnsEnum::Results::Create(state); |
90 ListValue expected; | 91 base::ListValue expected; |
91 expected.Append(Value::CreateStringValue("foo")); | 92 expected.Append(base::Value::CreateStringValue("foo")); |
92 EXPECT_TRUE(results->Equals(&expected)); | 93 EXPECT_TRUE(results->Equals(&expected)); |
93 } | 94 } |
94 } | 95 } |
95 | 96 |
96 TEST(JsonSchemaCompilerEnumsTest, ReturnsTwoEnumsCreate) { | 97 TEST(JsonSchemaCompilerEnumsTest, ReturnsTwoEnumsCreate) { |
97 { | 98 { |
98 scoped_ptr<ListValue> results = ReturnsTwoEnums::Results::Create( | 99 scoped_ptr<base::ListValue> results = ReturnsTwoEnums::Results::Create( |
99 ReturnsTwoEnums::Results::FIRST_STATE_FOO, | 100 ReturnsTwoEnums::Results::FIRST_STATE_FOO, |
100 ReturnsTwoEnums::Results::SECOND_STATE_HAM); | 101 ReturnsTwoEnums::Results::SECOND_STATE_HAM); |
101 ListValue expected; | 102 base::ListValue expected; |
102 expected.Append(Value::CreateStringValue("foo")); | 103 expected.Append(base::Value::CreateStringValue("foo")); |
103 expected.Append(Value::CreateStringValue("ham")); | 104 expected.Append(base::Value::CreateStringValue("ham")); |
104 EXPECT_TRUE(results->Equals(&expected)); | 105 EXPECT_TRUE(results->Equals(&expected)); |
105 } | 106 } |
106 } | 107 } |
107 | 108 |
108 TEST(JsonSchemaCompilerEnumsTest, OptionalEnumTypePopulate) { | 109 TEST(JsonSchemaCompilerEnumsTest, OptionalEnumTypePopulate) { |
109 { | 110 { |
110 OptionalEnumType enum_type; | 111 OptionalEnumType enum_type; |
111 DictionaryValue value; | 112 base::DictionaryValue value; |
112 value.Set("type", Value::CreateStringValue("two")); | 113 value.Set("type", base::Value::CreateStringValue("two")); |
113 EXPECT_TRUE(OptionalEnumType::Populate(value, &enum_type)); | 114 EXPECT_TRUE(OptionalEnumType::Populate(value, &enum_type)); |
114 EXPECT_EQ(OptionalEnumType::TYPE_TWO, enum_type.type); | 115 EXPECT_EQ(OptionalEnumType::TYPE_TWO, enum_type.type); |
115 EXPECT_TRUE(value.Equals(enum_type.ToValue().get())); | 116 EXPECT_TRUE(value.Equals(enum_type.ToValue().get())); |
116 } | 117 } |
117 { | 118 { |
118 OptionalEnumType enum_type; | 119 OptionalEnumType enum_type; |
119 DictionaryValue value; | 120 base::DictionaryValue value; |
120 EXPECT_TRUE(OptionalEnumType::Populate(value, &enum_type)); | 121 EXPECT_TRUE(OptionalEnumType::Populate(value, &enum_type)); |
121 EXPECT_EQ(OptionalEnumType::TYPE_NONE, enum_type.type); | 122 EXPECT_EQ(OptionalEnumType::TYPE_NONE, enum_type.type); |
122 EXPECT_TRUE(value.Equals(enum_type.ToValue().get())); | 123 EXPECT_TRUE(value.Equals(enum_type.ToValue().get())); |
123 } | 124 } |
124 { | 125 { |
125 OptionalEnumType enum_type; | 126 OptionalEnumType enum_type; |
126 DictionaryValue value; | 127 base::DictionaryValue value; |
127 value.Set("type", Value::CreateStringValue("invalid")); | 128 value.Set("type", base::Value::CreateStringValue("invalid")); |
128 EXPECT_FALSE(OptionalEnumType::Populate(value, &enum_type)); | 129 EXPECT_FALSE(OptionalEnumType::Populate(value, &enum_type)); |
129 } | 130 } |
130 } | 131 } |
131 | 132 |
132 TEST(JsonSchemaCompilerEnumsTest, TakesEnumParamsCreate) { | 133 TEST(JsonSchemaCompilerEnumsTest, TakesEnumParamsCreate) { |
133 { | 134 { |
134 ListValue params_value; | 135 base::ListValue params_value; |
135 params_value.Append(Value::CreateStringValue("baz")); | 136 params_value.Append(base::Value::CreateStringValue("baz")); |
136 scoped_ptr<TakesEnum::Params> params( | 137 scoped_ptr<TakesEnum::Params> params( |
137 TakesEnum::Params::Create(params_value)); | 138 TakesEnum::Params::Create(params_value)); |
138 EXPECT_TRUE(params.get()); | 139 EXPECT_TRUE(params.get()); |
139 EXPECT_EQ(TakesEnum::Params::STATE_BAZ, params->state); | 140 EXPECT_EQ(TakesEnum::Params::STATE_BAZ, params->state); |
140 } | 141 } |
141 { | 142 { |
142 ListValue params_value; | 143 base::ListValue params_value; |
143 params_value.Append(Value::CreateStringValue("invalid")); | 144 params_value.Append(base::Value::CreateStringValue("invalid")); |
144 scoped_ptr<TakesEnum::Params> params( | 145 scoped_ptr<TakesEnum::Params> params( |
145 TakesEnum::Params::Create(params_value)); | 146 TakesEnum::Params::Create(params_value)); |
146 EXPECT_FALSE(params.get()); | 147 EXPECT_FALSE(params.get()); |
147 } | 148 } |
148 } | 149 } |
149 | 150 |
150 TEST(JsonSchemaCompilerEnumsTest, TakesEnumArrayParamsCreate) { | 151 TEST(JsonSchemaCompilerEnumsTest, TakesEnumArrayParamsCreate) { |
151 { | 152 { |
152 ListValue params_value; | 153 base::ListValue params_value; |
153 params_value.Append(List(Value::CreateStringValue("foo"), | 154 params_value.Append(List(base::Value::CreateStringValue("foo"), |
154 Value::CreateStringValue("bar")).release()); | 155 base::Value::CreateStringValue("bar")).release()); |
155 scoped_ptr<TakesEnumArray::Params> params( | 156 scoped_ptr<TakesEnumArray::Params> params( |
156 TakesEnumArray::Params::Create(params_value)); | 157 TakesEnumArray::Params::Create(params_value)); |
157 ASSERT_TRUE(params); | 158 ASSERT_TRUE(params); |
158 EXPECT_EQ(2U, params->values.size()); | 159 EXPECT_EQ(2U, params->values.size()); |
159 EXPECT_EQ(TakesEnumArray::Params::VALUES_TYPE_FOO, params->values[0]); | 160 EXPECT_EQ(TakesEnumArray::Params::VALUES_TYPE_FOO, params->values[0]); |
160 EXPECT_EQ(TakesEnumArray::Params::VALUES_TYPE_BAR, params->values[1]); | 161 EXPECT_EQ(TakesEnumArray::Params::VALUES_TYPE_BAR, params->values[1]); |
161 } | 162 } |
162 { | 163 { |
163 ListValue params_value; | 164 base::ListValue params_value; |
164 params_value.Append(List(Value::CreateStringValue("invalid")).release()); | 165 params_value.Append( |
| 166 List(base::Value::CreateStringValue("invalid")).release()); |
165 scoped_ptr<TakesEnumArray::Params> params( | 167 scoped_ptr<TakesEnumArray::Params> params( |
166 TakesEnumArray::Params::Create(params_value)); | 168 TakesEnumArray::Params::Create(params_value)); |
167 EXPECT_FALSE(params); | 169 EXPECT_FALSE(params); |
168 } | 170 } |
169 } | 171 } |
170 | 172 |
171 TEST(JsonSchemaCompilerEnumsTest, TakesOptionalEnumParamsCreate) { | 173 TEST(JsonSchemaCompilerEnumsTest, TakesOptionalEnumParamsCreate) { |
172 { | 174 { |
173 ListValue params_value; | 175 base::ListValue params_value; |
174 params_value.Append(Value::CreateStringValue("baz")); | 176 params_value.Append(base::Value::CreateStringValue("baz")); |
175 scoped_ptr<TakesOptionalEnum::Params> params( | 177 scoped_ptr<TakesOptionalEnum::Params> params( |
176 TakesOptionalEnum::Params::Create(params_value)); | 178 TakesOptionalEnum::Params::Create(params_value)); |
177 EXPECT_TRUE(params.get()); | 179 EXPECT_TRUE(params.get()); |
178 EXPECT_EQ(TakesOptionalEnum::Params::STATE_BAZ, params->state); | 180 EXPECT_EQ(TakesOptionalEnum::Params::STATE_BAZ, params->state); |
179 } | 181 } |
180 { | 182 { |
181 ListValue params_value; | 183 base::ListValue params_value; |
182 scoped_ptr<TakesOptionalEnum::Params> params( | 184 scoped_ptr<TakesOptionalEnum::Params> params( |
183 TakesOptionalEnum::Params::Create(params_value)); | 185 TakesOptionalEnum::Params::Create(params_value)); |
184 EXPECT_TRUE(params.get()); | 186 EXPECT_TRUE(params.get()); |
185 EXPECT_EQ(TakesOptionalEnum::Params::STATE_NONE, params->state); | 187 EXPECT_EQ(TakesOptionalEnum::Params::STATE_NONE, params->state); |
186 } | 188 } |
187 { | 189 { |
188 ListValue params_value; | 190 base::ListValue params_value; |
189 params_value.Append(Value::CreateStringValue("invalid")); | 191 params_value.Append(base::Value::CreateStringValue("invalid")); |
190 scoped_ptr<TakesOptionalEnum::Params> params( | 192 scoped_ptr<TakesOptionalEnum::Params> params( |
191 TakesOptionalEnum::Params::Create(params_value)); | 193 TakesOptionalEnum::Params::Create(params_value)); |
192 EXPECT_FALSE(params.get()); | 194 EXPECT_FALSE(params.get()); |
193 } | 195 } |
194 } | 196 } |
195 | 197 |
196 TEST(JsonSchemaCompilerEnumsTest, TakesMultipleOptionalEnumsParamsCreate) { | 198 TEST(JsonSchemaCompilerEnumsTest, TakesMultipleOptionalEnumsParamsCreate) { |
197 { | 199 { |
198 ListValue params_value; | 200 base::ListValue params_value; |
199 params_value.Append(Value::CreateStringValue("foo")); | 201 params_value.Append(base::Value::CreateStringValue("foo")); |
200 params_value.Append(Value::CreateStringValue("foo")); | 202 params_value.Append(base::Value::CreateStringValue("foo")); |
201 scoped_ptr<TakesMultipleOptionalEnums::Params> params( | 203 scoped_ptr<TakesMultipleOptionalEnums::Params> params( |
202 TakesMultipleOptionalEnums::Params::Create(params_value)); | 204 TakesMultipleOptionalEnums::Params::Create(params_value)); |
203 EXPECT_TRUE(params.get()); | 205 EXPECT_TRUE(params.get()); |
204 EXPECT_EQ(TakesMultipleOptionalEnums::Params::STATE_FOO, params->state); | 206 EXPECT_EQ(TakesMultipleOptionalEnums::Params::STATE_FOO, params->state); |
205 EXPECT_EQ(TakesMultipleOptionalEnums::Params::TYPE_FOO, params->type); | 207 EXPECT_EQ(TakesMultipleOptionalEnums::Params::TYPE_FOO, params->type); |
206 } | 208 } |
207 { | 209 { |
208 ListValue params_value; | 210 base::ListValue params_value; |
209 params_value.Append(Value::CreateStringValue("foo")); | 211 params_value.Append(base::Value::CreateStringValue("foo")); |
210 scoped_ptr<TakesMultipleOptionalEnums::Params> params( | 212 scoped_ptr<TakesMultipleOptionalEnums::Params> params( |
211 TakesMultipleOptionalEnums::Params::Create(params_value)); | 213 TakesMultipleOptionalEnums::Params::Create(params_value)); |
212 EXPECT_TRUE(params.get()); | 214 EXPECT_TRUE(params.get()); |
213 EXPECT_EQ(TakesMultipleOptionalEnums::Params::STATE_FOO, params->state); | 215 EXPECT_EQ(TakesMultipleOptionalEnums::Params::STATE_FOO, params->state); |
214 EXPECT_EQ(TakesMultipleOptionalEnums::Params::TYPE_NONE, params->type); | 216 EXPECT_EQ(TakesMultipleOptionalEnums::Params::TYPE_NONE, params->type); |
215 } | 217 } |
216 { | 218 { |
217 ListValue params_value; | 219 base::ListValue params_value; |
218 scoped_ptr<TakesMultipleOptionalEnums::Params> params( | 220 scoped_ptr<TakesMultipleOptionalEnums::Params> params( |
219 TakesMultipleOptionalEnums::Params::Create(params_value)); | 221 TakesMultipleOptionalEnums::Params::Create(params_value)); |
220 EXPECT_TRUE(params.get()); | 222 EXPECT_TRUE(params.get()); |
221 EXPECT_EQ(TakesMultipleOptionalEnums::Params::STATE_NONE, params->state); | 223 EXPECT_EQ(TakesMultipleOptionalEnums::Params::STATE_NONE, params->state); |
222 EXPECT_EQ(TakesMultipleOptionalEnums::Params::TYPE_NONE, params->type); | 224 EXPECT_EQ(TakesMultipleOptionalEnums::Params::TYPE_NONE, params->type); |
223 } | 225 } |
224 { | 226 { |
225 ListValue params_value; | 227 base::ListValue params_value; |
226 params_value.Append(Value::CreateStringValue("baz")); | 228 params_value.Append(base::Value::CreateStringValue("baz")); |
227 params_value.Append(Value::CreateStringValue("invalid")); | 229 params_value.Append(base::Value::CreateStringValue("invalid")); |
228 scoped_ptr<TakesMultipleOptionalEnums::Params> params( | 230 scoped_ptr<TakesMultipleOptionalEnums::Params> params( |
229 TakesMultipleOptionalEnums::Params::Create(params_value)); | 231 TakesMultipleOptionalEnums::Params::Create(params_value)); |
230 EXPECT_FALSE(params.get()); | 232 EXPECT_FALSE(params.get()); |
231 } | 233 } |
232 } | 234 } |
233 | 235 |
234 TEST(JsonSchemaCompilerEnumsTest, OnEnumFiredCreate) { | 236 TEST(JsonSchemaCompilerEnumsTest, OnEnumFiredCreate) { |
235 { | 237 { |
236 OnEnumFired::SomeEnum some_enum = OnEnumFired::SOME_ENUM_FOO; | 238 OnEnumFired::SomeEnum some_enum = OnEnumFired::SOME_ENUM_FOO; |
237 scoped_ptr<Value> result( | 239 scoped_ptr<base::Value> result( |
238 new base::StringValue(OnEnumFired::ToString(some_enum))); | 240 new base::StringValue(OnEnumFired::ToString(some_enum))); |
239 scoped_ptr<Value> expected(Value::CreateStringValue("foo")); | 241 scoped_ptr<base::Value> expected(base::Value::CreateStringValue("foo")); |
240 EXPECT_TRUE(result->Equals(expected.get())); | 242 EXPECT_TRUE(result->Equals(expected.get())); |
241 } | 243 } |
242 { | 244 { |
243 OnEnumFired::SomeEnum some_enum = OnEnumFired::SOME_ENUM_FOO; | 245 OnEnumFired::SomeEnum some_enum = OnEnumFired::SOME_ENUM_FOO; |
244 scoped_ptr<ListValue> results(OnEnumFired::Create(some_enum)); | 246 scoped_ptr<base::ListValue> results(OnEnumFired::Create(some_enum)); |
245 ListValue expected; | 247 base::ListValue expected; |
246 expected.Append(Value::CreateStringValue("foo")); | 248 expected.Append(base::Value::CreateStringValue("foo")); |
247 EXPECT_TRUE(results->Equals(&expected)); | 249 EXPECT_TRUE(results->Equals(&expected)); |
248 } | 250 } |
249 } | 251 } |
250 | 252 |
251 TEST(JsonSchemaCompilerEnumsTest, OnTwoEnumsFiredCreate) { | 253 TEST(JsonSchemaCompilerEnumsTest, OnTwoEnumsFiredCreate) { |
252 { | 254 { |
253 scoped_ptr<Value> results(OnTwoEnumsFired::Create( | 255 scoped_ptr<base::Value> results(OnTwoEnumsFired::Create( |
254 OnTwoEnumsFired::FIRST_ENUM_FOO, | 256 OnTwoEnumsFired::FIRST_ENUM_FOO, |
255 OnTwoEnumsFired::SECOND_ENUM_HAM)); | 257 OnTwoEnumsFired::SECOND_ENUM_HAM)); |
256 ListValue expected; | 258 base::ListValue expected; |
257 expected.Append(Value::CreateStringValue("foo")); | 259 expected.Append(base::Value::CreateStringValue("foo")); |
258 expected.Append(Value::CreateStringValue("ham")); | 260 expected.Append(base::Value::CreateStringValue("ham")); |
259 EXPECT_TRUE(results->Equals(&expected)); | 261 EXPECT_TRUE(results->Equals(&expected)); |
260 } | 262 } |
261 } | 263 } |
OLD | NEW |