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

Side by Side Diff: base/logging_unittest.cc

Issue 331143007: Remove the LOG_ERROR_REPORT log severity level. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missed a SetLogReportHandler; also removed the --silent-dump-on-dcheck flag Created 6 years, 6 months 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/logging.cc ('k') | base/logging_win.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/logging.h" 6 #include "base/logging.h"
7 7
8 #include "testing/gmock/include/gmock/gmock.h" 8 #include "testing/gmock/include/gmock/gmock.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 10
(...skipping 14 matching lines...) Expand all
25 25
26 // Class to make sure any manipulations we do to the min log level are 26 // Class to make sure any manipulations we do to the min log level are
27 // contained (i.e., do not affect other unit tests). 27 // contained (i.e., do not affect other unit tests).
28 class LogStateSaver { 28 class LogStateSaver {
29 public: 29 public:
30 LogStateSaver() : old_min_log_level_(GetMinLogLevel()) {} 30 LogStateSaver() : old_min_log_level_(GetMinLogLevel()) {}
31 31
32 ~LogStateSaver() { 32 ~LogStateSaver() {
33 SetMinLogLevel(old_min_log_level_); 33 SetMinLogLevel(old_min_log_level_);
34 SetLogAssertHandler(NULL); 34 SetLogAssertHandler(NULL);
35 SetLogReportHandler(NULL);
36 log_sink_call_count = 0; 35 log_sink_call_count = 0;
37 } 36 }
38 37
39 private: 38 private:
40 int old_min_log_level_; 39 int old_min_log_level_;
41 40
42 DISALLOW_COPY_AND_ASSIGN(LogStateSaver); 41 DISALLOW_COPY_AND_ASSIGN(LogStateSaver);
43 }; 42 };
44 43
45 class LoggingTest : public testing::Test { 44 class LoggingTest : public testing::Test {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 #if defined(NDEBUG) 88 #if defined(NDEBUG)
90 const bool kDfatalIsFatal = false; 89 const bool kDfatalIsFatal = false;
91 #else // defined(NDEBUG) 90 #else // defined(NDEBUG)
92 const bool kDfatalIsFatal = true; 91 const bool kDfatalIsFatal = true;
93 #endif // defined(NDEBUG) 92 #endif // defined(NDEBUG)
94 93
95 SetMinLogLevel(LOG_INFO); 94 SetMinLogLevel(LOG_INFO);
96 EXPECT_TRUE(LOG_IS_ON(INFO)); 95 EXPECT_TRUE(LOG_IS_ON(INFO));
97 EXPECT_TRUE(LOG_IS_ON(WARNING)); 96 EXPECT_TRUE(LOG_IS_ON(WARNING));
98 EXPECT_TRUE(LOG_IS_ON(ERROR)); 97 EXPECT_TRUE(LOG_IS_ON(ERROR));
99 EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
100 EXPECT_TRUE(LOG_IS_ON(FATAL)); 98 EXPECT_TRUE(LOG_IS_ON(FATAL));
101 EXPECT_TRUE(LOG_IS_ON(DFATAL)); 99 EXPECT_TRUE(LOG_IS_ON(DFATAL));
102 100
103 SetMinLogLevel(LOG_WARNING); 101 SetMinLogLevel(LOG_WARNING);
104 EXPECT_FALSE(LOG_IS_ON(INFO)); 102 EXPECT_FALSE(LOG_IS_ON(INFO));
105 EXPECT_TRUE(LOG_IS_ON(WARNING)); 103 EXPECT_TRUE(LOG_IS_ON(WARNING));
106 EXPECT_TRUE(LOG_IS_ON(ERROR)); 104 EXPECT_TRUE(LOG_IS_ON(ERROR));
107 EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
108 EXPECT_TRUE(LOG_IS_ON(FATAL)); 105 EXPECT_TRUE(LOG_IS_ON(FATAL));
109 EXPECT_TRUE(LOG_IS_ON(DFATAL)); 106 EXPECT_TRUE(LOG_IS_ON(DFATAL));
110 107
111 SetMinLogLevel(LOG_ERROR); 108 SetMinLogLevel(LOG_ERROR);
112 EXPECT_FALSE(LOG_IS_ON(INFO)); 109 EXPECT_FALSE(LOG_IS_ON(INFO));
113 EXPECT_FALSE(LOG_IS_ON(WARNING)); 110 EXPECT_FALSE(LOG_IS_ON(WARNING));
114 EXPECT_TRUE(LOG_IS_ON(ERROR)); 111 EXPECT_TRUE(LOG_IS_ON(ERROR));
115 EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
116 EXPECT_TRUE(LOG_IS_ON(FATAL)); 112 EXPECT_TRUE(LOG_IS_ON(FATAL));
117 EXPECT_TRUE(LOG_IS_ON(DFATAL)); 113 EXPECT_TRUE(LOG_IS_ON(DFATAL));
118 114
119 SetMinLogLevel(LOG_ERROR_REPORT); 115 // LOG_IS_ON(FATAL) should always be true.
120 EXPECT_FALSE(LOG_IS_ON(INFO));
121 EXPECT_FALSE(LOG_IS_ON(WARNING));
122 EXPECT_FALSE(LOG_IS_ON(ERROR));
123 EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
124 EXPECT_TRUE(LOG_IS_ON(FATAL));
125 EXPECT_TRUE(kDfatalIsFatal == LOG_IS_ON(DFATAL));
126
127 // LOG_IS_ON(ERROR_REPORT) should always be true.
128 SetMinLogLevel(LOG_FATAL);
129 EXPECT_FALSE(LOG_IS_ON(INFO));
130 EXPECT_FALSE(LOG_IS_ON(WARNING));
131 EXPECT_FALSE(LOG_IS_ON(ERROR));
132 EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
133 EXPECT_TRUE(LOG_IS_ON(FATAL));
134 EXPECT_TRUE(kDfatalIsFatal == LOG_IS_ON(DFATAL));
135
136 // So should LOG_IS_ON(FATAL).
137 SetMinLogLevel(LOG_FATAL + 1); 116 SetMinLogLevel(LOG_FATAL + 1);
138 EXPECT_FALSE(LOG_IS_ON(INFO)); 117 EXPECT_FALSE(LOG_IS_ON(INFO));
139 EXPECT_FALSE(LOG_IS_ON(WARNING)); 118 EXPECT_FALSE(LOG_IS_ON(WARNING));
140 EXPECT_FALSE(LOG_IS_ON(ERROR)); 119 EXPECT_FALSE(LOG_IS_ON(ERROR));
141 EXPECT_TRUE(LOG_IS_ON(ERROR_REPORT));
142 EXPECT_TRUE(LOG_IS_ON(FATAL)); 120 EXPECT_TRUE(LOG_IS_ON(FATAL));
143 EXPECT_TRUE(kDfatalIsFatal == LOG_IS_ON(DFATAL)); 121 EXPECT_TRUE(kDfatalIsFatal == LOG_IS_ON(DFATAL));
144 } 122 }
145 123
146 TEST_F(LoggingTest, LoggingIsLazy) { 124 TEST_F(LoggingTest, LoggingIsLazy) {
147 MockLogSource mock_log_source; 125 MockLogSource mock_log_source;
148 EXPECT_CALL(mock_log_source, Log()).Times(0); 126 EXPECT_CALL(mock_log_source, Log()).Times(0);
149 127
150 SetMinLogLevel(LOG_WARNING); 128 SetMinLogLevel(LOG_WARNING);
151 129
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 // These should still reference |some_variable| so we don't get 229 // These should still reference |some_variable| so we don't get
252 // unused variable warnings. 230 // unused variable warnings.
253 DCHECK(some_variable) << "test"; 231 DCHECK(some_variable) << "test";
254 DPCHECK(some_variable) << "test"; 232 DPCHECK(some_variable) << "test";
255 DCHECK_EQ(some_variable, 1) << "test"; 233 DCHECK_EQ(some_variable, 1) << "test";
256 } 234 }
257 235
258 } // namespace 236 } // namespace
259 237
260 } // namespace logging 238 } // namespace logging
OLDNEW
« no previous file with comments | « base/logging.cc ('k') | base/logging_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698