test/native/logging/test_logTagSet.cpp

rev 12117 : 8146009:

*** 20,29 ****
--- 20,30 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   *
   */
  #include "precompiled.hpp"
+ #include "logging/logFileStreamOutput.hpp"
  #include "logging/logLevel.hpp"
  #include "logging/logOutput.hpp"
  #include "logging/logTag.hpp"
  #include "logging/logTagSet.hpp"
  #include "unittest.hpp"
*** 35,56 ****
      ts->label(buf, sizeof(buf));
      SCOPED_TRACE(buf);
      EXPECT_TRUE(ts->is_level(LogLevel::Error));
      EXPECT_TRUE(ts->is_level(LogLevel::Warning));
      EXPECT_FALSE(ts->is_level(LogLevel::Info));
!     EXPECT_TRUE(ts->has_output(LogOutput::Stdout));
!     EXPECT_FALSE(ts->has_output(LogOutput::Stderr));
    }
  }
  
  TEST(LogTagSet, has_output) {
    LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
!   ts.set_output_level(LogOutput::Stderr, LogLevel::Trace);
!   EXPECT_TRUE(ts.has_output(LogOutput::Stderr));
    EXPECT_FALSE(ts.has_output(NULL));
!   ts.set_output_level(LogOutput::Stderr, LogLevel::Off);
!   EXPECT_FALSE(ts.has_output(LogOutput::Stderr));
  }
  
  TEST(LogTagSet, ntags) {
    const LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
    EXPECT_EQ(1u, ts.ntags());
--- 36,57 ----
      ts->label(buf, sizeof(buf));
      SCOPED_TRACE(buf);
      EXPECT_TRUE(ts->is_level(LogLevel::Error));
      EXPECT_TRUE(ts->is_level(LogLevel::Warning));
      EXPECT_FALSE(ts->is_level(LogLevel::Info));
!     EXPECT_TRUE(ts->has_output(&StdoutLog));
!     EXPECT_FALSE(ts->has_output(&StderrLog));
    }
  }
  
  TEST(LogTagSet, has_output) {
    LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
!   ts.set_output_level(&StderrLog, LogLevel::Trace);
!   EXPECT_TRUE(ts.has_output(&StderrLog));
    EXPECT_FALSE(ts.has_output(NULL));
!   ts.set_output_level(&StderrLog, LogLevel::Off);
!   EXPECT_FALSE(ts.has_output(&StderrLog));
  }
  
  TEST(LogTagSet, ntags) {
    const LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
    EXPECT_EQ(1u, ts.ntags());
*** 59,80 ****
  }
  
  TEST(LogTagSet, is_level) {
    LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
    // Set info level on stdout and verify that is_level() reports correctly
!   ts.set_output_level(LogOutput::Stdout, LogLevel::Info);
    EXPECT_TRUE(ts.is_level(LogLevel::Error));
    EXPECT_TRUE(ts.is_level(LogLevel::Warning));
    EXPECT_TRUE(ts.is_level(LogLevel::Info));
    EXPECT_FALSE(ts.is_level(LogLevel::Debug));
    EXPECT_FALSE(ts.is_level(LogLevel::Trace));
!   ts.set_output_level(LogOutput::Stdout, LogLevel::Default);
    EXPECT_TRUE(ts.is_level(LogLevel::Default));
  }
  
  TEST(LogTagSet, level_for) {
!   LogOutput* output = LogOutput::Stdout;
    LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
    for (uint i = 0; i < LogLevel::Count; i++) {
      LogLevelType level = static_cast<LogLevelType>(i);
      // Set the level and verify that level_for() reports it back
      ts.set_output_level(output, level);
--- 60,81 ----
  }
  
  TEST(LogTagSet, is_level) {
    LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
    // Set info level on stdout and verify that is_level() reports correctly
!   ts.set_output_level(&StdoutLog, LogLevel::Info);
    EXPECT_TRUE(ts.is_level(LogLevel::Error));
    EXPECT_TRUE(ts.is_level(LogLevel::Warning));
    EXPECT_TRUE(ts.is_level(LogLevel::Info));
    EXPECT_FALSE(ts.is_level(LogLevel::Debug));
    EXPECT_FALSE(ts.is_level(LogLevel::Trace));
!   ts.set_output_level(&StdoutLog, LogLevel::Default);
    EXPECT_TRUE(ts.is_level(LogLevel::Default));
  }
  
  TEST(LogTagSet, level_for) {
!   LogOutput* output = &StdoutLog;
    LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
    for (uint i = 0; i < LogLevel::Count; i++) {
      LogLevelType level = static_cast<LogLevelType>(i);
      // Set the level and verify that level_for() reports it back
      ts.set_output_level(output, level);