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

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

Issue 1466413002: Update gtest to 786564fa4a3c, switch to googlemock in gtest Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « base/json/json_value_converter_unittest.cc ('k') | base/json/json_writer_unittest.cc » ('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/files/file_util.h" 7 #include "base/files/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"
11 #include "base/json/json_string_value_serializer.h" 11 #include "base/json/json_string_value_serializer.h"
12 #include "base/json/json_writer.h" 12 #include "base/json/json_writer.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/strings/string_piece.h" 15 #include "base/strings/string_piece.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/values.h" 18 #include "base/values.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/googletest/include/gtest/gtest.h"
20 20
21 namespace base { 21 namespace base {
22 22
23 namespace { 23 namespace {
24 24
25 // Some proper JSON to test with: 25 // Some proper JSON to test with:
26 const char kProperJSON[] = 26 const char kProperJSON[] =
27 "{\n" 27 "{\n"
28 " \"compound\": {\n" 28 " \"compound\": {\n"
29 " \"a\": 1,\n" 29 " \"a\": 1,\n"
(...skipping 456 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 ASSERT_TRUE(PathExists(source_file_path)); 486 ASSERT_TRUE(PathExists(source_file_path));
487 JSONFileValueDeserializer deserializer(source_file_path); 487 JSONFileValueDeserializer deserializer(source_file_path);
488 scoped_ptr<Value> root; 488 scoped_ptr<Value> root;
489 root = deserializer.Deserialize(NULL, NULL); 489 root = deserializer.Deserialize(NULL, NULL);
490 ASSERT_TRUE(root.get()); 490 ASSERT_TRUE(root.get());
491 } 491 }
492 492
493 } // namespace 493 } // namespace
494 494
495 } // namespace base 495 } // namespace base
OLDNEW
« no previous file with comments | « base/json/json_value_converter_unittest.cc ('k') | base/json/json_writer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698