diff options
| author | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 20:27:29 +0000 |
|---|---|---|
| committer | darin@google.com <darin@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-14 20:27:29 +0000 |
| commit | cb2f36323ab5dbecc2ecc6e00ec04956e49b356b (patch) | |
| tree | 1147a72e3e49ffb869aa67e8084309ed4d616c54 /base/json_reader_unittest.cc | |
| parent | edc286198b90c629bbf6081440512d02aef603d8 (diff) | |
| download | chromium_src-cb2f36323ab5dbecc2ecc6e00ec04956e49b356b.zip chromium_src-cb2f36323ab5dbecc2ecc6e00ec04956e49b356b.tar.gz chromium_src-cb2f36323ab5dbecc2ecc6e00ec04956e49b356b.tar.bz2 | |
Fix some compiler warnings, and cleanup EXPECT_EQ comparisons. Hello "U" suffix :-)
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@882 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json_reader_unittest.cc')
| -rw-r--r-- | base/json_reader_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/base/json_reader_unittest.cc b/base/json_reader_unittest.cc index da902f2..13c4228 100644 --- a/base/json_reader_unittest.cc +++ b/base/json_reader_unittest.cc @@ -291,7 +291,7 @@ TEST(JSONReaderTest, Reading) { ASSERT_TRUE(root); ASSERT_TRUE(root->IsType(Value::TYPE_LIST)); ListValue* list = static_cast<ListValue*>(root); - ASSERT_EQ(static_cast<size_t>(3), list->GetSize()); + ASSERT_EQ(3U, list->GetSize()); // Test with trailing comma. Should be parsed the same as above. Value* root2 = NULL; @@ -306,7 +306,7 @@ TEST(JSONReaderTest, Reading) { ASSERT_TRUE(root); ASSERT_TRUE(root->IsType(Value::TYPE_LIST)); list = static_cast<ListValue*>(root); - ASSERT_EQ(static_cast<size_t>(0), list->GetSize()); + ASSERT_EQ(0U, list->GetSize()); delete root; // Nested arrays @@ -316,7 +316,7 @@ TEST(JSONReaderTest, Reading) { ASSERT_TRUE(root); ASSERT_TRUE(root->IsType(Value::TYPE_LIST)); list = static_cast<ListValue*>(root); - ASSERT_EQ(static_cast<size_t>(4), list->GetSize()); + ASSERT_EQ(4U, list->GetSize()); // Lots of trailing commas. root2 = NULL; @@ -354,7 +354,7 @@ TEST(JSONReaderTest, Reading) { ASSERT_TRUE(root); ASSERT_TRUE(root->IsType(Value::TYPE_LIST)); list = static_cast<ListValue*>(root); - EXPECT_EQ(static_cast<size_t>(1), list->GetSize()); + EXPECT_EQ(1U, list->GetSize()); Value* tmp_value = NULL; ASSERT_TRUE(list->Get(0, &tmp_value)); EXPECT_TRUE(tmp_value->IsType(Value::TYPE_BOOLEAN)); @@ -418,7 +418,7 @@ TEST(JSONReaderTest, Reading) { ASSERT_TRUE(dict_val->GetDictionary(L"inner", &inner_dict)); ListValue* inner_array = NULL; ASSERT_TRUE(inner_dict->GetList(L"array", &inner_array)); - ASSERT_EQ(static_cast<size_t>(1), inner_array->GetSize()); + ASSERT_EQ(1U, inner_array->GetSize()); bool_value = true; ASSERT_TRUE(dict_val->GetBoolean(L"false", &bool_value)); ASSERT_FALSE(bool_value); @@ -492,7 +492,7 @@ TEST(JSONReaderTest, Reading) { ASSERT_TRUE(root); ASSERT_TRUE(root->IsType(Value::TYPE_LIST)); list = static_cast<ListValue*>(root); - ASSERT_EQ(static_cast<size_t>(5001), list->GetSize()); + ASSERT_EQ(5001U, list->GetSize()); delete root; // Test utf8 encoded input |