--- a/logsui/logscntfinder/tsrc/st_logscntfinder/src/st_logscntfinder.cpp Fri Jun 11 13:38:41 2010 +0300
+++ b/logsui/logscntfinder/tsrc/st_logscntfinder/src/st_logscntfinder.cpp Wed Jun 23 18:13:05 2010 +0300
@@ -36,10 +36,14 @@
void ST_LogsCntFinder::initTestCase()
{
+ //open symbian database
+ m_manager = new QContactManager("symbian");
}
void ST_LogsCntFinder::cleanupTestCase()
{
+ delete m_manager;
+ m_manager = 0;
}
@@ -50,8 +54,6 @@
HbInputSettingProxy::instance()->setGlobalInputLanguage( eng );
m_finder = 0;
- //open symbian database
- m_manager = new QContactManager("symbian");
m_finder = new LogsCntFinder(*m_manager);
QVERIFY(m_finder);
@@ -59,7 +61,7 @@
QList<QContactLocalId> cnt_ids = m_manager->contactIds();
qDebug() << "contacts now before deleting" << cnt_ids.count();
- QVERIFY( m_manager->removeContacts(cnt_ids, 0 ) );
+ m_manager->removeContacts(cnt_ids, 0 );
cnt_ids = m_manager->contactIds();
QCOMPARE(cnt_ids.count(), 0);
@@ -71,8 +73,6 @@
void ST_LogsCntFinder::cleanup()
{
- delete m_manager;
- m_manager = 0;
delete m_finder;
m_finder = 0;
HbInputLanguage eng( QLocale::English );
@@ -110,8 +110,7 @@
createOneContact( QString("Tisha"), QString("Iatzkovits"), QString("932472398") );
createOneContact( QString("Wilda"), QString("Lazar"), QString("932472398") );
createOneContact( QString("Una Vivi"), QString("Kantsak"), QString("932472398") );
-
-
+
int contactsCount = m_manager->contactIds().count();
QCOMPARE(contactsCount, 13);
@@ -141,7 +140,8 @@
void ST_LogsCntFinder::createHistoryEvents()
-{
+{
+ //inserted inreverse order
createLogEvent( QString("Stefann Albert"), QString("Fedrernn"), QString("932472398") );
createLogEvent( QString("Jonn"), QString("Lennon"), QString("932472398") );
createLogEvent( QString("Dim-Petter"), QString("Jones"), QString("932472398") );
@@ -512,7 +512,6 @@
QCOMPARE( m_finder->resultsCount(), 1 );
CHECK_RESULTS( 1, "Jonn", "Lennon" );
- QCOMPARE( m_finder->resultsCount(), 0 );
m_finder->predictiveSearchQuery( QString("5") );
QCOMPARE( m_finder->resultsCount(), 2 );
CHECK_RESULTS( 2, "Dim-Petter", "Jones" );
@@ -536,7 +535,7 @@
m_finder->predictiveSearchQuery( QString("503") );
QCOMPARE( m_finder->resultsCount(), 1 );
- CHECK_RESULTS( 2, "Dim-Petter", "Jones" );
+ CHECK_RESULTS( 1, "Dim-Petter", "Jones" );
m_finder->predictiveSearchQuery( QString("50") );
QCOMPARE( m_finder->resultsCount(), 2 );
@@ -636,11 +635,11 @@
m_finder->predictiveSearchQuery( QString("9") );
QCOMPARE( m_finder->resultsCount(), 6 ); //3 history + 3 contacts
- CHECK_RESULTS( 5, "Stefann", "Fedrernn" );
+ CHECK_RESULTS( 5, "Dim-Petter", "Jones" );
m_finder->predictiveSearchQuery( QString("93") );
QCOMPARE( m_finder->resultsCount(), 3 );
- CHECK_RESULTS( 1, "Stefann", "Fedrernn" );
+ CHECK_RESULTS( 1, "Dim-Petter", "Jones" );
}