| 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/arrays.h" | 5 #include "tools/json_schema_compiler/test/arrays.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/enums.h" | 8 #include "tools/json_schema_compiler/test/enums.h" |
| 9 | 9 |
| 10 using namespace test::api::arrays; | 10 using namespace test::api::arrays; |
| 11 | 11 |
| 12 namespace { | 12 namespace { |
| 13 | 13 |
| 14 // TODO(calamity): Change to AppendString etc once kalman's patch goes through | 14 // TODO(calamity): Change to AppendString etc once kalman's patch goes through |
| 15 static scoped_ptr<base::DictionaryValue> CreateBasicArrayTypeDictionary() { | 15 static scoped_ptr<base::DictionaryValue> CreateBasicArrayTypeDictionary() { |
| 16 base::DictionaryValue* value = new base::DictionaryValue(); | 16 base::DictionaryValue* value = new base::DictionaryValue(); |
| 17 base::ListValue* strings_value = new base::ListValue(); | 17 base::ListValue* strings_value = new base::ListValue(); |
| 18 strings_value->Append(base::Value::CreateStringValue("a")); | 18 strings_value->Append(new base::StringValue("a")); |
| 19 strings_value->Append(base::Value::CreateStringValue("b")); | 19 strings_value->Append(new base::StringValue("b")); |
| 20 strings_value->Append(base::Value::CreateStringValue("c")); | 20 strings_value->Append(new base::StringValue("c")); |
| 21 strings_value->Append(base::Value::CreateStringValue("it's easy as")); | 21 strings_value->Append(new base::StringValue("it's easy as")); |
| 22 base::ListValue* integers_value = new base::ListValue(); | 22 base::ListValue* integers_value = new base::ListValue(); |
| 23 integers_value->Append(new base::FundamentalValue(1)); | 23 integers_value->Append(new base::FundamentalValue(1)); |
| 24 integers_value->Append(new base::FundamentalValue(2)); | 24 integers_value->Append(new base::FundamentalValue(2)); |
| 25 integers_value->Append(new base::FundamentalValue(3)); | 25 integers_value->Append(new base::FundamentalValue(3)); |
| 26 base::ListValue* booleans_value = new base::ListValue(); | 26 base::ListValue* booleans_value = new base::ListValue(); |
| 27 booleans_value->Append(new base::FundamentalValue(false)); | 27 booleans_value->Append(new base::FundamentalValue(false)); |
| 28 booleans_value->Append(new base::FundamentalValue(true)); | 28 booleans_value->Append(new base::FundamentalValue(true)); |
| 29 base::ListValue* numbers_value = new base::ListValue(); | 29 base::ListValue* numbers_value = new base::ListValue(); |
| 30 numbers_value->Append(base::Value::CreateDoubleValue(6.1)); | 30 numbers_value->Append(base::Value::CreateDoubleValue(6.1)); |
| 31 value->Set("numbers", numbers_value); | 31 value->Set("numbers", numbers_value); |
| (...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 base::DictionaryValue value; | 178 base::DictionaryValue value; |
| 179 value.Set("types", types.release()); | 179 value.Set("types", types.release()); |
| 180 | 180 |
| 181 OptionalEnumArrayType enum_array_type; | 181 OptionalEnumArrayType enum_array_type; |
| 182 ASSERT_TRUE(OptionalEnumArrayType::Populate(value, &enum_array_type)); | 182 ASSERT_TRUE(OptionalEnumArrayType::Populate(value, &enum_array_type)); |
| 183 EXPECT_EQ(enums, *enum_array_type.types); | 183 EXPECT_EQ(enums, *enum_array_type.types); |
| 184 } | 184 } |
| 185 { | 185 { |
| 186 base::DictionaryValue value; | 186 base::DictionaryValue value; |
| 187 scoped_ptr<base::ListValue> enum_array(new base::ListValue()); | 187 scoped_ptr<base::ListValue> enum_array(new base::ListValue()); |
| 188 enum_array->Append(base::Value::CreateStringValue("invalid")); | 188 enum_array->Append(new base::StringValue("invalid")); |
| 189 | 189 |
| 190 value.Set("types", enum_array.release()); | 190 value.Set("types", enum_array.release()); |
| 191 OptionalEnumArrayType enum_array_type; | 191 OptionalEnumArrayType enum_array_type; |
| 192 ASSERT_FALSE(OptionalEnumArrayType::Populate(value, &enum_array_type)); | 192 ASSERT_FALSE(OptionalEnumArrayType::Populate(value, &enum_array_type)); |
| 193 EXPECT_TRUE(enum_array_type.types->empty()); | 193 EXPECT_TRUE(enum_array_type.types->empty()); |
| 194 } | 194 } |
| 195 } | 195 } |
| 196 | 196 |
| 197 TEST(JsonSchemaCompilerArrayTest, RefArrayType) { | 197 TEST(JsonSchemaCompilerArrayTest, RefArrayType) { |
| 198 { | 198 { |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 233 ASSERT_EQ(3u, params->nums.size()); | 233 ASSERT_EQ(3u, params->nums.size()); |
| 234 EXPECT_EQ(2, params->nums[0]); | 234 EXPECT_EQ(2, params->nums[0]); |
| 235 EXPECT_EQ(4, params->nums[1]); | 235 EXPECT_EQ(4, params->nums[1]); |
| 236 EXPECT_EQ(8, params->nums[2]); | 236 EXPECT_EQ(8, params->nums[2]); |
| 237 } | 237 } |
| 238 | 238 |
| 239 TEST(JsonSchemaCompilerArrayTest, AnyArrayParamsCreate) { | 239 TEST(JsonSchemaCompilerArrayTest, AnyArrayParamsCreate) { |
| 240 scoped_ptr<base::ListValue> params_value(new base::ListValue()); | 240 scoped_ptr<base::ListValue> params_value(new base::ListValue()); |
| 241 scoped_ptr<base::ListValue> any_array(new base::ListValue()); | 241 scoped_ptr<base::ListValue> any_array(new base::ListValue()); |
| 242 any_array->Append(new base::FundamentalValue(1)); | 242 any_array->Append(new base::FundamentalValue(1)); |
| 243 any_array->Append(base::Value::CreateStringValue("test")); | 243 any_array->Append(new base::StringValue("test")); |
| 244 any_array->Append(CreateItemValue(2)); | 244 any_array->Append(CreateItemValue(2)); |
| 245 params_value->Append(any_array.release()); | 245 params_value->Append(any_array.release()); |
| 246 scoped_ptr<AnyArray::Params> params( | 246 scoped_ptr<AnyArray::Params> params( |
| 247 AnyArray::Params::Create(*params_value)); | 247 AnyArray::Params::Create(*params_value)); |
| 248 EXPECT_TRUE(params.get()); | 248 EXPECT_TRUE(params.get()); |
| 249 ASSERT_EQ(3u, params->anys.size()); | 249 ASSERT_EQ(3u, params->anys.size()); |
| 250 int int_temp = 0; | 250 int int_temp = 0; |
| 251 EXPECT_TRUE(params->anys[0]->GetAsInteger(&int_temp)); | 251 EXPECT_TRUE(params->anys[0]->GetAsInteger(&int_temp)); |
| 252 EXPECT_EQ(1, int_temp); | 252 EXPECT_EQ(1, int_temp); |
| 253 } | 253 } |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 308 base::ListValue* expected_argument = new base::ListValue(); | 308 base::ListValue* expected_argument = new base::ListValue(); |
| 309 base::DictionaryValue* first = new base::DictionaryValue(); | 309 base::DictionaryValue* first = new base::DictionaryValue(); |
| 310 first->SetInteger("val", 1); | 310 first->SetInteger("val", 1); |
| 311 expected_argument->Append(first); | 311 expected_argument->Append(first); |
| 312 base::DictionaryValue* second = new base::DictionaryValue(); | 312 base::DictionaryValue* second = new base::DictionaryValue(); |
| 313 second->SetInteger("val", 2); | 313 second->SetInteger("val", 2); |
| 314 expected_argument->Append(second); | 314 expected_argument->Append(second); |
| 315 expected.Append(expected_argument); | 315 expected.Append(expected_argument); |
| 316 EXPECT_TRUE(results->Equals(&expected)); | 316 EXPECT_TRUE(results->Equals(&expected)); |
| 317 } | 317 } |
| OLD | NEW |