Improve Logger class

- constructor takes now a class, which implements
IWriter interface, instead of taking a path ->
logger is more flexible that way
- adjust tests of Logger class

include/ls_std/io/logging/Logger.hpp

@@ -21,10 +21,9 @@ namespace ls_std {
   class Logger : public Class {
     public:
 
-      explicit Logger(const std::string& _path);
+      explicit Logger(const std::shared_ptr<ls_std::IWriter>& _writer);
       ~Logger() = default;
 
-      void close();
       void debug(const ls_std::byte* _data);
       void error(const ls_std::byte* _data);
       void fatal(const ls_std::byte* _data);
@@ -36,11 +35,9 @@ namespace ls_std {
 
     private:
 
-      ls_std::File file;
       ls_std::LogLevel logLevel {};
-      std::shared_ptr<ls_std::FileOutputStream> outputStream {};
+      std::shared_ptr<ls_std::IWriter> writer {};
 
-      void _init();
       void _log(const ls_std::byte* _data, const ls_std::LogLevel& _logLevel);
   };
 }

source/ls_std/io/logging/Logger.cpp

@@ -11,17 +11,16 @@
 #include "../../../../include/ls_std/time/Date.hpp"
 #include "../../../../include/ls_std/io/NewLine.hpp"
 #include "../../../../include/ls_std/boxing/String.hpp"
+#include "../../../../include/ls_std/exception/NullPointerException.hpp"
 
-ls_std::Logger::Logger(const std::string &_path) : Class("Logger"),
-file(ls_std::File{_path}),
+ls_std::Logger::Logger(const std::shared_ptr<ls_std::IWriter> &_writer) : Class("Logger"),
 logLevel(ls_std::LogLevelValue::INFO)
 {
-  this->_init();
-}
+  if(_writer == nullptr) {
+    throw ls_std::NullPointerException {};
+  }
 
-void ls_std::Logger::close()
-{
-  this->outputStream->close();
+  this->writer = _writer;
 }
 
 void ls_std::Logger::debug(const ls_std::byte *_data)
@@ -76,19 +75,8 @@ void ls_std::Logger::warn(const ls_std::byte *_data)
   }
 }
 
-void ls_std::Logger::_init()
-{
-  if(!this->file.exists()) {
-    this->file.createNewFile();
-  }
-}
-
 void ls_std::Logger::_log(const ls_std::byte *_data, const ls_std::LogLevel& _logLevel)
 {
-  if(this->outputStream == nullptr) {
-    this->outputStream = std::make_shared<ls_std::FileOutputStream>(this->file, true);
-  }
-
   ls_std::Date date {};
 
   std::string message = "[" +
@@ -97,5 +85,5 @@ void ls_std::Logger::_log(const ls_std::byte *_data, const ls_std::LogLevel& _lo
       std::string(_data) +
       ls_std::NewLine::getUnixNewLine();
 
-  outputStream->write(message);
+  this->writer->write(message);
 }

test/cases/io/logging/LoggerTest.cpp

@@ -3,7 +3,7 @@
  * Company:         Lynar Studios
  * E-Mail:          webmaster@lynarstudios.com
  * Created:         2020-08-20
- * Changed:         2020-10-29
+ * Changed:         2020-11-06
  *
  * */
 
@@ -20,13 +20,26 @@ namespace {
 
       void SetUp() override {}
       void TearDown() override {}
+
+      static std::shared_ptr<ls_std::IWriter> createFileLogger(const std::string& _logName) {
+        std::string path = TestHelper::getResourcesFolderLocation() + _logName;
+        ls_std::File file {path};
+
+        if(!file.exists()) {
+          file.createNewFile();
+        }
+
+        std::shared_ptr<ls_std::IWriter> writer = std::dynamic_pointer_cast<ls_std::IWriter>(std::make_shared<ls_std::FileOutputStream>(file));
+
+        return writer;
+      }
   };
 
   TEST_F(LoggerTest, debug)
   {
-    std::string path = TestHelper::getResourcesFolderLocation() + "output_debug.log";
+    std::shared_ptr<ls_std::IWriter> writer = createFileLogger("output_debug.log");
 
-    ls_std::Logger logger {path};
+    ls_std::Logger logger {writer};
     logger.setLogLevel(ls_std::LogLevelValue::DEBUG);
     logger.debug("1. line!");
     logger.info("2. line!");
@@ -35,11 +48,12 @@ namespace {
     logger.warn("5. line!");
     logger.trace("6. line!");
 
-    logger.close();
+    std::dynamic_pointer_cast<ls_std::FileOutputStream>(writer)->close();
 
-    ls_std::File file {path};
+    ls_std::File file {TestHelper::getResourcesFolderLocation() + "output_debug.log"};
     ls_std::FileReader reader {file};
     ls_std::String content {reader.read()};
+    file.remove();
 
     ASSERT_TRUE(content.contains("1. line!"));
     ASSERT_TRUE(content.contains("2. line!"));
@@ -47,15 +61,13 @@ namespace {
     ASSERT_TRUE(content.contains("4. line!"));
     ASSERT_TRUE(content.contains("5. line!"));
     ASSERT_FALSE(content.contains("6. line!"));
-
-    file.remove();
   }
 
   TEST_F(LoggerTest, error)
   {
-    std::string path = TestHelper::getResourcesFolderLocation() + "output_error.log";
+    std::shared_ptr<ls_std::IWriter> writer = createFileLogger("output_error.log");
 
-    ls_std::Logger logger {path};
+    ls_std::Logger logger {writer};
     logger.setLogLevel(ls_std::LogLevelValue::ERR);
     logger.debug("1. line!");
     logger.info("2. line!");
@@ -64,9 +76,9 @@ namespace {
     logger.warn("5. line!");
     logger.trace("6. line!");
 
-    logger.close();
+    std::dynamic_pointer_cast<ls_std::FileOutputStream>(writer)->close();
 
-    ls_std::File file {path};
+    ls_std::File file {TestHelper::getResourcesFolderLocation() + "output_error.log"};
     ls_std::FileReader reader {file};
     ls_std::String content {reader.read()};
 
@@ -82,9 +94,9 @@ namespace {
 
   TEST_F(LoggerTest, fatal)
   {
-    std::string path = TestHelper::getResourcesFolderLocation() + "output_fatal.log";
+    std::shared_ptr<ls_std::IWriter> writer = createFileLogger("output_fatal.log");
 
-    ls_std::Logger logger {path};
+    ls_std::Logger logger {writer};
     logger.setLogLevel(ls_std::LogLevelValue::FATAL);
     logger.debug("1. line!");
     logger.info("2. line!");
@@ -93,8 +105,8 @@ namespace {
     logger.warn("5. line!");
     logger.trace("6. line!");
 
-    logger.close();
-    ls_std::File file {path};
+    std::dynamic_pointer_cast<ls_std::FileOutputStream>(writer)->close();
+    ls_std::File file {TestHelper::getResourcesFolderLocation() + "output_fatal.log"};
 
     ls_std::FileReader reader {file};
     ls_std::String content {reader.read()};
@@ -111,15 +123,15 @@ namespace {
 
   TEST_F(LoggerTest, getLogLevel)
   {
-    ls_std::Logger logger {TestHelper::getResourcesFolderLocation() + "output.log"};
+    ls_std::Logger logger {createFileLogger("output.log")};
     ASSERT_EQ(ls_std::LogLevelValue::INFO, logger.getLogLevel());
   }
 
   TEST_F(LoggerTest, info)
   {
-    std::string path = TestHelper::getResourcesFolderLocation() + "output_info.log";
+    std::shared_ptr<ls_std::IWriter> writer = createFileLogger("output_info.log");
 
-    ls_std::Logger logger {path};
+    ls_std::Logger logger {writer};
     logger.setLogLevel(ls_std::LogLevelValue::INFO);
     logger.fatal("1. line!");
     logger.error("2. line!");
@@ -128,8 +140,8 @@ namespace {
     logger.debug("5. line!");
     logger.trace("6. line!");
 
-    logger.close();
-    ls_std::File file {path};
+    std::dynamic_pointer_cast<ls_std::FileOutputStream>(writer)->close();
+    ls_std::File file {TestHelper::getResourcesFolderLocation() + "output_info.log"};
 
     ls_std::FileReader reader {file};
     ls_std::String content {reader.read()};
@@ -146,7 +158,7 @@ namespace {
 
   TEST_F(LoggerTest, setLogLevel)
   {
-    ls_std::Logger logger {TestHelper::getResourcesFolderLocation() + "output.log"};
+    ls_std::Logger logger {createFileLogger("output.log")};
     logger.setLogLevel(ls_std::LogLevelValue::ERR);
 
     ASSERT_EQ(ls_std::LogLevelValue::ERR, logger.getLogLevel());
@@ -154,9 +166,9 @@ namespace {
 
   TEST_F(LoggerTest, trace)
   {
-    std::string path = TestHelper::getResourcesFolderLocation() + "output_trace.log";
+    std::shared_ptr<ls_std::IWriter> writer = createFileLogger("output_trace.log");
 
-    ls_std::Logger logger {path};
+    ls_std::Logger logger {writer};
     logger.setLogLevel(ls_std::LogLevelValue::TRACE);
     logger.fatal("1. line!");
     logger.error("2. line!");
@@ -165,8 +177,8 @@ namespace {
     logger.debug("5. line!");
     logger.trace("6. line!");
 
-    logger.close();
-    ls_std::File file {path};
+    std::dynamic_pointer_cast<ls_std::FileOutputStream>(writer)->close();
+    ls_std::File file {TestHelper::getResourcesFolderLocation() + "output_trace.log"};
 
     ls_std::FileReader reader {file};
     ls_std::String content {reader.read()};
@@ -183,9 +195,9 @@ namespace {
 
   TEST_F(LoggerTest, warn)
   {
-    std::string path = TestHelper::getResourcesFolderLocation() + "output_warn.log";
+    std::shared_ptr<ls_std::IWriter> writer = createFileLogger("output_warn.log");
 
-    ls_std::Logger logger {path};
+    ls_std::Logger logger {writer};
     logger.setLogLevel(ls_std::LogLevelValue::WARN);
     logger.fatal("1. line!");
     logger.error("2. line!");
@@ -194,8 +206,8 @@ namespace {
     logger.debug("5. line!");
     logger.trace("6. line!");
 
-    logger.close();
-    ls_std::File file {path};
+    std::dynamic_pointer_cast<ls_std::FileOutputStream>(writer)->close();
+    ls_std::File file {TestHelper::getResourcesFolderLocation() + "output_warn.log"};
 
     ls_std::FileReader reader {file};
     ls_std::String content {reader.read()};