diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 22:59:43 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 22:59:43 +0000 |
| commit | 8e50b600ed1e65789109022709cf5c349748fb4c (patch) | |
| tree | d9d57344003604647e1a96a56ef4d21921ec44c0 /base/json_reader_unittest.cc | |
| parent | 0c8a8f7aa683ae7d6c8ba176c1db704cc294defb (diff) | |
| download | chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.zip chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.tar.gz chromium_src-8e50b600ed1e65789109022709cf5c349748fb4c.tar.bz2 | |
revert broken change 10833
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10837 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/json_reader_unittest.cc')
| -rw-r--r-- | base/json_reader_unittest.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/base/json_reader_unittest.cc b/base/json_reader_unittest.cc index bd64162..9153289 100644 --- a/base/json_reader_unittest.cc +++ b/base/json_reader_unittest.cc @@ -5,7 +5,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/json_reader.h" #include "base/scoped_ptr.h" -#include "base/string_util.h" #include "base/values.h" #include "build/build_config.h" @@ -298,14 +297,14 @@ TEST(JSONReaderTest, Reading) { ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); DictionaryValue* dict_val = static_cast<DictionaryValue*>(root.get()); real_val = 0.0; - ASSERT_TRUE(dict_val->GetReal(ASCIIToUTF16("number"), &real_val)); + ASSERT_TRUE(dict_val->GetReal(L"number", &real_val)); ASSERT_DOUBLE_EQ(9.87654321, real_val); Value* null_val = NULL; - ASSERT_TRUE(dict_val->Get(ASCIIToUTF16("null"), &null_val)); + ASSERT_TRUE(dict_val->Get(L"null", &null_val)); ASSERT_TRUE(null_val->IsType(Value::TYPE_NULL)); - string16 str16_val; - ASSERT_TRUE(dict_val->GetString(ASCIIToUTF16("S"), &str16_val)); - ASSERT_EQ(ASCIIToUTF16("str"), str16_val); + str_val.clear(); + ASSERT_TRUE(dict_val->GetString(L"S", &str_val)); + ASSERT_EQ(L"str", str_val); root2.reset(JSONReader::Read( "{\"number\":9.87654321, \"null\":null , \"\\x53\" : \"str\", }", true)); @@ -318,15 +317,15 @@ TEST(JSONReaderTest, Reading) { ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); dict_val = static_cast<DictionaryValue*>(root.get()); DictionaryValue* inner_dict = NULL; - ASSERT_TRUE(dict_val->GetDictionary(ASCIIToUTF16("inner"), &inner_dict)); + ASSERT_TRUE(dict_val->GetDictionary(L"inner", &inner_dict)); ListValue* inner_array = NULL; - ASSERT_TRUE(inner_dict->GetList(ASCIIToUTF16("array"), &inner_array)); + ASSERT_TRUE(inner_dict->GetList(L"array", &inner_array)); ASSERT_EQ(1U, inner_array->GetSize()); bool_value = true; - ASSERT_TRUE(dict_val->GetBoolean(ASCIIToUTF16("false"), &bool_value)); + ASSERT_TRUE(dict_val->GetBoolean(L"false", &bool_value)); ASSERT_FALSE(bool_value); inner_dict = NULL; - ASSERT_TRUE(dict_val->GetDictionary(ASCIIToUTF16("d"), &inner_dict)); + ASSERT_TRUE(dict_val->GetDictionary(L"d", &inner_dict)); root2.reset(JSONReader::Read( "{\"inner\": {\"array\":[true] , },\"false\":false,\"d\":{},}", true)); |