test/native/logging/test_logOutputList.cpp

rev 12117 : 8146009:

@@ -20,10 +20,11 @@
  * 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/logOutputList.hpp"
 #include "runtime/os.hpp"
 #include "unittest.hpp"

@@ -171,11 +172,11 @@
 // Test is_level() on lists with a single output on different levels
 TEST(LogOutputList, is_level_single_output) {
   for (size_t i = LogLevel::First; i < LogLevel::Count; i++) {
     LogLevelType level = static_cast<LogLevelType>(i);
     LogOutputList list;
-    list.set_output_level(LogOutput::Stdout, level);
+    list.set_output_level(&StdoutLog, level);
     for (size_t j = LogLevel::First; j < LogLevel::Count; j++) {
       LogLevelType other = static_cast<LogLevelType>(j);
       // Verify that levels finer than the current level for stdout are reported as disabled,
       // and levels equal to or included in the current level are reported as enabled
       if (other >= level) {

@@ -199,12 +200,12 @@
 }
 
 // Test is_level() on lists with two outputs on different levels
 TEST(LogOutputList, is_level_multiple_outputs) {
   for (size_t i = LogLevel::First; i < LogLevel::Count - 1; i++) {
-      LogOutput* dummy1 = LogOutput::Stdout;
-      LogOutput* dummy2 = LogOutput::Stderr;
+      LogOutput* dummy1 = &StdoutLog;
+      LogOutput* dummy2 = &StderrLog;
       LogLevelType first = static_cast<LogLevelType>(i);
       LogLevelType second = static_cast<LogLevelType>(i + 1);
       LogOutputList list;
       list.set_output_level(dummy1, first);
       list.set_output_level(dummy2, second);

@@ -224,23 +225,23 @@
 
 TEST(LogOutputList, level_for) {
   LogOutputList list;
 
   // Ask the empty list about stdout, stderr
-  EXPECT_EQ(LogLevel::Off, list.level_for(LogOutput::Stdout));
-  EXPECT_EQ(LogLevel::Off, list.level_for(LogOutput::Stderr));
+  EXPECT_EQ(LogLevel::Off, list.level_for(&StdoutLog));
+  EXPECT_EQ(LogLevel::Off, list.level_for(&StderrLog));
 
   // Ask for level in a list with two outputs on different levels
-  list.set_output_level(LogOutput::Stdout, LogLevel::Info);
-  list.set_output_level(LogOutput::Stderr, LogLevel::Trace);
-  EXPECT_EQ(LogLevel::Info, list.level_for(LogOutput::Stdout));
-  EXPECT_EQ(LogLevel::Trace, list.level_for(LogOutput::Stderr));
+  list.set_output_level(&StdoutLog, LogLevel::Info);
+  list.set_output_level(&StderrLog, LogLevel::Trace);
+  EXPECT_EQ(LogLevel::Info, list.level_for(&StdoutLog));
+  EXPECT_EQ(LogLevel::Trace, list.level_for(&StderrLog));
 
   // Remove and ask again
-  list.set_output_level(LogOutput::Stdout, LogLevel::Off);
-  EXPECT_EQ(LogLevel::Off, list.level_for(LogOutput::Stdout));
-  EXPECT_EQ(LogLevel::Trace, list.level_for(LogOutput::Stderr));
+  list.set_output_level(&StdoutLog, LogLevel::Off);
+  EXPECT_EQ(LogLevel::Off, list.level_for(&StdoutLog));
+  EXPECT_EQ(LogLevel::Trace, list.level_for(&StderrLog));
 
   // Ask about an unknown output
   LogOutput* dummy = dummy_output(4711);
   EXPECT_EQ(LogLevel::Off, list.level_for(dummy));
 

@@ -249,7 +250,7 @@
     list.set_output_level(dummy, level);
     EXPECT_EQ(level, list.level_for(dummy));
   }
 
   // Make sure the stderr level is still the same
-  EXPECT_EQ(LogLevel::Trace, list.level_for(LogOutput::Stderr));
+  EXPECT_EQ(LogLevel::Trace, list.level_for(&StderrLog));
 }