diff -r c5af8598d22c -r e4c884866116 logsui/logsengine/tsrc/ut_logsengine/src/ut_logsmodel.cpp --- a/logsui/logsengine/tsrc/ut_logsengine/src/ut_logsmodel.cpp Thu Sep 02 20:27:05 2010 +0300 +++ b/logsui/logsengine/tsrc/ut_logsengine/src/ut_logsmodel.cpp Fri Sep 17 08:29:34 2010 +0300 @@ -31,6 +31,7 @@ #include #include #include +#include Q_DECLARE_METATYPE(LogsEvent *) Q_DECLARE_METATYPE(LogsCall *) @@ -522,6 +523,8 @@ void UT_LogsModel::testClearMissedCallsCounter() { + XQSettingsManager::mFailed = false; + XQSettingsManager::mCurrentVal = 1; QVERIFY( mModel->clearMissedCallsCounter() == 0 ); } @@ -539,16 +542,16 @@ void UT_LogsModel::testPredictiveSearchStatus() { - LogsDbConnectorStubHelper::setPredictiveSearch(1); + LogsCommonData::getInstance().freeCommonData(); + XQSettingsManager::mCurrentVal = 1; QVERIFY( mModel->predictiveSearchStatus() == 1 ); - QVERIFY( LogsDbConnectorStubHelper::lastCalledFunction() == "predictiveSearchStatus" ); } void UT_LogsModel::testSetPredictiveSearch() { - LogsDbConnectorStubHelper::setPredictiveSearch(2); + XQSettingsManager::mCurrentVal = 2; QVERIFY( mModel->setPredictiveSearch(true) == 0 ); - QVERIFY( LogsDbConnectorStubHelper::lastCalledFunction() == "setPredictiveSearch" ); + QVERIFY( mModel->predictiveSearchStatus() == 1 ); } void UT_LogsModel::testUpdateConfiguration()