Index: unittests/tst_logging.cpp
===================================================================
diff -u -r16bd55822fa77e5bea6fdfa7b54abf123c1da8bb -rf6c480d06e4b8c770012115d20df2a44e0da8031
--- unittests/tst_logging.cpp	(.../tst_logging.cpp)	(revision 16bd55822fa77e5bea6fdfa7b54abf123c1da8bb)
+++ unittests/tst_logging.cpp	(.../tst_logging.cpp)	(revision f6c480d06e4b8c770012115d20df2a44e0da8031)
@@ -1,13 +1,13 @@
 /*!
  *
- * Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved.
+ * Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved.
  * \copyright
  * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
  * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
  *
  * \file    tst_logging.cpp
  * \author  (last)      Behrouz NematiPour
- * \date    (last)      08-Sep-2020
+ * \date    (last)      22-Feb-2024
  * \author  (original)  Behrouz NematiPour
  * \date    (original)  08-Jan-2020
  *
@@ -36,39 +36,35 @@
 void tst_logging::initTestCase()
 {
     Threads::registerTypes();
+    QCOMPARE( _Logger.init(Threads::_Logger_Thread), !_Logger.init(Threads::_Logger_Thread));
     _Logger._timeFormat = "";
-    QCOMPARE( _Logger.init(), ! _Logger.init() );
-    QString mContent;
-    FileHandler::read(_Logger._logFileName, mContent);
-    QCOMPARE(mContent, ",E,UI,Storage::Logger Initialized\n");
 }
 
 void tst_logging::cleanup()
 {
+    // TODO need to
     QThread::currentThread()->msleep(1000);
 }
 
 void tst_logging::init()
 {
-    QString mContent;
-    FileHandler::write(_Logger._logFileName, mContent, false);
-    QCOMPARE(mContent, "");
+    // TODO need to fix and add a "start" step that gets called before each test function
 }
 
 void tst_logging::logEvent()
 {
     LOG_APPED("1 - Event log has been created");
     QString mContent;
     FileHandler::read(_Logger._logFileName, mContent);
-    QCOMPARE(mContent, ",E,1 - Event log has been created\n");
+    QCOMPARE(mContent, ",1 - Event log has been created\n");
 }
 
 void tst_logging::logDatum()
 {
-    LOG_DATUM("3 - Datum log has been created");
+    LOG_APPED("3 - Datum log has been created");
     QString mContent;
     FileHandler::read(_Logger._logFileName, mContent);
-    QCOMPARE(mContent, ",D,3 - Datum log has been created\n");
+    QCOMPARE(mContent, ",3 - Datum log has been created\n");
 }
 
 void tst_logging::logError()
@@ -81,7 +77,7 @@
 
 void tst_logging::logUnknown()
 {
-    emit Storage::Logger::I().didLog("4 - Datum log has been created", Storage::Logger::LogType::eLogType_Count);
+    emit Storage::Logger::I().didLog("4 - Datum log has been created", Storage::Logger::LogType::eLogType_Count, false);
     QString mContent;
     FileHandler::read(_Logger._logFileName, mContent);
     QCOMPARE(mContent, ",Incorrect type of logging 3\n"
@@ -134,14 +130,14 @@
 
 void tst_logging::setLogPath_F()
 {
-    _Logger._dir = "/";
+    _Logger._dir.setPath("/");
     bool b = _Logger.setLogPath();
     QCOMPARE(b , false);
 }
 
 void tst_logging::setLogPath_T()
 {
-    _Logger._dir = "/tmp";
+    _Logger._dir.setPath("/tmp");
     bool b = _Logger.setLogPath();
     QCOMPARE(b , true);
 }
@@ -151,3 +147,50 @@
     QString mContent;
     QVERIFY(! FileHandler::read("TheFileWhichDoesntExist.UnknownExtension", mContent));
 }
+
+void tst_logging::setLogPath_TreatmentType()
+{
+    // setLogPath for type eLogTrmt returns true by default, check
+    QVERIFY(_Logger.setLogPath(Storage::Logger::LogType::eLogTrtmt));
+}
+
+void tst_logging::tst_log_function_extraCases()
+{
+    // Test the log function for the "Squish-unreachable" cases
+
+    // case 1 : default log type of make log file name section
+    _Logger.log("Mock Log Message String", Storage::Logger::LogType::eLogTrtmt, false);
+    QString mContent;
+    FileHandler::read(_Logger._logFileName, mContent);
+    QCOMPARE(mContent, "Incorrect type of logging");
+
+    // case 2 : logPathName is empty
+    _Logger._logPathNames.clear();
+    _Logger.log("Mock Log Message String", Storage::Logger::LogType::eLogTrtmt, false);
+    //Check the logFileName constructed, it should be a debug path and file ext
+    QString currentDate = QDate::currentDate().toString(_Logger._dateFormat);
+    QString expectedFileName = currentDate + _Logger._dateSeparator + _Logger._logFileNamePrefix + _Logger._logPathNames[Storage::Logger::eLogDebug];
+    QCOMPARE(_Logger._logFileName, _Logger._logPathNames[Storage::Logger::eLogDebug] + expectedFileName);
+}
+
+void tst_logging::tst_enableConsoleOut()
+{
+    _Logger._enableConsoleOut = false; // need to skip the check in enableConsoleOut function
+    _Logger.enableConsoleOut(true);
+    QString mContent;
+    FileHandler::read(_Logger._logFileName, mContent);
+    QCOMPARE(mContent, "Console out Logging enabled");
+    QVERIFY(_Logger._enableConsoleOut); // Check value stored
+
+    _Logger._enableConsoleOut = true;// need to skip the check in enableConsoleOut function
+    _Logger.enableConsoleOut(false);
+    mContent = "";
+    FileHandler::read(_Logger._logFileName, mContent);
+    QCOMPARE(mContent, "Console out Logging disabled");
+    QVERIFY(!_Logger._enableConsoleOut); // Check expected value stored
+
+    // Coverage
+    _Logger._enableConsoleOut = false;// need to skip the check in enableConsoleOut function
+    _Logger.enableConsoleOut(false);
+    QVERIFY(!_Logger._enableConsoleOut); // Check expected value stored
+}