diff -r e4ebb16b39ea -r 603d3f8b6302 plugins/contacts/symbian/plugin/tsrc/ut_symbian/ut_cntsymbianengine.cpp --- a/plugins/contacts/symbian/plugin/tsrc/ut_symbian/ut_cntsymbianengine.cpp Fri Sep 17 08:34:34 2010 +0300 +++ b/plugins/contacts/symbian/plugin/tsrc/ut_symbian/ut_cntsymbianengine.cpp Mon Oct 04 01:37:06 2010 +0300 @@ -462,7 +462,7 @@ // Retrieve contacts with invalid filter cnt_ids = m_engine->contactIds(invalidFilter, s, &err); - QVERIFY(err == QContactManager::NotSupportedError); + QVERIFY(cnt_ids.count() == 0); // Retrieve sorted contacts QContactSortOrder sortOrder; @@ -724,16 +724,8 @@ contacts.insert(3, 0); QVERIFY(!m_engine->removeContacts(contacts, &errorMap, &err)); - QVERIFY(err == QContactManager::DoesNotExistError); - foreach(QContactManager::Error e, errorMap) { - QVERIFY(e == QContactManager::DoesNotExistError); - } - - for(int i=0; icontact(contacts[i], hint, &err); - QVERIFY(f.localId() == 0); - QVERIFY(err == QContactManager::DoesNotExistError); - } + QVERIFY(err == QContactManager::BadArgumentError); //not allowed to delete + //a contact with id = 0 } void TestSymbianEngine::addOwnCard() @@ -1040,7 +1032,7 @@ orgContact.saveDetail(&org); label = m_engine->synthesizedDisplayLabel(orgContact, &err); QVERIFY(err == QContactManager::NoError); - QVERIFY(label == QString("Nokia")); + QVERIFY(label.isEmpty()); QContact jargon; jargon.setType("jargon");