--- a/qtmobility/tests/auto/qcontactmanagerdataholder.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerdataholder.h	Fri May 14 16:41:33 2010 +0300
@@ -47,6 +47,7 @@
 #include <QMultiMap>
 #include <QList>
 #include <QString>
+#include <QDebug>
 
 #include "qcontactmanager.h"
 
@@ -70,20 +71,21 @@
     {
         QStringList managerNames = QContactManager::availableManagers();
 
-        foreach(QString mgr, managerNames) {
+        foreach(const QString& mgr, managerNames) {
+            // Don't bother with these
+            if (mgr == "memory" || mgr == "invalid" || mgr == "testdummy" || mgr == "maliciousplugin")
+                continue;
             QMap<QString, QString> params;
             QString mgrUri = QContactManager::buildUri(mgr, params);
             QContactManager* cm = QContactManager::fromUri(mgrUri);
             if (cm) {
-                QList<QContact> contacts;
-                foreach (const QContactLocalId id,  cm->contactIds()) {
-                    contacts.push_back(cm->contact(id));
-                }
+                qDebug() << "Saving contacts for" << mgrUri;
+                QList<QContact> contacts = cm->contacts();
                 savedContacts.insert(cm->managerName(),contacts);
-                QList<QContactLocalId> ids = cm->contactIds();
-                QMap<int, QContactManager::Error> errorMap;
-                cm->removeContacts(ids, &errorMap);
-                ids.clear();
+                QList<QContactLocalId> ids;
+                foreach(const QContact& contact, contacts)
+                    ids.append(contact.localId());
+                cm->removeContacts(ids, 0);
                 delete cm;
             }
         }
@@ -91,18 +93,13 @@
 
     ~QContactManagerDataHolder()
     {
-        QStringList managerNames = QContactManager::availableManagers();
-
-        foreach(QString mgr, managerNames) {
-            QMap<QString, QString> params;
-            QString mgrUri = QContactManager::buildUri(mgr, params);
+        foreach(const QString& mgrUri, savedContacts.keys()) {
             QContactManager* cm = QContactManager::fromUri(mgrUri);
             if (cm) {
-                QList<QContact> contacts = savedContacts.value(cm->managerName());
-                foreach(QContact c, contacts) {
-                    c.setId(QContactId());
-                    cm->saveContact(&c);
-                }
+                qDebug() << "Restoring contacts for" << mgrUri;
+                QList<QContact> contacts = savedContacts.value(mgrUri);
+                cm->saveContacts(&contacts, 0);
+                // XXX this doesn't restore relationships..
                 delete cm;
             }
         }