Enable failing autotests again

Revert "Disable failing autotests to fet integration going again"

This reverts commit 906121a5d21b66ec5673eadb03d4548910beb1ed.

3 files changed, 1 insertions, 17 deletions

diff --git a/tests/auto/qmessageservice/tst_qmessageservice.cpp b/tests/auto/qmessageservice/tst_qmessageservice.cpp
index 6b1e4704b7..20f0192d53 100644
--- a/tests/auto/qmessageservice/tst_qmessageservice.cpp
+++ b/tests/auto/qmessageservice/tst_qmessageservice.cpp
@@ -173,10 +173,8 @@ private slots:
     void initTestCase();
     void cleanupTestCase();
 
-/* temporarily disabled to get continuous integration working again
     void testQueryMessages();
     void testQueryMessages_data();
-*/
 
     void testCountMessages();
     void testCountMessages_data();
@@ -506,7 +504,6 @@ void tst_QMessageService::cleanupTestCase()
 {
 }
 
-/* temporarily disabled to get continuous integration working again
 void tst_QMessageService::testQueryMessages()
 {
     QFETCH(QMessageFilter, filter);
@@ -576,7 +573,6 @@ void tst_QMessageService::testQueryMessages()
         QSKIP("Unsupported for this configuration", SkipSingle);
     }
 }
-*/
 
 void tst_QMessageService::testQueryCountData()
 {
@@ -2072,12 +2068,10 @@ void tst_QMessageService::testQueryCountData()
 #endif
 }
 
-/* temporarily disabled to get continuous integration working again
 void tst_QMessageService::testQueryMessages_data()
 {
     testQueryCountData();
 }
-*/
 
 void tst_QMessageService::testCountMessages()
 {
diff --git a/tests/auto/qmessagestore/tst_qmessagestore.cpp b/tests/auto/qmessagestore/tst_qmessagestore.cpp
index e3fc06a4f4..56c5e35daf 100644
--- a/tests/auto/qmessagestore/tst_qmessagestore.cpp
+++ b/tests/auto/qmessagestore/tst_qmessagestore.cpp
@@ -162,10 +162,8 @@ private slots:
 
     void testRemoveAccount();
 
-/* temporarily disabled to get continuous integration working again
     void testMessage_data();
     void testMessage();
-*/
 
 private:
     QMessageManager *manager;
@@ -387,7 +385,6 @@ Q_DECLARE_METATYPE(QList<int>)
 typedef QMap<QString, QString> CustomFieldMap;
 Q_DECLARE_METATYPE(CustomFieldMap)
 
-/* temporarily disabled to get continuous integration working again
 void tst_QMessageStore::testMessage_data()
 {
     QTest::addColumn<QString>("to");
@@ -550,7 +547,6 @@ void tst_QMessageStore::testMessage_data()
         << customData
         << "byFilter";
 }
-*/
 
 void tst_QMessageStore::testRemoveAccount()
 {
@@ -574,7 +570,6 @@ void tst_QMessageStore::testRemoveAccount()
 #endif
 }
 
-/* temporarily disabled to get continuous integration working again
 void tst_QMessageStore::testMessage()
 {
     // Ensure we have an account to create messages with
@@ -1042,5 +1037,4 @@ void tst_QMessageStore::testMessage()
 #endif
 #endif    
 }
-*/
 
diff --git a/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp b/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp
index e95290d93c..184fb8e130 100644
--- a/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp
+++ b/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp
@@ -96,13 +96,11 @@ private slots:
     void testFolderOrdering_data();
     void testFolderOrdering();
 
-/* temporarily disabled to get continuous integration working again
     void testMessageFilter_data();
     void testMessageFilter();
 
     void testMessageOrdering_data();
     void testMessageOrdering();
-*/
 
 private:
     QSet<QMessageAccountId> existingAccountIds;
@@ -1781,7 +1779,6 @@ void tst_QMessageStoreKeys::testFolderOrdering()
     }
 }
 
-/* temporarily disabled to get continuous integration working again
 void tst_QMessageStoreKeys::testMessageFilter_data()
 {
     QTest::addColumn<QMessageFilter>("filter");
@@ -3259,7 +3256,7 @@ void tst_QMessageStoreKeys::testMessageFilter_data()
        In Maemo6 QMF does not support case sensitive search.
        So if called x.setMatchFlags(QMessageDataComparator::MatchCaseSensitive)
        query returns empty list and set error to QMessageManager::NotYetImplemented
-     * /
+     */
 #if !defined(Q_WS_MAEMO_6)
     caseSensitive2.setMatchFlags(QMessageDataComparator::MatchCaseSensitive);
 #endif
@@ -3767,5 +3764,4 @@ void tst_QMessageStoreKeys::testMessageOrdering()
         QSKIP("Unsupported for this configuration", SkipSingle);
     }
 }
-*/