Index: base/json/json_reader_unittest.cc |
diff --git a/base/json/json_reader_unittest.cc b/base/json/json_reader_unittest.cc |
index a7aeaf0f5569fb7ca776af264d2a4eb2d99f97f2..7e8c47215d8583e4709f84b46c368af461006209 100644 |
--- a/base/json/json_reader_unittest.cc |
+++ b/base/json/json_reader_unittest.cc |
@@ -17,7 +17,7 @@ TEST(JSONReaderTest, Reading) { |
scoped_ptr<Value> root; |
root.reset(JSONReader().JsonToValue(" null ", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_NULL)); |
+ ASSERT_TRUE(root->IsNull()); |
// Invalid JSON string |
root.reset(JSONReader().JsonToValue("nu", false, false)); |
@@ -26,22 +26,22 @@ TEST(JSONReaderTest, Reading) { |
// Simple bool |
root.reset(JSONReader().JsonToValue("true ", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_BOOLEAN)); |
+ ASSERT_TRUE(root->IsBoolean()); |
// Embedded comment |
root.reset(JSONReader().JsonToValue("/* comment */null", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_NULL)); |
+ ASSERT_TRUE(root->IsNull()); |
root.reset(JSONReader().JsonToValue("40 /* comment */", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_INTEGER)); |
+ ASSERT_TRUE(root->IsInteger()); |
root.reset(JSONReader().JsonToValue("true // comment", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_BOOLEAN)); |
+ ASSERT_TRUE(root->IsBoolean()); |
root.reset(JSONReader().JsonToValue("/* comment */\"sample string\"", |
false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_STRING)); |
+ ASSERT_TRUE(root->IsString()); |
std::string value; |
ASSERT_TRUE(root->GetAsString(&value)); |
ASSERT_EQ("sample string", value); |
@@ -49,7 +49,7 @@ TEST(JSONReaderTest, Reading) { |
// Test number formats |
root.reset(JSONReader().JsonToValue("43", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_INTEGER)); |
+ ASSERT_TRUE(root->IsInteger()); |
int int_val = 0; |
ASSERT_TRUE(root->GetAsInteger(&int_val)); |
ASSERT_EQ(43, int_val); |
@@ -66,7 +66,7 @@ TEST(JSONReaderTest, Reading) { |
// clause). |
root.reset(JSONReader().JsonToValue("0", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_INTEGER)); |
+ ASSERT_TRUE(root->IsInteger()); |
int_val = 1; |
ASSERT_TRUE(root->GetAsInteger(&int_val)); |
ASSERT_EQ(0, int_val); |
@@ -76,13 +76,13 @@ TEST(JSONReaderTest, Reading) { |
root.reset(JSONReader().JsonToValue("2147483648", false, false)); |
ASSERT_TRUE(root.get()); |
double double_val; |
- ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE)); |
+ ASSERT_TRUE(root->IsDouble()); |
double_val = 0.0; |
ASSERT_TRUE(root->GetAsDouble(&double_val)); |
ASSERT_DOUBLE_EQ(2147483648.0, double_val); |
root.reset(JSONReader().JsonToValue("-2147483649", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE)); |
+ ASSERT_TRUE(root->IsDouble()); |
double_val = 0.0; |
ASSERT_TRUE(root->GetAsDouble(&double_val)); |
ASSERT_DOUBLE_EQ(-2147483649.0, double_val); |
@@ -90,42 +90,42 @@ TEST(JSONReaderTest, Reading) { |
// Parse a double |
root.reset(JSONReader().JsonToValue("43.1", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE)); |
+ ASSERT_TRUE(root->IsDouble()); |
double_val = 0.0; |
ASSERT_TRUE(root->GetAsDouble(&double_val)); |
ASSERT_DOUBLE_EQ(43.1, double_val); |
root.reset(JSONReader().JsonToValue("4.3e-1", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE)); |
+ ASSERT_TRUE(root->IsDouble()); |
double_val = 0.0; |
ASSERT_TRUE(root->GetAsDouble(&double_val)); |
ASSERT_DOUBLE_EQ(.43, double_val); |
root.reset(JSONReader().JsonToValue("2.1e0", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE)); |
+ ASSERT_TRUE(root->IsDouble()); |
double_val = 0.0; |
ASSERT_TRUE(root->GetAsDouble(&double_val)); |
ASSERT_DOUBLE_EQ(2.1, double_val); |
root.reset(JSONReader().JsonToValue("2.1e+0001", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE)); |
+ ASSERT_TRUE(root->IsDouble()); |
double_val = 0.0; |
ASSERT_TRUE(root->GetAsDouble(&double_val)); |
ASSERT_DOUBLE_EQ(21.0, double_val); |
root.reset(JSONReader().JsonToValue("0.01", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE)); |
+ ASSERT_TRUE(root->IsDouble()); |
double_val = 0.0; |
ASSERT_TRUE(root->GetAsDouble(&double_val)); |
ASSERT_DOUBLE_EQ(0.01, double_val); |
root.reset(JSONReader().JsonToValue("1.00", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DOUBLE)); |
+ ASSERT_TRUE(root->IsDouble()); |
double_val = 0.0; |
ASSERT_TRUE(root->GetAsDouble(&double_val)); |
ASSERT_DOUBLE_EQ(1.0, double_val); |
@@ -169,7 +169,7 @@ TEST(JSONReaderTest, Reading) { |
// Test string parser |
root.reset(JSONReader().JsonToValue("\"hello world\"", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_STRING)); |
+ ASSERT_TRUE(root->IsString()); |
std::string str_val; |
ASSERT_TRUE(root->GetAsString(&str_val)); |
ASSERT_EQ("hello world", str_val); |
@@ -177,7 +177,7 @@ TEST(JSONReaderTest, Reading) { |
// Empty string |
root.reset(JSONReader().JsonToValue("\"\"", false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_STRING)); |
+ ASSERT_TRUE(root->IsString()); |
str_val.clear(); |
ASSERT_TRUE(root->GetAsString(&str_val)); |
ASSERT_EQ("", str_val); |
@@ -186,7 +186,7 @@ TEST(JSONReaderTest, Reading) { |
root.reset(JSONReader().JsonToValue("\" \\\"\\\\\\/\\b\\f\\n\\r\\t\\v\"", |
false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_STRING)); |
+ ASSERT_TRUE(root->IsString()); |
str_val.clear(); |
ASSERT_TRUE(root->GetAsString(&str_val)); |
ASSERT_EQ(" \"\\/\b\f\n\r\t\v", str_val); |
@@ -195,7 +195,7 @@ TEST(JSONReaderTest, Reading) { |
root.reset(JSONReader().JsonToValue("\"\\x41\\x00\\u1234\"", false, |
false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_STRING)); |
+ ASSERT_TRUE(root->IsString()); |
str_val.clear(); |
ASSERT_TRUE(root->GetAsString(&str_val)); |
ASSERT_EQ(std::wstring(L"A\0\x1234", 3), UTF8ToWide(str_val)); |
@@ -222,7 +222,7 @@ TEST(JSONReaderTest, Reading) { |
// Basic array |
root.reset(JSONReader::Read("[true, false, null]", false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_LIST)); |
+ ASSERT_TRUE(root->IsList()); |
ListValue* list = static_cast<ListValue*>(root.get()); |
ASSERT_EQ(3U, list->GetSize()); |
@@ -234,7 +234,7 @@ TEST(JSONReaderTest, Reading) { |
// Empty array |
root.reset(JSONReader::Read("[]", false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_LIST)); |
+ ASSERT_TRUE(root->IsList()); |
list = static_cast<ListValue*>(root.get()); |
ASSERT_EQ(0U, list->GetSize()); |
@@ -242,7 +242,7 @@ TEST(JSONReaderTest, Reading) { |
root.reset(JSONReader::Read("[[true], [], [false, [], [null]], null]", |
false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_LIST)); |
+ ASSERT_TRUE(root->IsList()); |
list = static_cast<ListValue*>(root.get()); |
ASSERT_EQ(4U, list->GetSize()); |
@@ -272,12 +272,12 @@ TEST(JSONReaderTest, Reading) { |
// Valid if we set |allow_trailing_comma| to true. |
root.reset(JSONReader::Read("[true,]", true)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_LIST)); |
+ ASSERT_TRUE(root->IsList()); |
list = static_cast<ListValue*>(root.get()); |
EXPECT_EQ(1U, list->GetSize()); |
Value* tmp_value = NULL; |
ASSERT_TRUE(list->Get(0, &tmp_value)); |
- EXPECT_TRUE(tmp_value->IsType(Value::TYPE_BOOLEAN)); |
+ EXPECT_TRUE(tmp_value->IsBoolean()); |
bool bool_value = false; |
ASSERT_TRUE(tmp_value->GetAsBoolean(&bool_value)); |
EXPECT_TRUE(bool_value); |
@@ -296,19 +296,19 @@ TEST(JSONReaderTest, Reading) { |
// Test objects |
root.reset(JSONReader::Read("{}", false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); |
+ ASSERT_TRUE(root->IsDictionary()); |
root.reset(JSONReader::Read( |
"{\"number\":9.87654321, \"null\":null , \"\\x53\" : \"str\" }", false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); |
+ ASSERT_TRUE(root->IsDictionary()); |
DictionaryValue* dict_val = static_cast<DictionaryValue*>(root.get()); |
double_val = 0.0; |
ASSERT_TRUE(dict_val->GetDouble("number", &double_val)); |
ASSERT_DOUBLE_EQ(9.87654321, double_val); |
Value* null_val = NULL; |
ASSERT_TRUE(dict_val->Get("null", &null_val)); |
- ASSERT_TRUE(null_val->IsType(Value::TYPE_NULL)); |
+ ASSERT_TRUE(null_val->IsNull()); |
str_val.clear(); |
ASSERT_TRUE(dict_val->GetString("S", &str_val)); |
ASSERT_EQ("str", str_val); |
@@ -341,7 +341,7 @@ TEST(JSONReaderTest, Reading) { |
root.reset(JSONReader::Read( |
"{\"inner\":{\"array\":[true]},\"false\":false,\"d\":{}}", false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); |
+ ASSERT_TRUE(root->IsDictionary()); |
dict_val = static_cast<DictionaryValue*>(root.get()); |
DictionaryValue* inner_dict = NULL; |
ASSERT_TRUE(dict_val->GetDictionary("inner", &inner_dict)); |
@@ -362,7 +362,7 @@ TEST(JSONReaderTest, Reading) { |
root.reset(JSONReader::Read( |
"{\"a.b\":3,\"c\":2,\"d.e.f\":{\"g.h.i.j\":1}}", false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); |
+ ASSERT_TRUE(root->IsDictionary()); |
dict_val = static_cast<DictionaryValue*>(root.get()); |
int integer_value = 0; |
EXPECT_TRUE(dict_val->GetIntegerWithoutPathExpansion("a.b", &integer_value)); |
@@ -379,7 +379,7 @@ TEST(JSONReaderTest, Reading) { |
root.reset(JSONReader::Read("{\"a\":{\"b\":2},\"a.b\":1}", false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY)); |
+ ASSERT_TRUE(root->IsDictionary()); |
dict_val = static_cast<DictionaryValue*>(root.get()); |
EXPECT_TRUE(dict_val->GetInteger("a.b", &integer_value)); |
EXPECT_EQ(2, integer_value); |
@@ -435,7 +435,7 @@ TEST(JSONReaderTest, Reading) { |
not_evil.append("[]]"); |
root.reset(JSONReader::Read(not_evil, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_LIST)); |
+ ASSERT_TRUE(root->IsList()); |
list = static_cast<ListValue*>(root.get()); |
ASSERT_EQ(5001U, list->GetSize()); |
@@ -443,7 +443,7 @@ TEST(JSONReaderTest, Reading) { |
root.reset(JSONReader().JsonToValue("\"\xe7\xbd\x91\xe9\xa1\xb5\"", |
false, false)); |
ASSERT_TRUE(root.get()); |
- ASSERT_TRUE(root->IsType(Value::TYPE_STRING)); |
+ ASSERT_TRUE(root->IsString()); |
str_val.clear(); |
ASSERT_TRUE(root->GetAsString(&str_val)); |
ASSERT_EQ(L"\x7f51\x9875", UTF8ToWide(str_val)); |