--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp Fri May 14 16:41:33 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp Thu May 27 13:42:11 2010 +0300
@@ -108,30 +108,14 @@
if (error == QContactManager::NoError) {
QVERIFY(ce->managerName() == CNT_SYMBIAN_MANAGER_NAME);
QVERIFY(ce->m_contactFilter != 0);
- QVERIFY(ce->m_contactSorter != 0);
QVERIFY(ce->m_dataBase != 0);
QVERIFY(ce->m_relationship != 0);
QVERIFY(ce->m_transformContact != 0);
} else {
QSKIP("Error creating CntSymbianEngine in ctor", SkipSingle);
}
- // copy ctor
- CntSymbianEngine* ce1 = new CntSymbianEngine(*ce);
- QVERIFY(ce->managerName() == ce1->managerName());
- QVERIFY(ce->m_contactFilter == ce1->m_contactFilter);
- QVERIFY(ce->m_contactSorter == ce1->m_contactSorter);
- QVERIFY(ce->m_dataBase == ce1->m_dataBase);
- QVERIFY(ce->m_relationship == ce1->m_relationship);
- QVERIFY(ce->m_transformContact == ce1->m_transformContact);
delete ce;
- /*
- QVERIFY(ce->m_contactFilter == 0xDEDEDEDE);
- QVERIFY(ce->m_contactSorter == 0xDEDEDEDE);
- QVERIFY(ce->m_dataBase == 0xDEDEDEDE);
- QVERIFY(ce->m_relationship == 0xDEDEDEDE);
- QVERIFY(ce->m_transformContact == 0xDEDEDEDE);
- */
}
void TestSymbianEngine::saveContact()
@@ -525,8 +509,8 @@
// Remove non existent contacts
QMap<int, QContactManager::Error> errorMap;
- QVERIFY(m_engine->removeContacts(contacts, &errorMap, &err));
- QVERIFY(err == QContactManager::NoError);
+ QVERIFY(!m_engine->removeContacts(contacts, &errorMap, &err));
+ QVERIFY(err == QContactManager::BadArgumentError);
QVERIFY(errorMap.count() == 0);
// Remove existing contacts
@@ -803,7 +787,7 @@
// Add relationships
QMap<int, QContactManager::Error> errorMap;
- QVERIFY(m_engine->saveRelationships(&list, &errorMap, &error));
+ QVERIFY(!m_engine->saveRelationships(&list, &errorMap, &error));
foreach(QContactManager::Error err, errorMap) {
if (err == QContactManager::NoError ||
err == QContactManager::NotSupportedError)