--- a/qtmobility/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp Mon May 03 13:18:40 2010 +0300
@@ -228,7 +228,7 @@
("path", "Innbox")
("name", "Innbox")
("parentFolderPath", "")
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
<< Params()("parentAccountName", "Work")
("path", "Innbox/X-Announce")
("name", "X-Announce")
@@ -253,6 +253,19 @@
QVERIFY(folderIds.last().isValid());
}
+#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+ // Local folders can be seen through every account
+ // => Make sure that existingFolderIds contains all folderIds
+ // but not ids which were returned from addFolder calls
+ QMessageFolderFilter folderFilter;
+ foreach(QMessageAccountId id, accountIds) {
+ folderFilter |= QMessageFolderFilter::byParentAccountId(id);
+ }
+ QSet<QMessageFolderId> newFolderIds = manager->queryFolders(folderFilter).toSet().subtract(existingFolderIds);
+ newFolderIds = newFolderIds.subtract(folderIds.toSet());
+ existingFolderIds.unite(newFolderIds);
+#endif
+
existingMessageIds = manager->queryMessages(~existingAccountsFilter).toSet();
// For windows at least, we can't have HasAttachments set without a real attachment
@@ -265,7 +278,7 @@
QList<Support::Parameters> messageParams;
messageParams << Params()("parentAccountName", "Alter Ego")
("parentFolderPath", "My messages")
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN)) // SMS messages must be in SMS store on Windows and on Symbian
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN)) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) // SMS messages must be in SMS store on Windows and on Symbian
("type", "email")
#else
("type", "sms")
@@ -308,7 +321,7 @@
("status-hasAttachments", "true")
("attachments", attachmentPaths)
("custom-spam", "filter:no")
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
<< Params()("parentAccountName", "Work")
("parentFolderPath", "Innbox/X-Announce")
("type", "email")
@@ -775,10 +788,12 @@
<< ( QMessageFolderIdList() << folderIds[0] << folderIds[1] )
<< ( QMessageFolderIdList() << folderIds[2] << folderIds[3] );
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("id list inclusion empty")
<< QMessageFolderFilter::byId(QMessageFolderIdList(), QMessageDataComparator::Includes)
<< QMessageFolderIdList()
<< folderIds;
+#endif
QTest::newRow("id list exclusion 1")
<< QMessageFolderFilter::byId(QMessageFolderIdList() << folderIds[0], QMessageDataComparator::Excludes)
@@ -795,17 +810,19 @@
<< ( QMessageFolderIdList() << folderIds[2] << folderIds[3] )
<< ( QMessageFolderIdList() << folderIds[0] << folderIds[1] );
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("id list exclusion empty")
<< QMessageFolderFilter::byId(QMessageFolderIdList(), QMessageDataComparator::Excludes)
<< folderIds
<< QMessageFolderIdList();
+#endif
QTest::newRow("id filter inclusion 1")
<< QMessageFolderFilter::byId(QMessageFolderFilter::byPath("My messages", QMessageDataComparator::Equal), QMessageDataComparator::Includes)
<< ( QMessageFolderIdList() << folderIds[0] )
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[2] << folderIds[3] );
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("id filter inclusion 2")
<< QMessageFolderFilter::byId(QMessageFolderFilter::byPath("Innbox/X-Announce", QMessageDataComparator::Equal), QMessageDataComparator::Includes)
<< ( QMessageFolderIdList() << folderIds[2] )
@@ -832,7 +849,7 @@
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[2] << folderIds[3] )
<< ( QMessageFolderIdList() << folderIds[0] );
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("id filter exclusion 2")
<< QMessageFolderFilter::byId(QMessageFolderFilter::byPath("Innbox/X-Announce", QMessageDataComparator::Equal), QMessageDataComparator::Excludes)
<< ( QMessageFolderIdList() << folderIds[0] << folderIds[1] << folderIds[3] )
@@ -859,7 +876,7 @@
<< ( QMessageFolderIdList() << folderIds[0] )
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[2] << folderIds[3] );
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("path equality 2")
<< QMessageFolderFilter::byPath("Innbox/X-Announce", QMessageDataComparator::Equal)
<< ( QMessageFolderIdList() << folderIds[2] )
@@ -886,7 +903,7 @@
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[2] << folderIds[3] )
<< ( QMessageFolderIdList() << folderIds[0] );
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("path inequality 2")
<< QMessageFolderFilter::byPath("Innbox/X-Announce", QMessageDataComparator::NotEqual)
<< ( QMessageFolderIdList() << folderIds[0] << folderIds[1] << folderIds[3] )
@@ -913,7 +930,7 @@
<< ( QMessageFolderIdList() << folderIds[0] )
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[2] << folderIds[3] );
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("path inclusion 2")
<< QMessageFolderFilter::byPath("box/X-Ann", QMessageDataComparator::Includes)
<< ( QMessageFolderIdList() << folderIds[2] << folderIds[3] )
@@ -940,7 +957,7 @@
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[2] << folderIds[3] )
<< ( QMessageFolderIdList() << folderIds[0] );
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("path exclusion 2")
<< QMessageFolderFilter::byPath("box/X-Ann", QMessageDataComparator::Excludes)
<< ( QMessageFolderIdList() << folderIds[0] << folderIds[1] )
@@ -1092,6 +1109,7 @@
<< folderIds
<< QMessageFolderIdList();
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("parentAccountId filter inclusion 1")
<< QMessageFolderFilter::byParentAccountId(QMessageAccountFilter::byName("Alter Ego", QMessageDataComparator::Equal), QMessageDataComparator::Includes)
<< ( QMessageFolderIdList() << folderIds[0] )
@@ -1141,8 +1159,9 @@
<< QMessageFolderFilter::byParentAccountId(QMessageAccountFilter::byName("NoneSuch"), QMessageDataComparator::Excludes)
<< folderIds
<< QMessageFolderIdList();
-
-#ifndef Q_OS_SYMBIAN
+#endif
+
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("parentFolderId equality 1")
<< QMessageFolderFilter::byParentFolderId(folderIds[1], QMessageDataComparator::Equal)
<< ( QMessageFolderIdList() << folderIds[2] )
@@ -1378,7 +1397,7 @@
QTest::newRow("path ascending")
<< ( FolderSortList() << QMessageFolderSortOrder::byPath(Qt::AscendingOrder) )
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[2] << folderIds[3] << folderIds[0] );
#else
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[0] << folderIds[2] << folderIds[3] );
@@ -1386,7 +1405,7 @@
QTest::newRow("path descending")
<< ( FolderSortList() << QMessageFolderSortOrder::byPath(Qt::DescendingOrder) )
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
<< ( QMessageFolderIdList() << folderIds[0] << folderIds[3] << folderIds[2] << folderIds[1] );
#else
<< ( QMessageFolderIdList() << folderIds[3] << folderIds[2] << folderIds[0] << folderIds[1] );
@@ -1402,7 +1421,7 @@
QTest::newRow("path ascending + name ascending")
<< ( FolderSortList() << QMessageFolderSortOrder::byPath(Qt::AscendingOrder) << QMessageFolderSortOrder::byName(Qt::AscendingOrder) )
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[2] << folderIds[3] << folderIds[0] );
#else
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[0] << folderIds[2] << folderIds[3] );
@@ -1413,7 +1432,7 @@
QTest::newRow("path ascending += name ascending")
<< ( FolderSortList() << plusEquals )
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[2] << folderIds[3] << folderIds[0] );
#else
<< ( QMessageFolderIdList() << folderIds[1] << folderIds[0] << folderIds[2] << folderIds[3] );
@@ -1517,11 +1536,13 @@
<< ( QMessageIdList() << messageIds[2] << messageIds[3] << messageIds[4] )
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("id list inclusion empty")
<< QMessageFilter::byId(QMessageIdList(), QMessageDataComparator::Includes)
<< QMessageIdList()
<< messageIds
<< "";
+#endif
QTest::newRow("id list exclusion 1")
<< QMessageFilter::byId(QMessageIdList() << messageIds[0], QMessageDataComparator::Excludes)
@@ -1541,11 +1562,13 @@
<< ( QMessageIdList() << messageIds[0] << messageIds[1] )
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("id list exclusion empty")
<< QMessageFilter::byId(QMessageIdList(), QMessageDataComparator::Excludes)
<< messageIds
<< QMessageIdList()
<< "";
+#endif
QTest::newRow("id filter inclusion empty")
<< QMessageFilter::byId(QMessageFilter(), QMessageDataComparator::Includes)
@@ -1568,7 +1591,7 @@
QTest::newRow("type equality 1")
<< QMessageFilter::byType(QMessage::Sms, QMessageDataComparator::Equal)
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< QMessageIdList()
<< messageIds
#else
@@ -1579,7 +1602,7 @@
QTest::newRow("type equality 2")
<< QMessageFilter::byType(QMessage::Email, QMessageDataComparator::Equal)
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< messageIds
<< QMessageIdList()
#else
@@ -1596,7 +1619,7 @@
QTest::newRow("type inequality 1")
<< QMessageFilter::byType(QMessage::Sms, QMessageDataComparator::NotEqual)
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< messageIds
<< QMessageIdList()
#else
@@ -1607,7 +1630,7 @@
QTest::newRow("type inequality 2")
<< QMessageFilter::byType(QMessage::Email, QMessageDataComparator::NotEqual)
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< QMessageIdList()
<< messageIds
#else
@@ -1624,7 +1647,7 @@
QTest::newRow("type mask inclusion 1")
<< QMessageFilter::byType(QMessage::Sms, QMessageDataComparator::Includes)
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< QMessageIdList()
<< messageIds
#else
@@ -1635,7 +1658,7 @@
QTest::newRow("type mask inclusion 2")
<< QMessageFilter::byType(QMessage::Email, QMessageDataComparator::Includes)
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< messageIds
<< QMessageIdList()
#else
@@ -1658,7 +1681,7 @@
QTest::newRow("type mask exclusion 1")
<< QMessageFilter::byType(QMessage::Sms, QMessageDataComparator::Excludes)
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< messageIds
<< QMessageIdList()
#else
@@ -1669,7 +1692,7 @@
QTest::newRow("type mask exclusion 2")
<< QMessageFilter::byType(QMessage::Email, QMessageDataComparator::Excludes)
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< QMessageIdList()
<< messageIds
#else
@@ -1690,6 +1713,7 @@
<< QMessageIdList()
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("sender equality 1")
<< QMessageFilter::bySender("Esteemed.Colleague@example.com", QMessageDataComparator::Equal)
<< ( QMessageIdList() << messageIds[1] )
@@ -1701,6 +1725,7 @@
<< ( QMessageIdList() << messageIds[3] )
<< ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[2] << messageIds[4] )
<< "";
+#endif
QTest::newRow("sender equality non-matching")
<< QMessageFilter::bySender("Nonesuch", QMessageDataComparator::Equal)
@@ -1720,6 +1745,7 @@
<< messageIds
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("sender inequality 1")
<< QMessageFilter::bySender("Esteemed.Colleague@example.com", QMessageDataComparator::NotEqual)
<< ( QMessageIdList() << messageIds[0] << messageIds[2] << messageIds[3] << messageIds[4] )
@@ -1731,6 +1757,7 @@
<< ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[2] << messageIds[4] )
<< ( QMessageIdList() << messageIds[3] )
<< "";
+#endif
QTest::newRow("sender inequality non-matching")
<< QMessageFilter::bySender("Nonesuch", QMessageDataComparator::NotEqual)
@@ -1756,11 +1783,13 @@
<< ( QMessageIdList() << messageIds[0] )
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("sender inclusion 2")
<< QMessageFilter::bySender("ozone", QMessageDataComparator::Includes)
<< ( QMessageIdList() << messageIds[0] )
<< ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
<< "";
+#endif
QTest::newRow("sender inclusion non-matching")
<< QMessageFilter::bySender("Nonesuch", QMessageDataComparator::Includes)
@@ -1786,11 +1815,13 @@
<< ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("sender exclusion 2")
<< QMessageFilter::bySender("ozone", QMessageDataComparator::Excludes)
<< ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
<< ( QMessageIdList() << messageIds[0] )
<< "";
+#endif
QTest::newRow("sender exclusion non-matching")
<< QMessageFilter::bySender("Nonesuch", QMessageDataComparator::Excludes)
@@ -1990,6 +2021,7 @@
<< messageIds
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("timeStamp equality 1")
<< QMessageFilter::byTimeStamp(QDateTime::fromString("1999-04-01T10:30:00Z", Qt::ISODate), QMessageDataComparator::Equal)
<< ( QMessageIdList() << messageIds[4] )
@@ -2165,7 +2197,9 @@
<< ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[2] << messageIds[3] )
<< ( QMessageIdList() << messageIds[4] )
<< "";
-
+#endif
+
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("status equality 1")
<< QMessageFilter::byStatus(QMessage::Read, QMessageDataComparator::Equal)
<< ( QMessageIdList() << messageIds[0] << messageIds[3] << messageIds[4] )
@@ -2285,6 +2319,7 @@
<< ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[4] )
<< ( QMessageIdList() << messageIds[0] << messageIds[3] )
<< "";
+#endif
QTest::newRow("size equality 1")
<< QMessageFilter::bySize(messageSizes[3], QMessageDataComparator::Equal)
@@ -2391,6 +2426,7 @@
#endif
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("parentAccountId equality 1")
<< QMessageFilter::byParentAccountId(accountIds[0], QMessageDataComparator::Equal)
<< ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
@@ -2402,6 +2438,7 @@
<< ( QMessageIdList() << messageIds[0] )
<< ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
<< "";
+#endif
QTest::newRow("parentAccountId equality invalid")
<< QMessageFilter::byParentAccountId(QMessageAccountId(), QMessageDataComparator::Equal)
@@ -2409,6 +2446,7 @@
<< messageIds
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("parentAccountId inequality 1")
<< QMessageFilter::byParentAccountId(accountIds[0], QMessageDataComparator::NotEqual)
<< ( QMessageIdList() << messageIds[0] )
@@ -2420,6 +2458,7 @@
<< ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
<< ( QMessageIdList() << messageIds[0] )
<< "";
+#endif
QTest::newRow("parentAccountId inequality invalid")
<< QMessageFilter::byParentAccountId(QMessageAccountId(), QMessageDataComparator::NotEqual)
@@ -2427,6 +2466,7 @@
<< QMessageIdList()
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("parentAccountId filter inclusion 1")
<< QMessageFilter::byParentAccountId(QMessageAccountFilter::byName("Alter Ego", QMessageDataComparator::Equal), QMessageDataComparator::Includes)
<< ( QMessageIdList() << messageIds[0] )
@@ -2486,13 +2526,15 @@
<< messageIds
<< QMessageIdList()
<< "";
-
+#endif
+
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("standardFolder equality 1")
<< QMessageFilter::byStandardFolder(QMessage::InboxFolder, QMessageDataComparator::Equal)
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
<< messageIds
<< ( QMessageIdList() )
-#else // Created folders are not mapped to any Standard Folder in Symbian
+#else // Created folders are not mapped to any Standard Folder in Symbian/Maemo
// <=> No messages will be returned, if messages are searched using Standard Folder Filter
<< ( QMessageIdList() )
<< ( QMessageIdList() )
@@ -2501,10 +2543,10 @@
QTest::newRow("standardFolder equality 2")
<< QMessageFilter::byStandardFolder(QMessage::TrashFolder, QMessageDataComparator::Equal)
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
<< ( QMessageIdList() )
<< messageIds
-#else // Created folders are not mapped to any Standard Folder in Symbian
+#else // Created folders are not mapped to any Standard Folder in Symbian/Maemo
// <=> No messages will be returned, if messages are searched using Standard Folder Filter
<< ( QMessageIdList() )
<< ( QMessageIdList() )
@@ -2513,10 +2555,10 @@
QTest::newRow("standardFolder inequality 1")
<< QMessageFilter::byStandardFolder(QMessage::InboxFolder, QMessageDataComparator::NotEqual)
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
<< ( QMessageIdList() )
<< messageIds
-#else // Created folders are not mapped to any Standard Folder in Symbian
+#else // Created folders are not mapped to any Standard Folder in Symbian/Maemo
// <=> No messages will be returned, if messages are searched using Standard Folder Filter
<< ( QMessageIdList() )
<< ( QMessageIdList() )
@@ -2525,15 +2567,16 @@
QTest::newRow("standardFolder inequality 2")
<< QMessageFilter::byStandardFolder(QMessage::TrashFolder, QMessageDataComparator::NotEqual)
-#ifndef Q_OS_SYMBIAN
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
<< messageIds
<< ( QMessageIdList() )
-#else // Created folders are not mapped to any Standard Folder in Symbian
+#else // Created folders are not mapped to any Standard Folder in Symbian/Maemo
// <=> No messages will be returned, if messages are searched using Standard Folder Filter
<< ( QMessageIdList() )
<< ( QMessageIdList() )
#endif
<< "";
+#endif
QTest::newRow("parentFolderId equality 1")
<< QMessageFilter::byParentFolderId(folderIds[0], QMessageDataComparator::Equal)
@@ -2571,6 +2614,7 @@
<< QMessageIdList()
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("parentFolderId filter inclusion 1")
<< QMessageFilter::byParentFolderId(QMessageFolderFilter::byPath("My messages", QMessageDataComparator::Equal), QMessageDataComparator::Includes)
<< ( QMessageIdList() << messageIds[0] )
@@ -2640,8 +2684,9 @@
<< messageIds
<< QMessageIdList()
<< "";
-
-#ifndef Q_OS_SYMBIAN
+#endif
+
+#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("ancestorFolderIds inclusion 1")
<< QMessageFilter::byAncestorFolderIds(folderIds[1], QMessageDataComparator::Includes)
<< ( QMessageIdList() << messageIds[3] << messageIds[4] )
@@ -2739,6 +2784,7 @@
<< "";
#endif
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
// Test some basic combinations
QTest::newRow("status mask inclusion AND timeStamp greater than")
<< ( QMessageFilter::byStatus(QMessage::Read, QMessageDataComparator::Includes) &
@@ -2768,6 +2814,7 @@
<< ( QMessageIdList() << messageIds[2] )
<< ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[3] << messageIds[4] )
<< "";
+#endif
QTest::newRow("subject inclusion OR subject exclusion")
<< ( QMessageFilter::bySubject("agenda", QMessageDataComparator::Includes) |
@@ -2776,6 +2823,7 @@
<< ( QMessageIdList() << messageIds[0] << messageIds[4] )
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QMessageFilter andEquals(QMessageFilter::bySender("Boss", QMessageDataComparator::Includes));
andEquals &= QMessageFilter::byTimeStamp(epoch, QMessageDataComparator::GreaterThan);
QTest::newRow("QMessageFilter::operator&=")
@@ -2783,6 +2831,7 @@
<< ( QMessageIdList() << messageIds[2] )
<< ( QMessageIdList() << messageIds[0] << messageIds[1] << messageIds[3] << messageIds[4] )
<< "";
+#endif
QMessageFilter orEquals(QMessageFilter::bySubject("agenda", QMessageDataComparator::Includes));
orEquals |= QMessageFilter::bySubject("ee", QMessageDataComparator::Excludes);
@@ -2792,6 +2841,7 @@
<< ( QMessageIdList() << messageIds[0] << messageIds[4] )
<< "";
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("body")
<< QMessageFilter()
<< ( QMessageIdList() << messageIds[0] << messageIds[2] )
@@ -2803,6 +2853,7 @@
<< ( QMessageIdList() << messageIds[2] )
<< ( QMessageIdList() << messageIds[0] ) // contains body but does not match filter
<< "summer";
+#endif
// Test matchFlags
QMessageFilter caseInsensitive1(QMessageFilter::bySubject("free beer", QMessageDataComparator::Equal));
@@ -2860,7 +2911,7 @@
QTest::newRow("type ascending")
<< ( MessageSortList() << QMessageSortOrder::byType(Qt::AscendingOrder) )
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< ( MessageListList() << messageIds ); // All messages are Email type
#else
<< ( MessageListList() << ( QMessageIdList() << messageIds[0] )
@@ -2869,13 +2920,14 @@
QTest::newRow("type descending")
<< ( MessageSortList() << QMessageSortOrder::byType(Qt::DescendingOrder) )
-#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN))
+#if (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< ( MessageListList() << messageIds ); // All messages are Email type
#else
<< ( MessageListList() << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[3] << messageIds[4] )
<< ( QMessageIdList() << messageIds[0] ) );
#endif
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("sender ascending")
<< ( MessageSortList() << QMessageSortOrder::bySender(Qt::AscendingOrder) )
<< ( MessageListList() << ( QMessageIdList() << messageIds[2] << messageIds[4] )
@@ -2889,6 +2941,7 @@
<< ( QMessageIdList() << messageIds[0] )
<< ( QMessageIdList() << messageIds[1] )
<< ( QMessageIdList() << messageIds[2] << messageIds[4] ) );
+#endif
QTest::newRow("recipients ascending")
<< ( MessageSortList() << QMessageSortOrder::byRecipients(Qt::AscendingOrder) )
@@ -2918,6 +2971,7 @@
<< ( QMessageIdList() << messageIds[0] )
<< ( QMessageIdList() << messageIds[4] ) );
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("timeStamp ascending")
<< ( MessageSortList() << QMessageSortOrder::byTimeStamp(Qt::AscendingOrder) )
<< ( MessageListList() << ( QMessageIdList() << messageIds[4] )
@@ -2946,7 +3000,7 @@
<< ( QMessageIdList() << messageIds[3] )
<< ( QMessageIdList() << messageIds[0] )
<< ( QMessageIdList() << messageIds[4] ) );
-#endif
+#endif
QTest::newRow("priority ascending")
<< ( MessageSortList() << QMessageSortOrder::byPriority(Qt::AscendingOrder) )
@@ -2959,10 +3013,11 @@
<< ( MessageListList() << ( QMessageIdList() << messageIds[1] << messageIds[2] )
<< ( QMessageIdList() << messageIds[0] << messageIds[3] )
<< ( QMessageIdList() << messageIds[4] ) );
+#endif
QTest::newRow("size ascending")
<< ( MessageSortList() << QMessageSortOrder::bySize(Qt::AscendingOrder) )
-#if defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< ( MessageListList() << ( QMessageIdList() << messageIds[3] )
<< ( QMessageIdList() << messageIds[0] )
<< ( QMessageIdList() << messageIds[4] )
@@ -2983,7 +3038,7 @@
QTest::newRow("size descending")
<< ( MessageSortList() << QMessageSortOrder::bySize(Qt::DescendingOrder) )
<< ( MessageListList() << ( QMessageIdList() << messageIds[2] )
-#if defined(Q_OS_SYMBIAN)
+#if (defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< ( QMessageIdList() << messageIds[1] )
<< ( QMessageIdList() << messageIds[4] )
<< ( QMessageIdList() << messageIds[0] )
@@ -3000,16 +3055,19 @@
<< ( QMessageIdList() << messageIds[0] ) );
#endif
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("status:HasAttachments ascending")
<< ( MessageSortList() << QMessageSortOrder::byStatus(QMessage::HasAttachments, Qt::AscendingOrder) )
<< ( MessageListList() << ( QMessageIdList() << messageIds[0] << messageIds[3] )
<< ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[4] ) );
+#endif
QTest::newRow("status:HasAttachments descending")
<< ( MessageSortList() << QMessageSortOrder::byStatus(QMessage::HasAttachments, Qt::DescendingOrder) )
<< ( MessageListList() << ( QMessageIdList() << messageIds[1] << messageIds[2] << messageIds[4] )
<< ( QMessageIdList() << messageIds[0] << messageIds[3] ) );
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
QTest::newRow("status:Read ascending")
<< ( MessageSortList() << QMessageSortOrder::byStatus(QMessage::Read, Qt::AscendingOrder) )
<< ( MessageListList() << ( QMessageIdList() << messageIds[1] << messageIds[2] )
@@ -3019,7 +3077,9 @@
<< ( MessageSortList() << QMessageSortOrder::byStatus(QMessage::Read, Qt::DescendingOrder) )
<< ( MessageListList() << ( QMessageIdList() << messageIds[0] << messageIds[3] << messageIds[4] )
<< ( QMessageIdList() << messageIds[1] << messageIds[2] ) );
-
+#endif
+
+#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
// On Windows, the following tests do not vary by type (which is always Email)
QTest::newRow("type ascending, priority ascending, size ascending")
<< ( MessageSortList() << QMessageSortOrder::byType(Qt::AscendingOrder)
@@ -3131,7 +3191,7 @@
<< ( QMessageIdList() << messageIds[3] )
<< ( QMessageIdList() << messageIds[0] )
<< ( QMessageIdList() << messageIds[4] ) );
-#elif defined(Q_OS_SYMBIAN)
+#elif (defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
<< ( MessageListList() << ( QMessageIdList() << messageIds[2] )
<< ( QMessageIdList() << messageIds[1] )
<< ( QMessageIdList() << messageIds[0] )
@@ -3186,6 +3246,7 @@
<< ( QMessageIdList() << messageIds[4] )
<< ( QMessageIdList() << messageIds[0] ) );
#endif
+#endif
}
void tst_QMessageStoreKeys::testMessageOrdering()