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

Side by Side Diff: trunk/src/net/base/net_log_logger_unittest.cc

Issue 105823009: Revert 239280 "Move more file_util functions to base namespace." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "net/base/net_log_logger.h" 5 #include "net/base/net_log_logger.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/json/json_reader.h" 10 #include "base/json/json_reader.h"
(...skipping 10 matching lines...) Expand all
21 } 21 }
22 22
23 protected: 23 protected:
24 base::ScopedTempDir temp_dir_; 24 base::ScopedTempDir temp_dir_;
25 base::FilePath log_path_; 25 base::FilePath log_path_;
26 }; 26 };
27 27
28 TEST_F(NetLogLoggerTest, GeneratesValidJSONForNoEvents) { 28 TEST_F(NetLogLoggerTest, GeneratesValidJSONForNoEvents) {
29 { 29 {
30 // Create and destroy a logger. 30 // Create and destroy a logger.
31 FILE* file = base::OpenFile(log_path_, "w"); 31 FILE* file = file_util::OpenFile(log_path_, "w");
32 ASSERT_TRUE(file); 32 ASSERT_TRUE(file);
33 scoped_ptr<base::Value> constants(NetLogLogger::GetConstants()); 33 scoped_ptr<base::Value> constants(NetLogLogger::GetConstants());
34 NetLogLogger logger(file, *constants); 34 NetLogLogger logger(file, *constants);
35 } 35 }
36 36
37 std::string input; 37 std::string input;
38 ASSERT_TRUE(base::ReadFileToString(log_path_, &input)); 38 ASSERT_TRUE(base::ReadFileToString(log_path_, &input));
39 39
40 base::JSONReader reader; 40 base::JSONReader reader;
41 scoped_ptr<base::Value> root(reader.ReadToValue(input)); 41 scoped_ptr<base::Value> root(reader.ReadToValue(input));
42 ASSERT_TRUE(root) << reader.GetErrorMessage(); 42 ASSERT_TRUE(root) << reader.GetErrorMessage();
43 43
44 base::DictionaryValue* dict; 44 base::DictionaryValue* dict;
45 ASSERT_TRUE(root->GetAsDictionary(&dict)); 45 ASSERT_TRUE(root->GetAsDictionary(&dict));
46 base::ListValue* events; 46 base::ListValue* events;
47 ASSERT_TRUE(dict->GetList("events", &events)); 47 ASSERT_TRUE(dict->GetList("events", &events));
48 ASSERT_EQ(0u, events->GetSize()); 48 ASSERT_EQ(0u, events->GetSize());
49 } 49 }
50 50
51 TEST_F(NetLogLoggerTest, GeneratesValidJSONWithOneEvent) { 51 TEST_F(NetLogLoggerTest, GeneratesValidJSONWithOneEvent) {
52 { 52 {
53 FILE* file = base::OpenFile(log_path_, "w"); 53 FILE* file = file_util::OpenFile(log_path_, "w");
54 ASSERT_TRUE(file); 54 ASSERT_TRUE(file);
55 scoped_ptr<base::Value> constants(NetLogLogger::GetConstants()); 55 scoped_ptr<base::Value> constants(NetLogLogger::GetConstants());
56 NetLogLogger logger(file, *constants); 56 NetLogLogger logger(file, *constants);
57 57
58 const int kDummyId = 1; 58 const int kDummyId = 1;
59 NetLog::Source source(NetLog::SOURCE_SPDY_SESSION, kDummyId); 59 NetLog::Source source(NetLog::SOURCE_SPDY_SESSION, kDummyId);
60 NetLog::Entry entry(NetLog::TYPE_PROXY_SERVICE, 60 NetLog::Entry entry(NetLog::TYPE_PROXY_SERVICE,
61 source, 61 source,
62 NetLog::PHASE_BEGIN, 62 NetLog::PHASE_BEGIN,
63 base::TimeTicks::Now(), 63 base::TimeTicks::Now(),
(...skipping 11 matching lines...) Expand all
75 75
76 base::DictionaryValue* dict; 76 base::DictionaryValue* dict;
77 ASSERT_TRUE(root->GetAsDictionary(&dict)); 77 ASSERT_TRUE(root->GetAsDictionary(&dict));
78 base::ListValue* events; 78 base::ListValue* events;
79 ASSERT_TRUE(dict->GetList("events", &events)); 79 ASSERT_TRUE(dict->GetList("events", &events));
80 ASSERT_EQ(1u, events->GetSize()); 80 ASSERT_EQ(1u, events->GetSize());
81 } 81 }
82 82
83 TEST_F(NetLogLoggerTest, GeneratesValidJSONWithMultipleEvents) { 83 TEST_F(NetLogLoggerTest, GeneratesValidJSONWithMultipleEvents) {
84 { 84 {
85 FILE* file = base::OpenFile(log_path_, "w"); 85 FILE* file = file_util::OpenFile(log_path_, "w");
86 ASSERT_TRUE(file); 86 ASSERT_TRUE(file);
87 scoped_ptr<base::Value> constants(NetLogLogger::GetConstants()); 87 scoped_ptr<base::Value> constants(NetLogLogger::GetConstants());
88 NetLogLogger logger(file, *constants); 88 NetLogLogger logger(file, *constants);
89 89
90 const int kDummyId = 1; 90 const int kDummyId = 1;
91 NetLog::Source source(NetLog::SOURCE_SPDY_SESSION, kDummyId); 91 NetLog::Source source(NetLog::SOURCE_SPDY_SESSION, kDummyId);
92 NetLog::Entry entry(NetLog::TYPE_PROXY_SERVICE, 92 NetLog::Entry entry(NetLog::TYPE_PROXY_SERVICE,
93 source, 93 source,
94 NetLog::PHASE_BEGIN, 94 NetLog::PHASE_BEGIN,
95 base::TimeTicks::Now(), 95 base::TimeTicks::Now(),
(...skipping 13 matching lines...) Expand all
109 ASSERT_TRUE(root) << reader.GetErrorMessage(); 109 ASSERT_TRUE(root) << reader.GetErrorMessage();
110 110
111 base::DictionaryValue* dict; 111 base::DictionaryValue* dict;
112 ASSERT_TRUE(root->GetAsDictionary(&dict)); 112 ASSERT_TRUE(root->GetAsDictionary(&dict));
113 base::ListValue* events; 113 base::ListValue* events;
114 ASSERT_TRUE(dict->GetList("events", &events)); 114 ASSERT_TRUE(dict->GetList("events", &events));
115 ASSERT_EQ(2u, events->GetSize()); 115 ASSERT_EQ(2u, events->GetSize());
116 } 116 }
117 117
118 } // namespace net 118 } // namespace net
OLDNEW
« no previous file with comments | « trunk/src/net/base/file_stream_unittest.cc ('k') | trunk/src/net/disk_cache/backend_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698