--- a/logsui/logsengine/tsrc/ut_logsengine/src/ut_logsdetailsmodel.cpp Wed Aug 18 09:49:12 2010 +0300
+++ b/logsui/logsengine/tsrc/ut_logsengine/src/ut_logsdetailsmodel.cpp Thu Sep 02 20:27:05 2010 +0300
@@ -22,10 +22,13 @@
#include "logscontact.h"
#include "logsmessage.h"
#include "logseventdata.h"
+#include "logsconfigurationparams.h"
#include "qtcontacts_stubs_helper.h"
#include "logsdbconnector_stub_helper.h"
+#include "hbstubs_helper.h"
#include <hblineedit.h>
#include <hbglobal.h>
+#include <hbextendedlocale.h>
#include <QtTest/QtTest>
Q_DECLARE_METATYPE(LogsCall *)
@@ -56,6 +59,7 @@
void UT_LogsDetailsModel::init()
{
+ HbStubHelper::reset();
testDetailsDateAndTime.setTime_t( 3000 );
LogsEvent event;
@@ -91,13 +95,27 @@
cliptmp2->setText(" ");
cliptmp2->selectAll();
cliptmp2->copy();
-
+
+ // Make sure that number is converted to current locale
+ HbStubHelper::stringUtilDigitConversion(true);
mModel->getNumberToClipboard();
cliptmp2->setText(" ");
- cliptmp2->paste();
+ cliptmp2->paste();
+ QCOMPARE( cliptmp2->text(), "conv" + testDetailsRemoteNum );
+
- QVERIFY( cliptmp2->text() == testDetailsRemoteNum );
+ // VoIP uri is not converted
+ mModel->mEvent->mNumber.clear();
+ LogsEventData* eventData = new LogsEventData;
+ eventData->mRemoteUrl = "test@1.2.3.4";
+ mModel->mEvent->setLogsEventData( eventData );
+ mModel->mEvent->mEventType = LogsEvent::TypeVoIPCall;
+ mModel->getNumberToClipboard();
+ cliptmp2->setText(" ");
+ cliptmp2->paste();
+ QCOMPARE( cliptmp2->text(), eventData->mRemoteUrl );
+
delete cliptmp2;
}
@@ -115,7 +133,10 @@
// Test date and time
display = mModel->data(mModel->index(1), Qt::DisplayRole).toStringList();
QVERIFY( display.count() == 2 );
- QVERIFY( display.at(1) == testDetailsDateAndTime.toTimeSpec(Qt::LocalTime).toString() );
+ QDateTime localTime = testDetailsDateAndTime.toTimeSpec(Qt::LocalTime);
+ QVERIFY( display.at(1).startsWith(
+ localTime.date().toString(Qt::SystemLocaleShortDate)) );
+
decoration = mModel->data(mModel->index(1), Qt::DecorationRole).toList();
QVERIFY( decoration.count() == 1 );
@@ -138,7 +159,9 @@
QVERIFY( display.count() == 2 );
QTime n(0,0,0);
QTime t = n.addSecs(testDetailsDuration);
- QVERIFY( display.at(1) == t.toString("hh:mm:ss") );
+ QChar timeSeparator = HbExtendedLocale::system().timeSeparator(1);
+ QString tiemFormat = QString("hh%1mm%2ss").arg(timeSeparator).arg(timeSeparator);
+ QCOMPARE( display.at(1), t.toString(tiemFormat));
decoration = mModel->data(mModel->index(4), Qt::DecorationRole).toList();
QVERIFY( decoration.count() == 1 );
@@ -146,13 +169,16 @@
QVariant callData = mModel->data(mModel->index(0), LogsDetailsModel::RoleCall);
LogsCall *call = qVariantValue<LogsCall *>( callData );
QVERIFY( call );
+ QVERIFY( call->defaultCallType() != LogsCall::TypeLogsCallNotAvailable );
delete call;
// Test call, event type does not support call
mModel->mEvent->setEventType(LogsEvent::TypeUndefined);
QVariant callData2 = mModel->data(mModel->index(0), LogsDetailsModel::RoleCall);
LogsCall *call2 = qVariantValue<LogsCall *>( callData2 );
- QVERIFY( !call2 );
+ QVERIFY( call2 );
+ QVERIFY( call2->defaultCallType() == LogsCall::TypeLogsCallNotAvailable );
+ delete call2;
// Test message
QVariant messageData = mModel->data(mModel->index(0), LogsDetailsModel::RoleMessage);
@@ -186,6 +212,13 @@
QCOMPARE(mModel->headerData(0, Qt::Vertical).toString(),
testDetailsRemoteInfo);
QVERIFY(mModel->headerData(0, Qt::Vertical, Qt::DecorationRole).isNull());
+
+ // Number as header, check that it is converted to current local
+ HbStubHelper::stringUtilDigitConversion(true);
+ mModel->mEvent->mRemoteParty.clear();
+ mModel->initContent();
+ QCOMPARE(mModel->headerData(0, Qt::Vertical).toString(),
+ "conv" + testDetailsRemoteNum);
}
void UT_LogsDetailsModel::testgetRemoteUri()
@@ -399,9 +432,10 @@
event.setNumber("");
QVERIFY( mModel->getCallerId(event) == QString("") );
- // Both
+ // Both, check that number is converted to current local
+ HbStubHelper::stringUtilDigitConversion(true);
event.setNumber(num);
- QVERIFY( mModel->getCallerId(event) == num );
+ QCOMPARE( mModel->getCallerId(event), "conv" + num );
//Only number
event.setRemoteParty("");
@@ -452,3 +486,18 @@
QVERIFY( mModel->mDetailTexts.count() > 0 );
QVERIFY( mModel->mEvent->remoteParty().length() > 0 );
}
+
+void UT_LogsDetailsModel::testUpdateConfiguration()
+{
+ //Locale not changed, model not updated
+ QCOMPARE( mModel->mDetailTexts.count(), 5 );
+ LogsConfigurationParams params;
+ QVERIFY( mModel->updateConfiguration(params) == 0 );
+ QCOMPARE( mModel->mDetailTexts.count(), 5 );
+
+ //Locale changed, model udpated
+ params.setLocaleChanged(true);
+ mModel->mEvent->setRemoteParty("");
+ QVERIFY( mModel->updateConfiguration(params) == 0 );
+ QCOMPARE( mModel->mDetailTexts.count(), 4 );
+}