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

Side by Side Diff: mojo/public/cpp/environment/tests/logging_unittest.cc

Issue 1997473005: Remove requirement that mojo::Environment be instantiated. (Closed) Base URL: https://github.com/domokit/mojo.git@work797_no_utility_tls
Patch Set: rebased Created 4 years, 7 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stdlib.h> 5 #include <stdlib.h>
6 6
7 #include <sstream> 7 #include <sstream>
8 #include <string> 8 #include <string>
9 9
10 #include "mojo/public/cpp/environment/environment.h" 10 #include "mojo/public/cpp/environment/environment.h"
(...skipping 12 matching lines...) Expand all
23 int member; 23 int member;
24 }; 24 };
25 25
26 bool DcheckTestHelper(bool* was_called) { 26 bool DcheckTestHelper(bool* was_called) {
27 *was_called = true; 27 *was_called = true;
28 return false; 28 return false;
29 } 29 }
30 30
31 class LoggingTest : public testing::Test { 31 class LoggingTest : public testing::Test {
32 public: 32 public:
33 LoggingTest() : environment_(nullptr, &kMockLogger) { 33 LoggingTest() {
34 Environment::SetDefaultLogger(&kMockLogger);
34 minimum_log_level_ = MOJO_LOG_LEVEL_INFO; 35 minimum_log_level_ = MOJO_LOG_LEVEL_INFO;
35 ResetMockLogger(); 36 ResetMockLogger();
36 } 37 }
37 ~LoggingTest() override {} 38 ~LoggingTest() override {}
38 39
39 protected: 40 protected:
40 // Note: Does not reset |minimum_log_level_|. 41 // Note: Does not reset |minimum_log_level_|.
41 static void ResetMockLogger() { 42 static void ResetMockLogger() {
42 log_message_was_called_ = false; 43 log_message_was_called_ = false;
43 last_log_level_ = MOJO_LOG_LEVEL_INFO; 44 last_log_level_ = MOJO_LOG_LEVEL_INFO;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 last_source_line_ = source_line; 76 last_source_line_ = source_line;
76 last_message_ = message; 77 last_message_ = message;
77 } 78 }
78 79
79 static MojoLogLevel MockGetMinimumLogLevel() { return minimum_log_level_; } 80 static MojoLogLevel MockGetMinimumLogLevel() { return minimum_log_level_; }
80 81
81 static void MockSetMinimumLogLevel(MojoLogLevel minimum_log_level) { 82 static void MockSetMinimumLogLevel(MojoLogLevel minimum_log_level) {
82 minimum_log_level_ = minimum_log_level; 83 minimum_log_level_ = minimum_log_level;
83 } 84 }
84 85
85 Environment environment_;
86
87 static const MojoLogger kMockLogger; 86 static const MojoLogger kMockLogger;
88 static MojoLogLevel minimum_log_level_; 87 static MojoLogLevel minimum_log_level_;
89 static bool log_message_was_called_; 88 static bool log_message_was_called_;
90 static MojoLogLevel last_log_level_; 89 static MojoLogLevel last_log_level_;
91 static std::string last_source_file_; 90 static std::string last_source_file_;
92 static uint32_t last_source_line_; 91 static uint32_t last_source_line_;
93 static std::string last_message_; 92 static std::string last_message_;
94 static bool not_called_condition_was_called_; 93 static bool not_called_condition_was_called_;
95 94
96 MOJO_DISALLOW_COPY_AND_ASSIGN(LoggingTest); 95 MOJO_DISALLOW_COPY_AND_ASSIGN(LoggingTest);
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 ResetMockLogger(); 511 ResetMockLogger();
513 512
514 // Also try to make sure that we parenthesize the condition properly. 513 // Also try to make sure that we parenthesize the condition properly.
515 bool x = true; 514 bool x = true;
516 MOJO_DCHECK(false || x) << "hello"; 515 MOJO_DCHECK(false || x) << "hello";
517 EXPECT_FALSE(log_message_was_called()); 516 EXPECT_FALSE(log_message_was_called());
518 } 517 }
519 518
520 } // namespace 519 } // namespace
521 } // namespace mojo 520 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698