Index: unittests/tst_logging.cpp =================================================================== diff -u -r0de28b779f05ad19581646e2efc4b3ffda65de21 -r4489378415df8f8398f59a20ca637b39f2ed2613 --- unittests/tst_logging.cpp (.../tst_logging.cpp) (revision 0de28b779f05ad19581646e2efc4b3ffda65de21) +++ unittests/tst_logging.cpp (.../tst_logging.cpp) (revision 4489378415df8f8398f59a20ca637b39f2ed2613) @@ -36,18 +36,8 @@ void tst_logging::initTestCase() { Threads::registerTypes(); + QCOMPARE( _Logger.init(Threads::_Logger_Thread), !_Logger.init(Threads::_Logger_Thread)); _Logger._timeFormat = ""; - QCOMPARE( _Logger.init(), ! _Logger.init() ); - - // TODO need to update and add a "start step" - // TODO need to figure out why we are not initializing properly, getting - // "The main Log function rejection: The Logger is not initialized for proper use" - // which relates to the thread state - - // QString mContent; - // FileHandler::read(_Logger._logFileName, mContent); - // qDebug()<<"------ > 0000 >> " << _Logger._logFileName; - // QCOMPARE(mContent, ",E,UI,Storage::Logger Initialized\n"); } void tst_logging::cleanup() @@ -59,25 +49,22 @@ void tst_logging::init() { // TODO need to fix and add a "start" step that gets called before each test function - // QString mContent; - // FileHandler::write(_Logger._logFileName, mContent, false); - // QCOMPARE(mContent, ""); } 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_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() @@ -160,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 +}