Roll WebRTC 9187:9189

jingle/glue/logging_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Note: this test tests LOG_V and LOG_E since all other logs are expressed
 // in forms of them. LOG is also tested for good measure.
 // Also note that we are only allowed to call InitLogging() twice so the test
 // cases are more dense than normal.
 
 // We must include Chromium headers before including the overrides header
@@ skipping 58 matching lines @@
     return false;
   }
   EXPECT_TRUE(VLOG_IS_ON(verbosity_level));
   EXPECT_FALSE(VLOG_IS_ON(verbosity_level + 1));
   return true;
 }
 
 TEST(LibjingleLogTest, DefaultConfiguration) {
   ASSERT_TRUE(Initialize(kDefaultVerbosity));
 
-  // In the default configuration nothing should be logged.
+  // In the default configuration only warnings and errors should be logged.
   LOG_V(rtc::LS_ERROR) << AsString(rtc::LS_ERROR);
   LOG_V(rtc::LS_WARNING) << AsString(rtc::LS_WARNING);
   LOG_V(rtc::LS_INFO) << AsString(rtc::LS_INFO);
   LOG_V(rtc::LS_VERBOSE) << AsString(rtc::LS_VERBOSE);
   LOG_V(rtc::LS_SENSITIVE) << AsString(rtc::LS_SENSITIVE);
 
   // Read file to string.
   base::FilePath file_path(log_file_name);
   std::string contents_of_file;
   base::ReadFileToString(file_path, &contents_of_file);
 
   // Make sure string contains the expected values.
-  EXPECT_FALSE(ContainsString(contents_of_file, AsString(rtc::LS_ERROR)));
-  EXPECT_FALSE(ContainsString(contents_of_file,
-                              AsString(rtc::LS_WARNING)));
+  EXPECT_TRUE(ContainsString(contents_of_file, AsString(rtc::LS_ERROR)));
+  EXPECT_TRUE(ContainsString(contents_of_file, AsString(rtc::LS_WARNING)));
   EXPECT_FALSE(ContainsString(contents_of_file, AsString(rtc::LS_INFO)));
   EXPECT_FALSE(ContainsString(contents_of_file,
                               AsString(rtc::LS_VERBOSE)));
   EXPECT_FALSE(ContainsString(contents_of_file,
                               AsString(rtc::LS_SENSITIVE)));
 }
 
 TEST(LibjingleLogTest, InfoConfiguration) {
-  ASSERT_TRUE(Initialize(rtc::LS_INFO));

[tommi (sloooow) - chröme, 2015/05/14 02:27:23]

rtc::LS_INFO was incorrect since rtc::LS_INFO == 3

+  ASSERT_TRUE(Initialize(0));  // 0 == Chrome's 'info' level.
 
   // In this configuration everything lower or equal to LS_INFO should be
   // logged.
   LOG_V(rtc::LS_ERROR) << AsString(rtc::LS_ERROR);
   LOG_V(rtc::LS_WARNING) << AsString(rtc::LS_WARNING);
   LOG_V(rtc::LS_INFO) << AsString(rtc::LS_INFO);
   LOG_V(rtc::LS_VERBOSE) << AsString(rtc::LS_VERBOSE);
   LOG_V(rtc::LS_SENSITIVE) << AsString(rtc::LS_SENSITIVE);
 
   // Read file to string.
   base::FilePath file_path(log_file_name);
   std::string contents_of_file;
   base::ReadFileToString(file_path, &contents_of_file);
 
   // Make sure string contains the expected values.
   EXPECT_TRUE(ContainsString(contents_of_file, AsString(rtc::LS_ERROR)));
   EXPECT_TRUE(ContainsString(contents_of_file,
                              AsString(rtc::LS_WARNING)));
-  EXPECT_TRUE(ContainsString(contents_of_file, AsString(rtc::LS_INFO)));
+  EXPECT_FALSE(ContainsString(contents_of_file, AsString(rtc::LS_INFO)));
   EXPECT_FALSE(ContainsString(contents_of_file,
                               AsString(rtc::LS_VERBOSE)));
   EXPECT_FALSE(ContainsString(contents_of_file,
                               AsString(rtc::LS_SENSITIVE)));
 
   // Also check that the log is proper.
   EXPECT_TRUE(ContainsString(contents_of_file, "logging_unittest.cc"));
   EXPECT_FALSE(ContainsString(contents_of_file, "logging.h"));
   EXPECT_FALSE(ContainsString(contents_of_file, "logging.cc"));
 }
 
 TEST(LibjingleLogTest, LogEverythingConfiguration) {
-  ASSERT_TRUE(Initialize(rtc::LS_SENSITIVE));

[tommi (sloooow) - chröme, 2015/05/14 02:27:23]

This was also incorrect since LS_SENSITIVE==5

+  ASSERT_TRUE(Initialize(2));  // verbosity at level 2 allows LS_SENSITIVE.
 
   // In this configuration everything should be logged.
   LOG_V(rtc::LS_ERROR) << AsString(rtc::LS_ERROR);
   LOG_V(rtc::LS_WARNING) << AsString(rtc::LS_WARNING);
   LOG(LS_INFO) << AsString(rtc::LS_INFO);
   static const int kFakeError = 1;
   LOG_E(LS_INFO, EN, kFakeError) << "LOG_E(" << AsString(rtc::LS_INFO) <<
       ")";
   LOG_V(rtc::LS_VERBOSE) << AsString(rtc::LS_VERBOSE);
   LOG_V(rtc::LS_SENSITIVE) << AsString(rtc::LS_SENSITIVE);
 
   // Read file to string.
   base::FilePath file_path(log_file_name);
   std::string contents_of_file;
   base::ReadFileToString(file_path, &contents_of_file);
 
   // Make sure string contains the expected values.
   EXPECT_TRUE(ContainsString(contents_of_file, AsString(rtc::LS_ERROR)));
   EXPECT_TRUE(ContainsString(contents_of_file,
                              AsString(rtc::LS_WARNING)));
   EXPECT_TRUE(ContainsString(contents_of_file, AsString(rtc::LS_INFO)));
   // LOG_E
   EXPECT_TRUE(ContainsString(contents_of_file, strerror(kFakeError)));
   EXPECT_TRUE(ContainsString(contents_of_file,
                              AsString(rtc::LS_VERBOSE)));
   EXPECT_TRUE(ContainsString(contents_of_file,
                              AsString(rtc::LS_SENSITIVE)));
 }