| Index: base/json/json_writer_unittest.cc
|
| diff --git a/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc
|
| index 5ac2590a0d87ee16d5803c95e43d65529a9ce1bd..0daeafce1d710e91d8942c480b352692b8d39e46 100644
|
| --- a/base/json/json_writer_unittest.cc
|
| +++ b/base/json/json_writer_unittest.cc
|
| @@ -12,47 +12,39 @@ TEST(JSONWriterTest, BasicTypes) {
|
| std::string output_js;
|
|
|
| // Test null.
|
| - EXPECT_TRUE(JSONWriter::Write(Value::CreateNullValue().get(), &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(*Value::CreateNullValue(), &output_js));
|
| EXPECT_EQ("null", output_js);
|
|
|
| // Test empty dict.
|
| - DictionaryValue dict;
|
| - EXPECT_TRUE(JSONWriter::Write(&dict, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(DictionaryValue(), &output_js));
|
| EXPECT_EQ("{}", output_js);
|
|
|
| // Test empty list.
|
| - ListValue list;
|
| - EXPECT_TRUE(JSONWriter::Write(&list, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(ListValue(), &output_js));
|
| EXPECT_EQ("[]", output_js);
|
|
|
| // Test integer values.
|
| - FundamentalValue int_value(42);
|
| - EXPECT_TRUE(JSONWriter::Write(&int_value, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(FundamentalValue(42), &output_js));
|
| EXPECT_EQ("42", output_js);
|
|
|
| // Test boolean values.
|
| - FundamentalValue bool_value(true);
|
| - EXPECT_TRUE(JSONWriter::Write(&bool_value, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(FundamentalValue(true), &output_js));
|
| EXPECT_EQ("true", output_js);
|
|
|
| // Test Real values should always have a decimal or an 'e'.
|
| - FundamentalValue double_value(1.0);
|
| - EXPECT_TRUE(JSONWriter::Write(&double_value, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(FundamentalValue(1.0), &output_js));
|
| EXPECT_EQ("1.0", output_js);
|
|
|
| // Test Real values in the the range (-1, 1) must have leading zeros
|
| - FundamentalValue double_value2(0.2);
|
| - EXPECT_TRUE(JSONWriter::Write(&double_value2, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(FundamentalValue(0.2), &output_js));
|
| EXPECT_EQ("0.2", output_js);
|
|
|
| // Test Real values in the the range (-1, 1) must have leading zeros
|
| - FundamentalValue double_value3(-0.8);
|
| - EXPECT_TRUE(JSONWriter::Write(&double_value3, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(FundamentalValue(-0.8), &output_js));
|
| EXPECT_EQ("-0.8", output_js);
|
|
|
| // Test String values.
|
| - StringValue string_value("foo");
|
| - EXPECT_TRUE(JSONWriter::Write(&string_value, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(StringValue("foo"), &output_js));
|
| EXPECT_EQ("\"foo\"", output_js);
|
| }
|
|
|
| @@ -71,11 +63,10 @@ TEST(JSONWriterTest, NestedTypes) {
|
| root_dict.Set("list", list.Pass());
|
|
|
| // Test the pretty-printer.
|
| - EXPECT_TRUE(JSONWriter::Write(&root_dict, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(root_dict, &output_js));
|
| EXPECT_EQ("{\"list\":[{\"inner int\":10},[],true]}", output_js);
|
| - EXPECT_TRUE(JSONWriter::WriteWithOptions(&root_dict,
|
| - JSONWriter::OPTIONS_PRETTY_PRINT,
|
| - &output_js));
|
| + EXPECT_TRUE(JSONWriter::WriteWithOptions(
|
| + root_dict, JSONWriter::OPTIONS_PRETTY_PRINT, &output_js));
|
|
|
| // The pretty-printer uses a different newline style on Windows than on
|
| // other platforms.
|
| @@ -102,13 +93,13 @@ TEST(JSONWriterTest, KeysWithPeriods) {
|
| scoped_ptr<DictionaryValue> period_dict2(new DictionaryValue());
|
| period_dict2->SetIntegerWithoutPathExpansion("g.h.i.j", 1);
|
| period_dict.SetWithoutPathExpansion("d.e.f", period_dict2.Pass());
|
| - EXPECT_TRUE(JSONWriter::Write(&period_dict, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(period_dict, &output_js));
|
| EXPECT_EQ("{\"a.b\":3,\"c\":2,\"d.e.f\":{\"g.h.i.j\":1}}", output_js);
|
|
|
| DictionaryValue period_dict3;
|
| period_dict3.SetInteger("a.b", 2);
|
| period_dict3.SetIntegerWithoutPathExpansion("a.b", 1);
|
| - EXPECT_TRUE(JSONWriter::Write(&period_dict3, &output_js));
|
| + EXPECT_TRUE(JSONWriter::Write(period_dict3, &output_js));
|
| EXPECT_EQ("{\"a\":{\"b\":2},\"a.b\":1}", output_js);
|
| }
|
|
|
| @@ -118,9 +109,9 @@ TEST(JSONWriterTest, BinaryValues) {
|
| // Binary values should return errors unless suppressed via the
|
| // OPTIONS_OMIT_BINARY_VALUES flag.
|
| scoped_ptr<Value> root(BinaryValue::CreateWithCopiedBuffer("asdf", 4));
|
| - EXPECT_FALSE(JSONWriter::Write(root.get(), &output_js));
|
| + EXPECT_FALSE(JSONWriter::Write(*root, &output_js));
|
| EXPECT_TRUE(JSONWriter::WriteWithOptions(
|
| - root.get(), JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js));
|
| + *root, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js));
|
| EXPECT_TRUE(output_js.empty());
|
|
|
| ListValue binary_list;
|
| @@ -129,9 +120,9 @@ TEST(JSONWriterTest, BinaryValues) {
|
| binary_list.Append(BinaryValue::CreateWithCopiedBuffer("asdf", 4));
|
| binary_list.Append(make_scoped_ptr(new FundamentalValue(2)));
|
| binary_list.Append(BinaryValue::CreateWithCopiedBuffer("asdf", 4));
|
| - EXPECT_FALSE(JSONWriter::Write(&binary_list, &output_js));
|
| + EXPECT_FALSE(JSONWriter::Write(binary_list, &output_js));
|
| EXPECT_TRUE(JSONWriter::WriteWithOptions(
|
| - &binary_list, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js));
|
| + binary_list, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js));
|
| EXPECT_EQ("[5,2]", output_js);
|
|
|
| DictionaryValue binary_dict;
|
| @@ -143,9 +134,9 @@ TEST(JSONWriterTest, BinaryValues) {
|
| binary_dict.SetInteger("d", 2);
|
| binary_dict.Set(
|
| "e", make_scoped_ptr(BinaryValue::CreateWithCopiedBuffer("asdf", 4)));
|
| - EXPECT_FALSE(JSONWriter::Write(&binary_dict, &output_js));
|
| + EXPECT_FALSE(JSONWriter::Write(binary_dict, &output_js));
|
| EXPECT_TRUE(JSONWriter::WriteWithOptions(
|
| - &binary_dict, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js));
|
| + binary_dict, JSONWriter::OPTIONS_OMIT_BINARY_VALUES, &output_js));
|
| EXPECT_EQ("{\"b\":5,\"d\":2}", output_js);
|
| }
|
|
|
| @@ -155,8 +146,7 @@ TEST(JSONWriterTest, DoublesAsInts) {
|
| // Test allowing a double with no fractional part to be written as an integer.
|
| FundamentalValue double_value(1e10);
|
| EXPECT_TRUE(JSONWriter::WriteWithOptions(
|
| - &double_value,
|
| - JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION,
|
| + double_value, JSONWriter::OPTIONS_OMIT_DOUBLE_TYPE_PRESERVATION,
|
| &output_js));
|
| EXPECT_EQ("10000000000", output_js);
|
| }
|
|
|