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

Side by Side Diff: base/json/json_value_serializer_unittest.cc

Issue 100823007: Stop doing unnecessary UTF-8 to UTF-16 conversions in JSONWriter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ChromeOS page encodings Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/debug/trace_event_impl.cc ('k') | base/json/json_writer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <string> 5 #include <string>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/json/json_file_value_serializer.h" 9 #include "base/json/json_file_value_serializer.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 all_chars += static_cast<char16>(i); 228 all_chars += static_cast<char16>(i);
229 } 229 }
230 // Generated in in Firefox using the following js (with an extra backslash for 230 // Generated in in Firefox using the following js (with an extra backslash for
231 // double quote): 231 // double quote):
232 // var s = ''; 232 // var s = '';
233 // for (var i = 1; i < 256; ++i) { s += String.fromCharCode(i); } 233 // for (var i = 1; i < 256; ++i) { s += String.fromCharCode(i); }
234 // uneval(s).replace(/\\/g, "\\\\"); 234 // uneval(s).replace(/\\/g, "\\\\");
235 std::string all_chars_expected = 235 std::string all_chars_expected =
236 "\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000B\\f\\r" 236 "\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007\\b\\t\\n\\u000B\\f\\r"
237 "\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017" 237 "\\u000E\\u000F\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017"
238 "\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001E\\u001F !\\\"" 238 "\\u0018\\u0019\\u001A\\u001B\\u001C\\u001D\\u001E\\u001F !\\\"#$%&'()*+,"
239 "#$%&'()*+,-./0123456789:;\\u003C=\\u003E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\" 239 "-./0123456789:;\\u003C=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\\\]^_`abcde"
240 "\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\\u007F\\u0080\\u0081\\u0082\\u0083" 240 "fghijklmnopqrstuvwxyz{|}~\x7F\xC2\x80\xC2\x81\xC2\x82\xC2\x83\xC2\x84"
241 "\\u0084\\u0085\\u0086\\u0087\\u0088\\u0089\\u008A\\u008B\\u008C\\u008D" 241 "\xC2\x85\xC2\x86\xC2\x87\xC2\x88\xC2\x89\xC2\x8A\xC2\x8B\xC2\x8C\xC2\x8D"
242 "\\u008E\\u008F\\u0090\\u0091\\u0092\\u0093\\u0094\\u0095\\u0096\\u0097" 242 "\xC2\x8E\xC2\x8F\xC2\x90\xC2\x91\xC2\x92\xC2\x93\xC2\x94\xC2\x95\xC2\x96"
243 "\\u0098\\u0099\\u009A\\u009B\\u009C\\u009D\\u009E\\u009F\\u00A0\\u00A1" 243 "\xC2\x97\xC2\x98\xC2\x99\xC2\x9A\xC2\x9B\xC2\x9C\xC2\x9D\xC2\x9E\xC2\x9F"
244 "\\u00A2\\u00A3\\u00A4\\u00A5\\u00A6\\u00A7\\u00A8\\u00A9\\u00AA\\u00AB" 244 "\xC2\xA0\xC2\xA1\xC2\xA2\xC2\xA3\xC2\xA4\xC2\xA5\xC2\xA6\xC2\xA7\xC2\xA8"
245 "\\u00AC\\u00AD\\u00AE\\u00AF\\u00B0\\u00B1\\u00B2\\u00B3\\u00B4\\u00B5" 245 "\xC2\xA9\xC2\xAA\xC2\xAB\xC2\xAC\xC2\xAD\xC2\xAE\xC2\xAF\xC2\xB0\xC2\xB1"
246 "\\u00B6\\u00B7\\u00B8\\u00B9\\u00BA\\u00BB\\u00BC\\u00BD\\u00BE\\u00BF" 246 "\xC2\xB2\xC2\xB3\xC2\xB4\xC2\xB5\xC2\xB6\xC2\xB7\xC2\xB8\xC2\xB9\xC2\xBA"
247 "\\u00C0\\u00C1\\u00C2\\u00C3\\u00C4\\u00C5\\u00C6\\u00C7\\u00C8\\u00C9" 247 "\xC2\xBB\xC2\xBC\xC2\xBD\xC2\xBE\xC2\xBF\xC3\x80\xC3\x81\xC3\x82\xC3\x83"
248 "\\u00CA\\u00CB\\u00CC\\u00CD\\u00CE\\u00CF\\u00D0\\u00D1\\u00D2\\u00D3" 248 "\xC3\x84\xC3\x85\xC3\x86\xC3\x87\xC3\x88\xC3\x89\xC3\x8A\xC3\x8B\xC3\x8C"
249 "\\u00D4\\u00D5\\u00D6\\u00D7\\u00D8\\u00D9\\u00DA\\u00DB\\u00DC\\u00DD" 249 "\xC3\x8D\xC3\x8E\xC3\x8F\xC3\x90\xC3\x91\xC3\x92\xC3\x93\xC3\x94\xC3\x95"
250 "\\u00DE\\u00DF\\u00E0\\u00E1\\u00E2\\u00E3\\u00E4\\u00E5\\u00E6\\u00E7" 250 "\xC3\x96\xC3\x97\xC3\x98\xC3\x99\xC3\x9A\xC3\x9B\xC3\x9C\xC3\x9D\xC3\x9E"
251 "\\u00E8\\u00E9\\u00EA\\u00EB\\u00EC\\u00ED\\u00EE\\u00EF\\u00F0\\u00F1" 251 "\xC3\x9F\xC3\xA0\xC3\xA1\xC3\xA2\xC3\xA3\xC3\xA4\xC3\xA5\xC3\xA6\xC3\xA7"
252 "\\u00F2\\u00F3\\u00F4\\u00F5\\u00F6\\u00F7\\u00F8\\u00F9\\u00FA\\u00FB" 252 "\xC3\xA8\xC3\xA9\xC3\xAA\xC3\xAB\xC3\xAC\xC3\xAD\xC3\xAE\xC3\xAF\xC3\xB0"
253 "\\u00FC\\u00FD\\u00FE\\u00FF"; 253 "\xC3\xB1\xC3\xB2\xC3\xB3\xC3\xB4\xC3\xB5\xC3\xB6\xC3\xB7\xC3\xB8\xC3\xB9"
254 "\xC3\xBA\xC3\xBB\xC3\xBC\xC3\xBD\xC3\xBE\xC3\xBF";
254 255
255 std::string expected_output = "{\"all_chars\":\"" + all_chars_expected + 256 std::string expected_output = "{\"all_chars\":\"" + all_chars_expected +
256 "\"}"; 257 "\"}";
257 // Test JSONWriter interface 258 // Test JSONWriter interface
258 std::string output_js; 259 std::string output_js;
259 DictionaryValue valueRoot; 260 DictionaryValue valueRoot;
260 valueRoot.SetString("all_chars", all_chars); 261 valueRoot.SetString("all_chars", all_chars);
261 JSONWriter::Write(&valueRoot, &output_js); 262 JSONWriter::Write(&valueRoot, &output_js);
262 ASSERT_EQ(expected_output, output_js); 263 ASSERT_EQ(expected_output, output_js);
263 264
264 // Test JSONValueSerializer interface (uses JSONWriter). 265 // Test JSONValueSerializer interface (uses JSONWriter).
265 JSONStringValueSerializer serializer(&output_js); 266 JSONStringValueSerializer serializer(&output_js);
266 ASSERT_TRUE(serializer.Serialize(valueRoot)); 267 ASSERT_TRUE(serializer.Serialize(valueRoot));
267 ASSERT_EQ(expected_output, output_js); 268 ASSERT_EQ(expected_output, output_js);
268 } 269 }
269 270
270 TEST(JSONValueSerializerTest, UnicodeStrings) { 271 TEST(JSONValueSerializerTest, UnicodeStrings) {
271 // unicode string json -> escaped ascii text 272 // unicode string json -> escaped ascii text
272 DictionaryValue root; 273 DictionaryValue root;
273 string16 test(WideToUTF16(L"\x7F51\x9875")); 274 string16 test(WideToUTF16(L"\x7F51\x9875"));
274 root.SetString("web", test); 275 root.SetString("web", test);
275 276
276 std::string expected = "{\"web\":\"\\u7F51\\u9875\"}"; 277 std::string expected = "{\"web\":\"\xE7\xBD\x91\xE9\xA1\xB5\"}";
277 278
278 std::string actual; 279 std::string actual;
279 JSONStringValueSerializer serializer(&actual); 280 JSONStringValueSerializer serializer(&actual);
280 ASSERT_TRUE(serializer.Serialize(root)); 281 ASSERT_TRUE(serializer.Serialize(root));
281 ASSERT_EQ(expected, actual); 282 ASSERT_EQ(expected, actual);
282 283
283 // escaped ascii text -> json 284 // escaped ascii text -> json
284 JSONStringValueSerializer deserializer(expected); 285 JSONStringValueSerializer deserializer(expected);
285 scoped_ptr<Value> deserial_root(deserializer.Deserialize(NULL, NULL)); 286 scoped_ptr<Value> deserial_root(deserializer.Deserialize(NULL, NULL));
286 ASSERT_TRUE(deserial_root.get()); 287 ASSERT_TRUE(deserial_root.get());
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 ASSERT_TRUE(PathExists(source_file_path)); 463 ASSERT_TRUE(PathExists(source_file_path));
463 JSONFileValueSerializer serializer(source_file_path); 464 JSONFileValueSerializer serializer(source_file_path);
464 scoped_ptr<Value> root; 465 scoped_ptr<Value> root;
465 root.reset(serializer.Deserialize(NULL, NULL)); 466 root.reset(serializer.Deserialize(NULL, NULL));
466 ASSERT_TRUE(root.get()); 467 ASSERT_TRUE(root.get());
467 } 468 }
468 469
469 } // namespace 470 } // namespace
470 471
471 } // namespace base 472 } // namespace base
OLDNEW
« no previous file with comments | « base/debug/trace_event_impl.cc ('k') | base/json/json_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698