purge symbian vestiges

Change-Id: I5917237eb7e1a6cc862fb043ad2450407fad2552
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>

5 files changed, 6 insertions, 103 deletions

diff --git a/src/versit/qversitcontactexporter.cpp b/src/versit/qversitcontactexporter.cpp
index ddde5d299..782f10095 100644
--- a/src/versit/qversitcontactexporter.cpp
+++ b/src/versit/qversitcontactexporter.cpp
@@ -186,7 +186,7 @@ QT_BEGIN_NAMESPACE_VERSIT
 
   \section1 Other implementation notes
 
-  Some Symbian and Android devices do not properly handle the \c FN vCard property.  If a
+  Some Android devices do not properly handle the \c FN vCard property.  If a
   DisplayLabel is set on a contact and this class is used to generate a vCard, the receiving device
   might display this label in an unexpected field (eg. Last Name).
   The vCard specification requires the \c FN property to be present.  However, because of this
diff --git a/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp b/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp
index aee5002ce..6321a1bbd 100644
--- a/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp
+++ b/tests/auto/contacts/qcontactasync/unittest/tst_qcontactasync.cpp
@@ -1916,10 +1916,6 @@ void tst_QContactAsync::relationshipFetch()
     QFETCH(QString, uri);
     QScopedPointer<QContactManager> cm(prepareModel(uri));
 
-    if (cm->managerName() == "symbian") {
-        QSKIP("This contact manager does not support the required relationship types for this test to pass!");
-    }
-
     QContactRelationshipFetchRequest rfr;
     QVERIFY(rfr.type() == QContactAbstractRequest::RelationshipFetchRequest);
 
@@ -2119,10 +2115,6 @@ void tst_QContactAsync::relationshipRemove()
     QFETCH(QString, uri);
     QScopedPointer<QContactManager> cm(prepareModel(uri));
 
-    if (cm->managerName() == "symbian") {
-        QSKIP("This contact manager does not support the required relationship types for this test to pass!");
-    }
-
     QContactRelationshipRemoveRequest rrr;
     QVERIFY(rrr.type() == QContactAbstractRequest::RelationshipRemoveRequest);
 
@@ -2272,10 +2264,6 @@ void tst_QContactAsync::relationshipSave()
     QFETCH(QString, uri);
     QScopedPointer<QContactManager> cm(prepareModel(uri));
 
-    if (cm->managerName() == "symbian") {
-        QSKIP("This contact manager does not support the required relationship types for this test to pass!");
-    }
-
     QContactRelationshipSaveRequest rsr;
     QVERIFY(rsr.type() == QContactAbstractRequest::RelationshipSaveRequest);
 
@@ -3022,8 +3010,6 @@ void tst_QContactAsync::addManagers(QStringList stringlist)
         managers.removeAll("maliciousplugin");
     if (!stringlist.contains("testdummy"))
         managers.removeAll("testdummy");
-    if (!stringlist.contains("symbiansim"))
-        managers.removeAll("symbiansim"); // SIM backend does not support all the required details for tests to pass.
     if (!stringlist.contains("social"))
         managers.removeAll("social");
     if (!stringlist.contains("simcard"))
diff --git a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
index 00a9420eb..844b4949d 100644
--- a/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
+++ b/tests/auto/contacts/qcontactmanager/tst_qcontactmanager.cpp
@@ -1549,47 +1549,6 @@ void tst_QContactManager::overrideManager()
     qputenv("QTCONTACTS_MANAGER_OVERRIDE", overrideManager.toLatin1());
 }
 
-#if defined(SYMBIAN_BACKEND_S60_VERSION_31) || defined(SYMBIAN_BACKEND_S60_VERSION_32) || defined(SYMBIAN_BACKEND_S60_VERSION_50)
-/* Some symbian-specific unit tests. */
-void tst_QContactManager::symbianManager()
-{
-    QFETCH(QString, uri);
-    QString managerName;
-    QMap<QString, QString> managerParameters;
-    QContactManager::parseUri(uri, &managerName, &managerParameters);
-    if (managerName != QString("symbian"))
-        return;
-
-    /* Firstly, a test for invalid storage type crash - QTMOBILITY-470 */
-    // open the contact database, and create a new contact
-    CContactDatabase* cntdb = CContactDatabase::OpenL();
-    CleanupStack::PushL(cntdb);
-    CContactItem* testItem = CContactCard::NewLC();
-
-    // create a new thumbnail field with (invalid) storage type KStorageTypeText instead of KStorageTypeStore
-    CContactItemField* thumbnailField;
-    thumbnailField = CContactItemField::NewLC(KStorageTypeText, KUidContactFieldPicture);
-    thumbnailField->SetMapping(KUidContactFieldVCardMapPHOTO);
-    thumbnailField->AddFieldTypeL(KUidContactFieldVCardMapBMP);
-    thumbnailField->ResetStore();
-
-    // set the thumbnail data in the thumbnail field, and add it to the contact
-    _LIT8(KThumbnailDataString, "Dummy Thumbnail Data String");
-    thumbnailField->StoreStorage()->SetThingL(KThumbnailDataString);
-    testItem->AddFieldL(*thumbnailField);
-    CleanupStack::Pop(thumbnailField);
-
-    // save the updated contact.
-    cntdb->CommitContactL(*testItem);
-    cntdb->CloseContactL(testItem->Id());
-    CleanupStack::PopAndDestroy(2); // testItem, cntdb
-
-    // force database to read thumbnail with invalid storage type.  crash if not handled properly.
-    QScopedPointer<QContactManager> cm(QContactManager::fromUri(uri));
-    QList<QContact> allContacts = cm->contacts();
-}
-#endif
-
 void tst_QContactManager::nameSynthesis_data()
 {
     QTest::addColumn<QString>("expected");
@@ -2070,21 +2029,6 @@ void tst_QContactManager::signalEmission()
     QTRY_COMPARE(spyCM.count(), 0);
 
     QScopedPointer<QContactManager> m2(QContactManager::fromUri(uri));
-
-    // During construction SIM backend (m2) will try writing contacts with
-    // nickname, email and additional number to find out if the SIM card
-    // will support these fields. The other backend (m1) will then receive
-    // signals about that. These need to be caught so they don't interfere
-    // with the tests. (This trial and error method is used because existing
-    // API for checking the availability of these fields is not public.)
-    // NOTE: This applies only to pre 10.1 platforms (S60 3.1, 3.2, ect.)
-    if (uri.contains("symbiansim")) {
-        QTest::qWait(0);
-        spyCA.clear();
-        spyCM.clear();
-        spyCR.clear();
-    }
-
 }
 
 void tst_QContactManager::errorStayingPut()
diff --git a/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp b/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp
index 47a19e9e0..860c3ec29 100644
--- a/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp
+++ b/tests/auto/contacts/qcontactmanagerfiltering/unittest/tst_qcontactmanagerfiltering.cpp
@@ -233,10 +233,6 @@ void tst_QContactManagerFiltering::initTestCase()
     managerNames.removeAll("testdummy");
     managerNames.removeAll("teststaticdummy");
     managerNames.removeAll("maliciousplugin");
-    // Symbiansim backend does not support the required details for these
-    // tests to pass. Symbiansim backend specific unit test tst_simcm is
-    // testing filtering instead.
-    managerNames.removeAll("symbiansim");
 
     // Some internal engines on Maemo6
     managerNames.removeAll("social");
@@ -1010,15 +1006,9 @@ void tst_QContactManagerFiltering::rangeFiltering_data()
         newMRow("no min, cs, some results", manager) << manager << nameType << firstname << QVariant() << QVariant("Bob") << false << 0 << true << csflag << "a";
         newMRow("no min, cs, no results", manager) << manager << nameType << firstname << QVariant() << QVariant("Aardvark") << false << 0 << true << csflag << es;
         newMRow("no max, cs, badcase, all results", manager) << manager << nameType << firstname << QVariant("A") << QVariant() << false << 0 << true << csflag << "abcdefghijk";
-#ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"no max, cs, badcase, some results\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
-#endif
         newMRow("no max, cs, badcase, some results", manager) << manager << nameType << firstname << QVariant("bob") << QVariant() << false << 0 << true << csflag << expectedSorting(manager, "hj", "abcdefghijk", "defghijk", "bcdefghijk", "cdefghijk", "bcdefghijk");
         newMRow("no max, cs, badcase, no results", manager) << manager << nameType << firstname << QVariant("XAMBEZI") << QVariant() << false << 0 << true << csflag << "hijk";
         newMRow("no min, cs, badcase, all results", manager) << manager << nameType << firstname << QVariant() << QVariant("XAMBEZI") << false << 0 << true << csflag << "abcdefg";
-#ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"no min, cs, badcase, some results\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
-#endif
         newMRow("no min, cs, badcase, some results", manager) << manager << nameType << firstname << QVariant() << QVariant("BOB") << false << 0 << true << csflag << expectedSorting(manager, "a", "abchj", "a", "abc", "a", "ab");
         newMRow("no min, cs, badcase, no results", manager) << manager << nameType << firstname << QVariant() << QVariant("AARDVARK") << false << 0 << true << csflag << es;
 
@@ -2211,18 +2201,9 @@ void tst_QContactManagerFiltering::sorting_data()
         QPair<QContactDetail::DetailType, int> integerDefAndFieldNames = defAndFieldNamesForTypePerManager.value(manager).value("Integer");
         QPair<QContactDetail::DetailType, int> stringDefAndFieldNames = defAndFieldNamesForTypePerManager.value(manager).value("String");
 
-#ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"first ascending\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
-#endif
         newMRow("first ascending", manager) << manager << nameType << firstname << asc << false << 0 << cs << expectedSorting(manager, "abcdefgikhj", "hjabcdefgik", "abcdefgihkj", "abcdefghijk", "abcdefgihkj", "abcdefghijk") << "efg";  // efg have the same first name
-#ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"first descending\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
-#endif
         newMRow("first descending", manager) << manager << nameType << firstname << desc << false << 0 << cs << expectedSorting(manager, "jhkigfedcba", "kigfedcbajh", "jkhigfedcba", "kjihgfedcba", "jkhigfedcba", "kjihgfedcba") << "efg";// efg have the same first name
         newMRow("last ascending", manager) << manager << nameType << lastname << asc << false << 0 << cs << "bacdefghijk" << "hijk";       // all have a well defined, sortable last name except hijk
-#ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"last descending\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
-#endif
         newMRow("last descending", manager) << manager << nameType << lastname << desc << false << 0 << cs << "gfedcabhijk" << "hijk";     // all have a well defined, sortable last name except hijk
         if (validDetailField(integerDefAndFieldNames)) {
             newMRow("integer ascending, blanks last", manager) << manager << integerDefAndFieldNames.first << integerDefAndFieldNames.second << asc << true << bll << cs << "cabgfedhijk" << "gfedhijk"; // gfedhijk have no integer
@@ -2236,9 +2217,6 @@ void tst_QContactManagerFiltering::sorting_data()
         }
 
         newMRow("display label insensitive", manager) << manager << dlType << dlfld << asc << false << 0 << ci << "abcdefghjik" << "efghji";
-#ifdef Q_OS_SYMBIAN
-        qWarning() << "Test case \"display label sensitive\" will fail on symbian platform because of QString::localeAwareCompare is not actually locale aware";
-#endif
         newMRow("display label sensitive", manager) << manager << dlType << dlfld << asc << false << 0 << cs << "abcdefghjik" << "efg";
     }
 }
diff --git a/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp b/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp
index a1659e634..322a6eb80 100644
--- a/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp
+++ b/tests/auto/contacts/qdeclarativecontact/tst_qdeclarativecontact.cpp
@@ -50,11 +50,6 @@
 #include "qdeclarativecontactrelationship_p.h"
 #include "qdeclarativecontactrelationshipmodel_p.h"
 
-#ifdef Q_OS_SYMBIAN
-// In Symbian OS test data is located in applications private dir
-#define SRCDIR "."
-#endif
-
 QTCONTACTS_USE_NAMESPACE
 
 class tst_QDeclarativeContact : public QObject
@@ -117,11 +112,11 @@ void tst_QDeclarativeContact::construction()
 
     if (shouldSucceed) {
         if (obj == 0) {
-            qWarning("--------- ------------- ------------- ---------------------- ------------ ");
-            qWarning("--------- could not instantiate components from contact   -------------- ");
-            qWarning("--------- declarative plugin. make sure it is built and found ------------");
-            qWarning(" ---------under {QTDIR}/imports, or c:/sys/bin on Symbian     ----------- ");
-            qWarning("--------- ------------- ------------- ---------------------- ------------ ");
+            qWarning("--------- ------------- ------------- ----------------- ------------ ");
+            qWarning("--------- could not instantiate components from contact ------------ ");
+            qWarning("--------- declarative plugin. make sure it is built and ------------ ");
+            qWarning("--------- found under {QTDIR}/imports.                  ------------ ");
+            qWarning("--------- ------------- ------------- ----------------- ------------ ");
         }
         QVERIFY(obj != 0);
         QCOMPARE(obj->metaObject()->className(), expectedClassName.toLatin1().constData());