diff options
| author | Don Sanders <don.sanders@nokia.com> | 2011-03-11 18:07:00 +1000 |
|---|---|---|
| committer | Don Sanders <don.sanders@nokia.com> | 2011-03-11 18:07:00 +1000 |
| commit | bf972903437feb8cf355839aa95c629b3e68d5b1 (patch) | |
| tree | e323a67744c0dd5d5145703b217dbcffd984e99c | |
| parent | 55e590fabfa69647a4dc2be0d2cc258db77292a2 (diff) | |
| parent | 8a4985ee444fc01939ba1e2e0e0897fe89d8a305 (diff) | |
Merge commit 'refs/merge-requests/10' of git://gitorious.org/qt-labs/messagingframework into merge-requests/10
| -rw-r--r-- | tests/tst_qmailstore/tst_qmailstore.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/tst_qmailstore/tst_qmailstore.cpp b/tests/tst_qmailstore/tst_qmailstore.cpp index 06ae9e2a..3db71a30 100644 --- a/tests/tst_qmailstore/tst_qmailstore.cpp +++ b/tests/tst_qmailstore/tst_qmailstore.cpp @@ -1001,20 +1001,20 @@ void tst_QMailStore::updateMessage() QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError); // Temporary location for these tests: - QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qtopiamailfile")), 2); - QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qtopiamailfile")), 0); + QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qmfstoragemanager")), 2); + QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qmfstoragemanager")), 0); - QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qtopiamailfile", QMailDataComparator::NotEqual)), 0); - QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qtopiamailfile", QMailDataComparator::NotEqual)), 2); + QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qmfstoragemanager", QMailDataComparator::NotEqual)), 0); + QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qmfstoragemanager", QMailDataComparator::NotEqual)), 2); - QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qtopiamailfile", QMailDataComparator::Includes)), 2); - QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qtopiamailfile", QMailDataComparator::Includes)), 0); + QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qmfstoragemanager", QMailDataComparator::Includes)), 2); + QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qmfstoragemanager", QMailDataComparator::Includes)), 0); - QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qtopia", QMailDataComparator::Includes)), 2); - QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qtopia", QMailDataComparator::Includes)), 0); + QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qmf", QMailDataComparator::Includes)), 2); + QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qmf", QMailDataComparator::Includes)), 0); - QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qtopia", QMailDataComparator::Excludes)), 0); - QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qtopia", QMailDataComparator::Excludes)), 2); + QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qmf", QMailDataComparator::Excludes)), 0); + QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qmf", QMailDataComparator::Excludes)), 2); QCOMPARE(QMailStore::instance()->countMessages(QMailMessageKey::contentScheme("qtexended", QMailDataComparator::Includes)), 0); QCOMPARE(QMailStore::instance()->countMessages(~QMailMessageKey::contentScheme("qtexended", QMailDataComparator::Includes)), 2); @@ -1032,8 +1032,8 @@ void tst_QMailStore::updateMessage() QCOMPARE(QMailStore::instance()->queryMessages(~QMailMessageKey::contentIdentifier(message1.contentIdentifier().remove(0, 1), QMailDataComparator::Includes)), QMailMessageIdList() << message3.id()); QCOMPARE(QMailStore::instance()->queryMessages(~QMailMessageKey::contentIdentifier(message1.contentIdentifier().remove(0, 1), QMailDataComparator::Excludes)), QMailMessageIdList() << message1.id()); - QCOMPARE(QMailStore::instance()->queryMessages(QMailMessageKey::contentScheme("qtopiamailfile") & QMailMessageKey::contentIdentifier(message1.contentIdentifier())), QMailMessageIdList() << message1.id()); - QCOMPARE(QMailStore::instance()->queryMessages(QMailMessageKey::contentScheme("qtopiamailfile") & ~QMailMessageKey::contentIdentifier(message1.contentIdentifier())), QMailMessageIdList() << message3.id()); + QCOMPARE(QMailStore::instance()->queryMessages(QMailMessageKey::contentScheme("qmfstoragemanager") & QMailMessageKey::contentIdentifier(message1.contentIdentifier())), QMailMessageIdList() << message1.id()); + QCOMPARE(QMailStore::instance()->queryMessages(QMailMessageKey::contentScheme("qmfstoragemanager") & ~QMailMessageKey::contentIdentifier(message1.contentIdentifier())), QMailMessageIdList() << message3.id()); } void tst_QMailStore::updateMessages() |