--- a/qtmobility/tests/auto/qversit/ut_qversit.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Mobility Components.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qversitdefs_p.h"
-#include "ut_qversit.h"
-#include "qversitreader.h"
-#include "qversitreader_p.h"
-#include "qversitcontactimporter.h"
-#include "qcontact.h"
-#include "qcontactmanager.h"
-
-#include <QtTest/QtTest>
-#include <QDebug>
-#include <QDir>
-#include <QList>
-
-QTM_BEGIN_NAMESPACE
-class MyQVersitResourceHandler : public QVersitResourceHandler
-{
-public:
-    MyQVersitResourceHandler() : mIndex(0)
-    {
-    }
-
-    bool saveResource(const QByteArray& contents, const QVersitProperty& property,
-                      QString* location)
-    {
-        Q_UNUSED(property)
-        *location = QString::number(mIndex++);
-        mObjects.insert(*location, contents);
-        return true;
-    }
-
-    bool loadResource(const QString &location, QByteArray *contents, QString *mimeType)
-    {
-        Q_UNUSED(location)
-        Q_UNUSED(contents)
-        Q_UNUSED(mimeType)
-        return false;
-    }
-
-    int mIndex;
-    QMap<QString, QByteArray> mObjects;
-};
-QTM_END_NAMESPACE
-
-QTM_USE_NAMESPACE
-
-#ifndef TESTDATA_DIR
-#define TESTDATA_DIR "./"
-#endif
-
-Q_DECLARE_METATYPE(QList<QContact>)
-
-void UT_QVersit::testImportFiles()
-{
-    QFETCH(QString, filename);
-    QFETCH(QByteArray, charset);
-    QFETCH(QList<QContact>, expectedContacts);
-
-    QVersitReader reader;
-    QFile file(filename);
-    QVERIFY2(file.open(QIODevice::ReadOnly), filename.toAscii());
-    reader.setDevice(&file);
-    if (charset != "") {
-        reader.setDefaultCodec(QTextCodec::codecForName(charset));
-    }
-    QVERIFY(reader.startReading());
-    QVERIFY(reader.waitForFinished());
-    QList<QVersitDocument> documents = reader.results();
-    QCOMPARE(reader.error(), QVersitReader::NoError);
-    QVersitContactImporter importer;
-    MyQVersitResourceHandler resourceHandler;
-    importer.setResourceHandler(&resourceHandler);
-    QList<QContact> contacts = importer.importContacts(documents);
-
-    if (expectedContacts.size() > 0) {
-        QCOMPARE(contacts.size(), expectedContacts.size());
-        QListIterator<QContact> i(expectedContacts);
-        foreach (QContact parsed, contacts) {
-            QContact expected = i.next();
-            QList<QContactDetail> expectedDetails = expected.details();
-            foreach(QContactDetail expectedDetail, expectedDetails) {
-                QString name = expectedDetail.definitionName();
-                QContactDetail parsedDetail = parsed.detail(name);
-                if (parsedDetail != expectedDetail) {
-                    qDebug() << "Detail: " << name.toAscii();
-                    qDebug() << "Actual:" << parsedDetail.variantValues();
-                    qDebug() << "Expected:" << expectedDetail.variantValues();
-                    QCOMPARE(parsedDetail, expectedDetail);
-                }
-            }
-        }
-    }
-}
-
-#define QTEST_NEW_ROW(filename,charset,contact) \
-        QTest::newRow(filename) \
-        << QString::fromAscii(TESTDATA_DIR "testdata/") + QString::fromAscii(filename) \
-        << QByteArray(charset) \
-        << (contact)
-
-void UT_QVersit::testImportFiles_data()
-{
-    QTest::addColumn<QString>("filename");
-    QTest::addColumn<QByteArray>("charset");
-    QTest::addColumn<QList<QContact> >("expectedContacts");
-
-    QTEST_NEW_ROW("AAB4/MultipleAll.vcf", "UTF-16BE", QList<QContact>());
-    QTEST_NEW_ROW("AAB4/MultipleAscii.vcf", "", QList<QContact>());
-    QTEST_NEW_ROW("AAB4/SingleCompany.vcf", "", QList<QContact>());
-    QTEST_NEW_ROW("AAB4/SingleExtensive.vcf", "", QList<QContact>());
-    QTEST_NEW_ROW("AAB4/SingleNonAscii.vcf", "UTF-16BE", QList<QContact>());
-    QTEST_NEW_ROW("AAB4/SingleNonAsciiWithPhoto.vcf", "UTF-16BE", QList<QContact>());
-    QTEST_NEW_ROW("AAB5/SingleNonAscii.vcf", "UTF-8", QList<QContact>());
-
-    {
-        QList<QContact> list;
-        QContact contact;
-        QContactName name;
-        name.setCustomLabel(QLatin1String("Firstname Lastname"));
-        name.setFirstName(QLatin1String("Firstname"));
-        name.setLastName(QLatin1String("Lastname"));
-        name.setMiddleName(QString());
-        name.setPrefix(QLatin1String("Title"));
-        name.setSuffix(QLatin1String("Suffix"));
-        contact.saveDetail(&name);
-        QContactOrganization org;
-        org.setName(QLatin1String("Company Name"));
-        org.setDepartment(QStringList(QLatin1String("Department Name")));
-        org.setTitle(QLatin1String("Job title"));
-        contact.saveDetail(&org);
-        list.append(contact);
-        QContactNote note;
-        note.setNote(QLatin1String("This is a note field.  Pretty boring."));
-        contact.saveDetail(&note);
-        QContactUrl homeUrl;
-        homeUrl.setUrl(QLatin1String("http://mywebpage.com"));
-        homeUrl.setContexts(QContactDetail::ContextHome);
-        contact.saveDetail(&homeUrl);
-        QContactUrl workUrl;
-        workUrl.setUrl(QLatin1String("http://workwebpage"));
-        workUrl.setContexts(QContactDetail::ContextWork);
-        contact.saveDetail(&workUrl);
-        QTEST_NEW_ROW("Entourage11/basic.vcf", "UTF-16BE", list);
-    }
-
-    QTEST_NEW_ROW("Entourage11/image.vcf", "UTF-16BE", QList<QContact>());
-
-    QTEST_NEW_ROW("Entourage11/nonascii.vcf", "UTF-16BE", QList<QContact>());
-
-    {
-        QList<QContact> list;
-        QContact contact;
-        QContactName name;
-        name.setCustomLabel(QLatin1String("first last"));
-        name.setFirstName(QLatin1String("first"));
-        name.setLastName(QLatin1String("last"));
-        name.setMiddleName(QString());
-        name.setPrefix(QString());
-        name.setSuffix(QString());
-        contact.saveDetail(&name);
-        QContactOrganization org;
-        org.setName(QLatin1String("Nokia"));
-        org.setDepartment(QStringList(QLatin1String("Qt DF")));
-        contact.saveDetail(&org);
-        list.append(contact);
-        QTEST_NEW_ROW("Entourage12/basic.vcf", "", list);
-    }
-
-    QTEST_NEW_ROW("Entourage12/kevin.vcf", "UTF-8", QList<QContact>());
-    QTEST_NEW_ROW("Entourage12/nonascii.vcf", "UTF-8", QList<QContact>());
-    QTEST_NEW_ROW("gmail.vcf", "UTF-8", QList<QContact>());
-}
-
-QTEST_MAIN(UT_QVersit)