Add error messages to JSONReader and friends. This required a bit of refactor...

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));
+  ASSERT_TRUE(serializer.Deserialize(&root, NULL));
   ASSERT_TRUE(root);
   ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
 
   DictionaryValue* root_dict = static_cast<DictionaryValue*>(root);
 
   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));
 
@@ skipping 82 matching lines @@
   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));
+  ASSERT_TRUE(deserializer.Deserialize(&deserial_root, NULL));
   DictionaryValue* dict_root = static_cast<DictionaryValue*>(deserial_root);
   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));
+  ASSERT_TRUE(deserializer.Deserialize(&deserial_root, NULL));
   DictionaryValue* dict_root = static_cast<DictionaryValue*>(deserial_root);
   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));
+  ASSERT_TRUE(deserializer2.Deserialize(&deserial_root, NULL));
   dict_root = static_cast<DictionaryValue*>(deserial_root);
   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;
   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));
-  ASSERT_TRUE(serializer_expected.Deserialize(&root_expected));
+  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;
 }
 
 namespace {
 
 void ValidateJsonList(const std::string& json) {
   Value* root = NULL;
@@ skipping 68 matching lines @@
 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));
+  ASSERT_TRUE(deserializer.Deserialize(&root, NULL));
 
   ASSERT_TRUE(root);
   ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
 
   DictionaryValue* root_dict = static_cast<DictionaryValue*>(root);
 
   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));
@@ skipping 29 matching lines @@
 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));
+  ASSERT_TRUE(deserializer.Deserialize(&root, NULL));
 
   // 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));
+  ASSERT_TRUE(serializer.Deserialize(&root, NULL));
   ASSERT_TRUE(root);
   delete root;
 }
 #endif  // defined(OS_WIN)