Chromium Code Reviews| Index: tools/json_schema_compiler/test/arrays_unittest.cc |
| diff --git a/tools/json_schema_compiler/test/array_unittest.cc b/tools/json_schema_compiler/test/arrays_unittest.cc |
| similarity index 94% |
| rename from tools/json_schema_compiler/test/array_unittest.cc |
| rename to tools/json_schema_compiler/test/arrays_unittest.cc |
| index 6db2d5e04cf516e4010e1093165ad02d887582f4..4749d979e25ff826975b0d2576d66e6b6fddba96 100644 |
| --- a/tools/json_schema_compiler/test/array_unittest.cc |
| +++ b/tools/json_schema_compiler/test/arrays_unittest.cc |
| @@ -2,11 +2,11 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#include "tools/json_schema_compiler/test/array.h" |
| +#include "tools/json_schema_compiler/test/arrays.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| -using namespace test::api::array; |
| +using namespace test::api::arrays; |
| namespace { |
| @@ -61,7 +61,7 @@ TEST(JsonSchemaCompilerArrayTest, RefArrayType) { |
| value->Set("refs", ref_array.release()); |
| scoped_ptr<RefArrayType> ref_array_type(new RefArrayType()); |
| EXPECT_TRUE(RefArrayType::Populate(*value, ref_array_type.get())); |
| - EXPECT_EQ(3UL, ref_array_type->refs.size()); |
| + EXPECT_EQ((size_t)3, ref_array_type->refs.size()); |
|
not at google - send to devlin
2012/02/27 06:04:47
nit: space between size_t and 3 (and everywhere el
calamity
2012/02/28 01:01:45
Done.
|
| EXPECT_EQ(1, ref_array_type->refs[0]->val); |
| EXPECT_EQ(2, ref_array_type->refs[1]->val); |
| EXPECT_EQ(3, ref_array_type->refs[2]->val); |
| @@ -87,7 +87,7 @@ TEST(JsonSchemaCompilerArrayTest, IntegerArrayParamsCreate) { |
| scoped_ptr<IntegerArray::Params> params( |
| IntegerArray::Params::Create(*params_value)); |
| EXPECT_TRUE(params.get()); |
| - EXPECT_EQ(3UL, params->nums.size()); |
| + EXPECT_EQ((size_t)3, params->nums.size()); |
| EXPECT_EQ(2, params->nums[0]); |
| EXPECT_EQ(4, params->nums[1]); |
| EXPECT_EQ(8, params->nums[2]); |
| @@ -102,7 +102,7 @@ TEST(JsonSchemaCompilerArrayTest, RefArrayParamsCreate) { |
| scoped_ptr<RefArray::Params> params( |
| RefArray::Params::Create(*params_value)); |
| EXPECT_TRUE(params.get()); |
| - EXPECT_EQ(2UL, params->refs.size()); |
| + EXPECT_EQ((size_t)2, params->refs.size()); |
| EXPECT_EQ(1, params->refs[0]->val); |
| EXPECT_EQ(2, params->refs[1]->val); |
| } |
| @@ -115,7 +115,7 @@ TEST(JsonSchemaCompilerArrayTest, ReturnIntegerArrayResultCreate) { |
| ListValue* list = NULL; |
| EXPECT_TRUE(result->GetAsList(&list)); |
| int temp; |
| - EXPECT_EQ(2UL, list->GetSize()); |
| + EXPECT_EQ((size_t)2, list->GetSize()); |
| EXPECT_TRUE(list->GetInteger(0, &temp)); |
| EXPECT_EQ(1, temp); |
| EXPECT_TRUE(list->GetInteger(1, &temp)); |
| @@ -131,7 +131,7 @@ TEST(JsonSchemaCompilerArrayTest, ReturnRefArrayResultCreate) { |
| scoped_ptr<Value> result(ReturnRefArray::Result::Create(items)); |
| ListValue* list = NULL; |
| EXPECT_TRUE(result->GetAsList(&list)); |
| - EXPECT_EQ(2UL, list->GetSize()); |
| + EXPECT_EQ((size_t)2, list->GetSize()); |
| DictionaryValue* item_value = NULL; |
| int temp; |
| EXPECT_TRUE(list->GetDictionary(0, &item_value)); |