Change the signature of JSONReader::Read() and related methods to be more

chrome/common/json_value_serializer_unittest.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/json_reader.h"
 #include "base/json_writer.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/json_value_serializer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(JSONValueSerializerTest, Roundtrip) {
   const std::string original_serialization =
     "{\"bool\":true,\"int\":42,\"list\":[1,2],\"null\":null,\"real\":3.14}";
-  Value* root = NULL;
   JSONStringValueSerializer serializer(original_serialization);
-  ASSERT_TRUE(serializer.Deserialize(&root, NULL));
-  ASSERT_TRUE(root);
+  scoped_ptr<Value> root(serializer.Deserialize(NULL));
+  ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
 
-  DictionaryValue* root_dict = static_cast<DictionaryValue*>(root);
+  DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get());
 
   Value* null_value = NULL;
   ASSERT_TRUE(root_dict->Get(L"null", &null_value));
   ASSERT_TRUE(null_value);
   ASSERT_TRUE(null_value->IsType(Value::TYPE_NULL));
 
   bool bool_value = false;
   ASSERT_TRUE(root_dict->GetBoolean(L"bool", &bool_value));
   ASSERT_TRUE(bool_value);
 
@@ skipping 18 matching lines @@
   ASSERT_TRUE(mutable_serializer.Serialize(*root_dict));
   const std::string pretty_serialization =
     "{\r\n"
     "   \"bool\": true,\r\n"
     "   \"int\": 42,\r\n"
     "   \"list\": [ 1, 2 ],\r\n"
     "   \"null\": null,\r\n"
     "   \"real\": 3.14\r\n"
     "}\r\n";
   ASSERT_EQ(pretty_serialization, test_serialization);
-
-  delete root;
 }
 
 TEST(JSONValueSerializerTest, StringEscape) {
   std::wstring all_chars;
   for (int i = 1; i < 256; ++i) {
     all_chars += static_cast<wchar_t>(i);
   }
   // Generated in in Firefox using the following js (with an extra backslash for
   // double quote):
   // var s = '';
@@ skipping 36 matching lines @@
   root.SetString(L"web", test);
 
   std::string expected = "{\"web\":\"\\u7F51\\u9875\"}";
 
   std::string actual;
   JSONStringValueSerializer serializer(&actual);
   ASSERT_TRUE(serializer.Serialize(root));
   ASSERT_EQ(expected, actual);
 
   // escaped ascii text -> json
-  Value* deserial_root = NULL;
   JSONStringValueSerializer deserializer(expected);
-  ASSERT_TRUE(deserializer.Deserialize(&deserial_root, NULL));
-  DictionaryValue* dict_root = static_cast<DictionaryValue*>(deserial_root);
+  scoped_ptr<Value> deserial_root(deserializer.Deserialize(NULL));
+  ASSERT_TRUE(deserial_root.get());
+  DictionaryValue* dict_root =
+      static_cast<DictionaryValue*>(deserial_root.get());
   std::wstring web_value;
   ASSERT_TRUE(dict_root->GetString(L"web", &web_value));
   ASSERT_EQ(test, web_value);
-  delete deserial_root;
 }
 
 TEST(JSONValueSerializerTest, HexStrings) {
   // hex string json -> escaped ascii text
   DictionaryValue root;
   std::wstring test(L"\x01\x02");
   root.SetString(L"test", test);
 
   std::string expected = "{\"test\":\"\\x01\\x02\"}";
 
   std::string actual;
   JSONStringValueSerializer serializer(&actual);
   ASSERT_TRUE(serializer.Serialize(root));
   ASSERT_EQ(expected, actual);
 
   // escaped ascii text -> json
-  Value* deserial_root = NULL;
   JSONStringValueSerializer deserializer(expected);
-  ASSERT_TRUE(deserializer.Deserialize(&deserial_root, NULL));
-  DictionaryValue* dict_root = static_cast<DictionaryValue*>(deserial_root);
+  scoped_ptr<Value> deserial_root(deserializer.Deserialize(NULL));
+  ASSERT_TRUE(deserial_root.get());
+  DictionaryValue* dict_root =
+      static_cast<DictionaryValue*>(deserial_root.get());
   std::wstring test_value;
   ASSERT_TRUE(dict_root->GetString(L"test", &test_value));
   ASSERT_EQ(test, test_value);
-  delete deserial_root;
 
   // Test converting escaped regular chars
-  deserial_root = NULL;
   std::string escaped_chars = "{\"test\":\"\\x67\\x6f\"}";
   JSONStringValueSerializer deserializer2(escaped_chars);
-  ASSERT_TRUE(deserializer2.Deserialize(&deserial_root, NULL));
-  dict_root = static_cast<DictionaryValue*>(deserial_root);
+  deserial_root.reset(deserializer2.Deserialize(NULL));
+  ASSERT_TRUE(deserial_root.get());
+  dict_root = static_cast<DictionaryValue*>(deserial_root.get());
   ASSERT_TRUE(dict_root->GetString(L"test", &test_value));
   ASSERT_EQ(std::wstring(L"go"), test_value);
-  delete deserial_root;
 }
 
 TEST(JSONValueSerializerTest, AllowTrailingComma) {
-  Value* root = NULL;
-  Value* root_expected = NULL;
+  scoped_ptr<Value> root;
+  scoped_ptr<Value> root_expected;
   std::string test_with_commas("{\"key\": [true,],}");
   std::string test_no_commas("{\"key\": [true]}");
 
   JSONStringValueSerializer serializer(test_with_commas);
   serializer.set_allow_trailing_comma(true);
   JSONStringValueSerializer serializer_expected(test_no_commas);
-  ASSERT_TRUE(serializer.Deserialize(&root, NULL));
-  ASSERT_TRUE(serializer_expected.Deserialize(&root_expected, NULL));
-  ASSERT_TRUE(root->Equals(root_expected));
-
-  delete root;
-  delete root_expected;
+  root.reset(serializer.Deserialize(NULL));
+  ASSERT_TRUE(root.get());
+  root_expected.reset(serializer_expected.Deserialize(NULL));
+  ASSERT_TRUE(root_expected.get());
+  ASSERT_TRUE(root->Equals(root_expected.get()));
 }
 
 namespace {
 
 void ValidateJsonList(const std::string& json) {
-  Value* root = NULL;
-  ASSERT_TRUE(JSONReader::Read(json, &root, false));
-  ASSERT_TRUE(root && root->IsType(Value::TYPE_LIST));
-  ListValue* list = static_cast<ListValue*>(root);
+  scoped_ptr<Value> root(JSONReader::Read(json, false));
+  ASSERT_TRUE(root.get() && root->IsType(Value::TYPE_LIST));
+  ListValue* list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(1U, list->GetSize());
   Value* elt = NULL;
   ASSERT_TRUE(list->Get(0, &elt));
   int value = 0;
   ASSERT_TRUE(elt && elt->GetAsInteger(&value));
   ASSERT_EQ(1, value);
-  delete root;
 }
 
 }  // namespace
 
 TEST(JSONValueSerializerTest, JSONReaderComments) {
   ValidateJsonList("[ // 2, 3, ignore me ] \n1 ]");
   ValidateJsonList("[ /* 2, \n3, ignore me ]*/ \n1 ]");
   ValidateJsonList("//header\n[ // 2, \n// 3, \n1 ]// footer");
   ValidateJsonList("/*\n[ // 2, \n// 3, \n1 ]*/[1]");
   ValidateJsonList("[ 1 /* one */ ] /* end */");
   ValidateJsonList("[ 1 //// ,2\r\n ]");
 
-  Value* root = NULL;
+  scoped_ptr<Value> root;
+
   // It's ok to have a comment in a string.
-  ASSERT_TRUE(JSONReader::Read("[\"// ok\\n /* foo */ \"]", &root, false));
-  ASSERT_TRUE(root && root->IsType(Value::TYPE_LIST));
-  ListValue* list = static_cast<ListValue*>(root);
+  root.reset(JSONReader::Read("[\"// ok\\n /* foo */ \"]", false));
+  ASSERT_TRUE(root.get() && root->IsType(Value::TYPE_LIST));
+  ListValue* list = static_cast<ListValue*>(root.get());
   ASSERT_EQ(1U, list->GetSize());
   Value* elt = NULL;
   ASSERT_TRUE(list->Get(0, &elt));
   std::wstring value;
   ASSERT_TRUE(elt && elt->GetAsString(&value));
   ASSERT_EQ(L"// ok\n /* foo */ ", value);
-  delete root;
 
-  root = NULL;
   // You can't nest comments.
-  ASSERT_FALSE(JSONReader::Read("/* /* inner */ outer */ [ 1 ]", &root, false));
+  root.reset(JSONReader::Read("/* /* inner */ outer */ [ 1 ]", false));
+  ASSERT_FALSE(root.get());
 
   // Not a open comment token.
-  ASSERT_FALSE(JSONReader::Read("/ * * / [1]", &root, false));
+  root.reset(JSONReader::Read("/ * * / [1]", false));
+  ASSERT_FALSE(root.get());
 }
 
 namespace {
   class JSONFileValueSerializerTest : public testing::Test {
   protected:
     virtual void SetUp() {
       // Name a subdirectory of the temp directory.
       ASSERT_TRUE(PathService::Get(base::DIR_TEMP, &test_dir_));
       file_util::AppendToPath(&test_dir_, L"JSONFileValueSerializerTest");
 
@@ skipping 16 matching lines @@
 #if defined(OS_WIN)
 TEST_F(JSONFileValueSerializerTest, Roundtrip) {
   std::wstring original_file_path;
   ASSERT_TRUE(
     PathService::Get(chrome::DIR_TEST_DATA, &original_file_path));
   file_util::AppendToPath(&original_file_path, L"serializer_test.js");
 
   ASSERT_TRUE(file_util::PathExists(original_file_path));
 
   JSONFileValueSerializer deserializer(original_file_path);
-  Value* root;
-  ASSERT_TRUE(deserializer.Deserialize(&root, NULL));
+  scoped_ptr<Value> root;
+  root.reset(deserializer.Deserialize(NULL));
 
-  ASSERT_TRUE(root);
+  ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
 
-  DictionaryValue* root_dict = static_cast<DictionaryValue*>(root);
+  DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get());
 
   Value* null_value = NULL;
   ASSERT_TRUE(root_dict->Get(L"null", &null_value));
   ASSERT_TRUE(null_value);
   ASSERT_TRUE(null_value->IsType(Value::TYPE_NULL));
 
   bool bool_value = false;
   ASSERT_TRUE(root_dict->GetBoolean(L"bool", &bool_value));
   ASSERT_TRUE(bool_value);
 
@@ skipping 10 matching lines @@
   file_util::AppendToPath(&written_file_path, L"test_output.js");
 
   ASSERT_FALSE(file_util::PathExists(written_file_path));
   JSONFileValueSerializer serializer(written_file_path);
   ASSERT_TRUE(serializer.Serialize(*root));
   ASSERT_TRUE(file_util::PathExists(written_file_path));
 
   // Now compare file contents.
   EXPECT_TRUE(file_util::ContentsEqual(original_file_path, written_file_path));
   EXPECT_TRUE(file_util::Delete(written_file_path, false));
-
-  delete root;
 }
 
 TEST_F(JSONFileValueSerializerTest, RoundtripNested) {
   std::wstring original_file_path;
   ASSERT_TRUE(
     PathService::Get(chrome::DIR_TEST_DATA, &original_file_path));
   file_util::AppendToPath(&original_file_path, L"serializer_nested_test.js");
 
   ASSERT_TRUE(file_util::PathExists(original_file_path));
 
   JSONFileValueSerializer deserializer(original_file_path);
-  Value* root;
-  ASSERT_TRUE(deserializer.Deserialize(&root, NULL));
+  scoped_ptr<Value> root;
+  root.reset(deserializer.Deserialize(NULL));
+  ASSERT_TRUE(root.get());
 
   // Now try writing.
   std::wstring written_file_path = test_dir_;
   file_util::AppendToPath(&written_file_path, L"test_output.js");
 
   ASSERT_FALSE(file_util::PathExists(written_file_path));
   JSONFileValueSerializer serializer(written_file_path);
   ASSERT_TRUE(serializer.Serialize(*root));
   ASSERT_TRUE(file_util::PathExists(written_file_path));
 
   // Now compare file contents.
   EXPECT_TRUE(file_util::ContentsEqual(original_file_path, written_file_path));
   EXPECT_TRUE(file_util::Delete(written_file_path, false));
-
-  delete root;
 }
 
 TEST_F(JSONFileValueSerializerTest, NoWhitespace) {
   std::wstring source_file_path;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &source_file_path));
   file_util::AppendToPath(&source_file_path,
                           L"serializer_test_nowhitespace.js");
   ASSERT_TRUE(file_util::PathExists(source_file_path));
   JSONFileValueSerializer serializer(source_file_path);
-  Value* root;
-  ASSERT_TRUE(serializer.Deserialize(&root, NULL));
-  ASSERT_TRUE(root);
-  delete root;
+  scoped_ptr<Value> root;
+  root.reset(serializer.Deserialize(NULL));
+  ASSERT_TRUE(root.get());
 }
 #endif  // defined(OS_WIN)