| Index: third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc
|
| diff --git a/third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc b/third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc
|
| index 8ca5538571c81c05a21e4745d3b52940a36a882a..7aef2ee8aed377644b9153ce222a1a88a26e9c44 100644
|
| --- a/third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc
|
| +++ b/third_party/mojo/src/mojo/public/cpp/environment/tests/logger_unittest.cc
|
| @@ -10,30 +10,22 @@ namespace mojo {
|
| namespace {
|
|
|
| TEST(LoggerTest, Basic) {
|
| - const char kPath[] = "/fake/path/to/file.cc";
|
| -
|
| Environment environment;
|
| const MojoLogger* const logger = Environment::GetDefaultLogger();
|
|
|
| - logger->LogMessage(MOJO_LOG_LEVEL_VERBOSE - 1, kPath, 123,
|
| - "Logged at VERBOSE-1 level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_VERBOSE, kPath, 123,
|
| - "Logged at VERBOSE level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_INFO, kPath, 123, "Logged at INFO level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_WARNING, kPath, 123,
|
| - "Logged at WARNING level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_ERROR, kPath, 123, "Logged at ERROR level");
|
| + logger->LogMessage(MOJO_LOG_LEVEL_VERBOSE - 1, "Logged at VERBOSE-1 level");
|
| + logger->LogMessage(MOJO_LOG_LEVEL_VERBOSE, "Logged at VERBOSE level");
|
| + logger->LogMessage(MOJO_LOG_LEVEL_INFO, "Logged at INFO level");
|
| + logger->LogMessage(MOJO_LOG_LEVEL_WARNING, "Logged at WARNING level");
|
| + logger->LogMessage(MOJO_LOG_LEVEL_ERROR, "Logged at ERROR level");
|
|
|
| // This should kill us:
|
| - EXPECT_DEATH_IF_SUPPORTED({
|
| - logger->LogMessage(MOJO_LOG_LEVEL_FATAL, kPath, 123,
|
| - "Logged at FATAL level");
|
| - }, "");
|
| + EXPECT_DEATH_IF_SUPPORTED(
|
| + { logger->LogMessage(MOJO_LOG_LEVEL_FATAL, "Logged at FATAL level"); },
|
| + "");
|
| }
|
|
|
| TEST(LoggerTest, LogLevels) {
|
| - const char kPath[] = "/fake/path/to/file.cc";
|
| -
|
| Environment environment;
|
| const MojoLogger* const logger = Environment::GetDefaultLogger();
|
|
|
| @@ -47,43 +39,18 @@ TEST(LoggerTest, LogLevels) {
|
| else
|
| EXPECT_EQ(MOJO_LOG_LEVEL_FATAL, logger->GetMinimumLogLevel());
|
|
|
| - logger->LogMessage(MOJO_LOG_LEVEL_VERBOSE - 1, kPath, 123,
|
| - "Logged at VERBOSE-1 level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_VERBOSE, kPath, 123,
|
| - "Logged at VERBOSE level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_INFO, kPath, 123, "Logged at INFO level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_WARNING, kPath, 123,
|
| - "Logged at WARNING level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_ERROR, kPath, 123,
|
| - "Logged at ERROR level");
|
| + logger->LogMessage(MOJO_LOG_LEVEL_VERBOSE - 1, "Logged at VERBOSE-1 level");
|
| + logger->LogMessage(MOJO_LOG_LEVEL_VERBOSE, "Logged at VERBOSE level");
|
| + logger->LogMessage(MOJO_LOG_LEVEL_INFO, "Logged at INFO level");
|
| + logger->LogMessage(MOJO_LOG_LEVEL_WARNING, "Logged at WARNING level");
|
| + logger->LogMessage(MOJO_LOG_LEVEL_ERROR, "Logged at ERROR level");
|
|
|
| // This should kill us:
|
| - EXPECT_DEATH_IF_SUPPORTED({
|
| - logger->LogMessage(MOJO_LOG_LEVEL_FATAL, kPath, 123,
|
| - "Logged at FATAL level");
|
| - }, "");
|
| + EXPECT_DEATH_IF_SUPPORTED(
|
| + { logger->LogMessage(MOJO_LOG_LEVEL_FATAL, "Logged at FATAL level"); },
|
| + "");
|
| }
|
| }
|
|
|
| -TEST(LoggerTest, NoFile) {
|
| - Environment environment;
|
| - const MojoLogger* const logger = Environment::GetDefaultLogger();
|
| -
|
| - logger->LogMessage(MOJO_LOG_LEVEL_VERBOSE - 1, nullptr, 0,
|
| - "Logged at VERBOSE-1 level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_VERBOSE, nullptr, 0,
|
| - "Logged at VERBOSE level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_INFO, nullptr, 0, "Logged at INFO level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_WARNING, nullptr, 0,
|
| - "Logged at WARNING level");
|
| - logger->LogMessage(MOJO_LOG_LEVEL_ERROR, nullptr, 0, "Logged at ERROR level");
|
| -
|
| - // This should kill us:
|
| - EXPECT_DEATH_IF_SUPPORTED({
|
| - logger->LogMessage(MOJO_LOG_LEVEL_FATAL, nullptr, 0,
|
| - "Logged at FATAL level");
|
| - }, "");
|
| -}
|
| -
|
| } // namespace
|
| } // namespace mojo
|
|
|