| Index: chrome/common/json_value_serializer_unittest.cc
|
| diff --git a/chrome/common/json_value_serializer_unittest.cc b/chrome/common/json_value_serializer_unittest.cc
|
| index 46f45ab7d44c0be7555bb869589fea7f1f1664a7..48f971b3e09ca54b66b022b8aff9b317245d119f 100644
|
| --- a/chrome/common/json_value_serializer_unittest.cc
|
| +++ b/chrome/common/json_value_serializer_unittest.cc
|
| @@ -17,230 +17,9 @@
|
| #include "chrome/common/chrome_paths.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| -TEST(JSONValueSerializerTest, Roundtrip) {
|
| - const std::string original_serialization =
|
| - "{\"bool\":true,\"double\":3.14,\"int\":42,\"list\":[1,2],\"null\":null}";
|
| - JSONStringValueSerializer serializer(original_serialization);
|
| - scoped_ptr<Value> root(serializer.Deserialize(NULL, NULL));
|
| - ASSERT_TRUE(root.get());
|
| - ASSERT_TRUE(root->IsType(Value::TYPE_DICTIONARY));
|
| -
|
| - DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get());
|
| -
|
| - Value* null_value = NULL;
|
| - ASSERT_TRUE(root_dict->Get("null", &null_value));
|
| - ASSERT_TRUE(null_value);
|
| - ASSERT_TRUE(null_value->IsType(Value::TYPE_NULL));
|
| -
|
| - bool bool_value = false;
|
| - ASSERT_TRUE(root_dict->GetBoolean("bool", &bool_value));
|
| - ASSERT_TRUE(bool_value);
|
| -
|
| - int int_value = 0;
|
| - ASSERT_TRUE(root_dict->GetInteger("int", &int_value));
|
| - ASSERT_EQ(42, int_value);
|
| -
|
| - double double_value = 0.0;
|
| - ASSERT_TRUE(root_dict->GetDouble("double", &double_value));
|
| - ASSERT_DOUBLE_EQ(3.14, double_value);
|
| -
|
| - // We shouldn't be able to write using this serializer, since it was
|
| - // initialized with a const string.
|
| - ASSERT_FALSE(serializer.Serialize(*root_dict));
|
| -
|
| - std::string test_serialization = "";
|
| - JSONStringValueSerializer mutable_serializer(&test_serialization);
|
| - ASSERT_TRUE(mutable_serializer.Serialize(*root_dict));
|
| - ASSERT_EQ(original_serialization, test_serialization);
|
| -
|
| - mutable_serializer.set_pretty_print(true);
|
| - ASSERT_TRUE(mutable_serializer.Serialize(*root_dict));
|
| - // JSON output uses a different newline style on Windows than on other
|
| - // platforms.
|
| -#if defined(OS_WIN)
|
| -#define JSON_NEWLINE "\r\n"
|
| -#else
|
| -#define JSON_NEWLINE "\n"
|
| -#endif
|
| - const std::string pretty_serialization =
|
| - "{" JSON_NEWLINE
|
| - " \"bool\": true," JSON_NEWLINE
|
| - " \"double\": 3.14," JSON_NEWLINE
|
| - " \"int\": 42," JSON_NEWLINE
|
| - " \"list\": [ 1, 2 ]," JSON_NEWLINE
|
| - " \"null\": null" JSON_NEWLINE
|
| - "}" JSON_NEWLINE;
|
| -#undef JSON_NEWLINE
|
| - ASSERT_EQ(pretty_serialization, test_serialization);
|
| -}
|
| -
|
| -TEST(JSONValueSerializerTest, StringEscape) {
|
| - string16 all_chars;
|
| - for (int i = 1; i < 256; ++i) {
|
| - all_chars += static_cast<char16>(i);
|
| - }
|
| - // Generated in in Firefox using the following js (with an extra backslash for
|
| - // double quote):
|
| - // var s = '';
|
| - // for (var i = 1; i < 256; ++i) { s += String.fromCharCode(i); }
|
| - // uneval(s).replace(/\\/g, "\\\\");
|
| - std::string all_chars_expected =
|
| - "\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000B\\f\\r"
|
| - "\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017"
|
| - "\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001E\\u001F !\\\""
|
| - "#$%&'()*+,-./0123456789:;\\u003C=\\u003E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\"
|
| - "\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\\u007F\\u0080\\u0081\\u0082\\u0083"
|
| - "\\u0084\\u0085\\u0086\\u0087\\u0088\\u0089\\u008A\\u008B\\u008C\\u008D"
|
| - "\\u008E\\u008F\\u0090\\u0091\\u0092\\u0093\\u0094\\u0095\\u0096\\u0097"
|
| - "\\u0098\\u0099\\u009A\\u009B\\u009C\\u009D\\u009E\\u009F\\u00A0\\u00A1"
|
| - "\\u00A2\\u00A3\\u00A4\\u00A5\\u00A6\\u00A7\\u00A8\\u00A9\\u00AA\\u00AB"
|
| - "\\u00AC\\u00AD\\u00AE\\u00AF\\u00B0\\u00B1\\u00B2\\u00B3\\u00B4\\u00B5"
|
| - "\\u00B6\\u00B7\\u00B8\\u00B9\\u00BA\\u00BB\\u00BC\\u00BD\\u00BE\\u00BF"
|
| - "\\u00C0\\u00C1\\u00C2\\u00C3\\u00C4\\u00C5\\u00C6\\u00C7\\u00C8\\u00C9"
|
| - "\\u00CA\\u00CB\\u00CC\\u00CD\\u00CE\\u00CF\\u00D0\\u00D1\\u00D2\\u00D3"
|
| - "\\u00D4\\u00D5\\u00D6\\u00D7\\u00D8\\u00D9\\u00DA\\u00DB\\u00DC\\u00DD"
|
| - "\\u00DE\\u00DF\\u00E0\\u00E1\\u00E2\\u00E3\\u00E4\\u00E5\\u00E6\\u00E7"
|
| - "\\u00E8\\u00E9\\u00EA\\u00EB\\u00EC\\u00ED\\u00EE\\u00EF\\u00F0\\u00F1"
|
| - "\\u00F2\\u00F3\\u00F4\\u00F5\\u00F6\\u00F7\\u00F8\\u00F9\\u00FA\\u00FB"
|
| - "\\u00FC\\u00FD\\u00FE\\u00FF";
|
| -
|
| - std::string expected_output = "{\"all_chars\":\"" + all_chars_expected +
|
| - "\"}";
|
| - // Test JSONWriter interface
|
| - std::string output_js;
|
| - DictionaryValue valueRoot;
|
| - valueRoot.SetString("all_chars", all_chars);
|
| - base::JSONWriter::Write(&valueRoot, &output_js);
|
| - ASSERT_EQ(expected_output, output_js);
|
| -
|
| - // Test JSONValueSerializer interface (uses JSONWriter).
|
| - JSONStringValueSerializer serializer(&output_js);
|
| - ASSERT_TRUE(serializer.Serialize(valueRoot));
|
| - ASSERT_EQ(expected_output, output_js);
|
| -}
|
| -
|
| -TEST(JSONValueSerializerTest, UnicodeStrings) {
|
| - // unicode string json -> escaped ascii text
|
| - DictionaryValue root;
|
| - string16 test(WideToUTF16(L"\x7F51\x9875"));
|
| - root.SetString("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
|
| - JSONStringValueSerializer deserializer(expected);
|
| - scoped_ptr<Value> deserial_root(deserializer.Deserialize(NULL, NULL));
|
| - ASSERT_TRUE(deserial_root.get());
|
| - DictionaryValue* dict_root =
|
| - static_cast<DictionaryValue*>(deserial_root.get());
|
| - string16 web_value;
|
| - ASSERT_TRUE(dict_root->GetString("web", &web_value));
|
| - ASSERT_EQ(test, web_value);
|
| -}
|
| -
|
| -TEST(JSONValueSerializerTest, HexStrings) {
|
| - // hex string json -> escaped ascii text
|
| - DictionaryValue root;
|
| - string16 test(WideToUTF16(L"\x01\x02"));
|
| - root.SetString("test", test);
|
| -
|
| - std::string expected = "{\"test\":\"\\u0001\\u0002\"}";
|
| -
|
| - std::string actual;
|
| - JSONStringValueSerializer serializer(&actual);
|
| - ASSERT_TRUE(serializer.Serialize(root));
|
| - ASSERT_EQ(expected, actual);
|
| -
|
| - // escaped ascii text -> json
|
| - JSONStringValueSerializer deserializer(expected);
|
| - scoped_ptr<Value> deserial_root(deserializer.Deserialize(NULL, NULL));
|
| - ASSERT_TRUE(deserial_root.get());
|
| - DictionaryValue* dict_root =
|
| - static_cast<DictionaryValue*>(deserial_root.get());
|
| - string16 test_value;
|
| - ASSERT_TRUE(dict_root->GetString("test", &test_value));
|
| - ASSERT_EQ(test, test_value);
|
| -
|
| - // Test converting escaped regular chars
|
| - std::string escaped_chars = "{\"test\":\"\\u0067\\u006f\"}";
|
| - JSONStringValueSerializer deserializer2(escaped_chars);
|
| - deserial_root.reset(deserializer2.Deserialize(NULL, NULL));
|
| - ASSERT_TRUE(deserial_root.get());
|
| - dict_root = static_cast<DictionaryValue*>(deserial_root.get());
|
| - ASSERT_TRUE(dict_root->GetString("test", &test_value));
|
| - ASSERT_EQ(ASCIIToUTF16("go"), test_value);
|
| -}
|
| -
|
| -TEST(JSONValueSerializerTest, AllowTrailingComma) {
|
| - 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);
|
| - root.reset(serializer.Deserialize(NULL, NULL));
|
| - ASSERT_TRUE(root.get());
|
| - root_expected.reset(serializer_expected.Deserialize(NULL, NULL));
|
| - ASSERT_TRUE(root_expected.get());
|
| - ASSERT_TRUE(root->Equals(root_expected.get()));
|
| -}
|
| -
|
| -namespace {
|
| -
|
| -void ValidateJsonList(const std::string& json) {
|
| - scoped_ptr<Value> root(base::JSONReader::Read(json));
|
| - 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);
|
| -}
|
| -
|
| -} // 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 ]");
|
| -
|
| - scoped_ptr<Value> root;
|
| -
|
| - // It's ok to have a comment in a string.
|
| - root.reset(base::JSONReader::Read("[\"// ok\\n /* foo */ \"]"));
|
| - 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::string value;
|
| - ASSERT_TRUE(elt && elt->GetAsString(&value));
|
| - ASSERT_EQ("// ok\n /* foo */ ", value);
|
| -
|
| - // You can't nest comments.
|
| - root.reset(base::JSONReader::Read("/* /* inner */ outer */ [ 1 ]"));
|
| - ASSERT_FALSE(root.get());
|
| -
|
| - // Not a open comment token.
|
| - root.reset(base::JSONReader::Read("/ * * / [1]"));
|
| - ASSERT_FALSE(root.get());
|
| -}
|
| -
|
| class JSONFileValueSerializerTest : public testing::Test {
|
| -protected:
|
| - virtual void SetUp() {
|
| + protected:
|
| + virtual void SetUp() OVERRIDE {
|
| ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
|
| }
|
|
|
|
|