Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3777)

Unified Diff: base/json/json_writer_unittest.cc

Issue 1131113004: Convert JsonWriter::Write to taking a const ref for the in-param (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix platform specific stuff Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/json/json_writer_unittest.cc
diff --git a/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc
index 802876c9859649f1e7fc0fe7349cab6149c5b4f9..8c6c25c71697bf3277095948347b99b464041802 100644
--- a/base/json/json_writer_unittest.cc
+++ b/base/json/json_writer_unittest.cc
@@ -12,48 +12,40 @@ TEST(JSONWriterTest, BasicTypes) {
std::string output_js;
// Test null.
- scoped_ptr<Value> root(Value::CreateNullValue());
- EXPECT_TRUE(JSONWriter::Write(root.get(), &output_js));
+ Value* root = Value::CreateNullValue();
+ EXPECT_TRUE(JSONWriter::Write(*root, &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);
}
@@ -73,11 +65,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.
@@ -104,13 +95,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);
}
@@ -120,9 +111,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;
@@ -131,9 +122,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;
@@ -145,9 +136,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);
}
@@ -157,8 +148,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);
}

Powered by Google App Engine
This is Rietveld 408576698