summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPekka Vuorela <pvuorela@iki.fi>2025-12-04 11:30:44 +0200
committerPekka Vuorela <pvuorela@iki.fi>2025-12-11 11:27:20 +0200
commit15a73fae6aaffbedc287359fba119e57613a2ed1 (patch)
tree20179c05f2a2ea3db0977f833cdd727291fa712b /tests
parent2b166ddec7422518c266e74a84491eb05ba16d09 (diff)
Rename QMailMessageMetadata::content as contentCategory
The related functionality was confusing when setContent() didn't actually set any content but rather the type of it. Also there are other setContent() methods around that actually set the content. Then again calling this contentType() would have collided further in the inheritance tree by method returning a QMailMessageContentType which is referring to header fields. Thus switched this to a third distinct name. Old setter and getter names provided for backwards compatibility which should work at least for the very basic cases of setting and comparing type. Change-Id: I4c54548f3c2c85096fde64b3221e233dd3feefa3 Reviewed-by: Damien Caliste <dcaliste@free.fr> Reviewed-by: <matti.viljanen@kapsi.fi> Reviewed-by: Pekka Vuorela <pvuorela@iki.fi>
Diffstat (limited to 'tests')
-rw-r--r--tests/tst_qmail_listmodels/tst_qmail_listmodels.cpp4
-rw-r--r--tests/tst_qmail_sortkeys/tst_qmail_sortkeys.cpp12
-rw-r--r--tests/tst_qmaildisconnected/tst_qmaildisconnected.cpp10
-rw-r--r--tests/tst_qmailmessageset/tst_qmailmessageset.cpp10
-rw-r--r--tests/tst_qmailserviceaction/tst_qmailserviceaction.cpp10
-rw-r--r--tests/tst_qmailstorageaction/tst_qmailstorageaction.cpp16
-rw-r--r--tests/tst_qmailstorekeys/tst_qmailstorekeys.cpp58
-rw-r--r--tests/tst_qmailthread/tst_qmailthread.cpp10
-rw-r--r--tests/tst_storagemanager/tst_storagemanager.cpp8
9 files changed, 69 insertions, 69 deletions
diff --git a/tests/tst_qmail_listmodels/tst_qmail_listmodels.cpp b/tests/tst_qmail_listmodels/tst_qmail_listmodels.cpp
index 46493406..6d6abd20 100644
--- a/tests/tst_qmail_listmodels/tst_qmail_listmodels.cpp
+++ b/tests/tst_qmail_listmodels/tst_qmail_listmodels.cpp
@@ -146,7 +146,7 @@ void tst_QMail_ListModels::initTestCase()
msg1.setStatus(QMailMessage::Read, true);
msg1.setServerUid("sim:12345");
msg1.setSize(1 * 1024);
- msg1.setContent(QMailMessage::PlainTextContent);
+ msg1.setContentCategory(QMailMessage::PlainTextContent);
msg1.setCustomField("present", "true");
msg1.setCustomField("todo", "true");
QVERIFY(QMailStore::instance()->addMessage(&msg1));
@@ -165,7 +165,7 @@ void tst_QMail_ListModels::initTestCase()
msg2.setStatus(QMailMessage::Read, false);
msg2.setServerUid("inboxmsg21");
msg2.setSize(5 * 1024);
- msg2.setContent(QMailMessage::PlainTextContent);
+ msg2.setContentCategory(QMailMessage::PlainTextContent);
msg2.setCustomField("present", "true");
msg2.setBody(QMailMessageBody::fromData(m1,QMailMessageContentType("text/plain"),QMailMessageBody::QuotedPrintable));
QVERIFY(QMailStore::instance()->addMessage(&msg2));
diff --git a/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.cpp b/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.cpp
index d5cedd4e..399c4968 100644
--- a/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.cpp
+++ b/tests/tst_qmail_sortkeys/tst_qmail_sortkeys.cpp
@@ -268,7 +268,7 @@ void tst_QMail_SortKeys::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("sim:12345");
message.setSize(1 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
message.setCustomField("todo", "true");
@@ -292,7 +292,7 @@ void tst_QMail_SortKeys::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("inboxMessage1");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -316,7 +316,7 @@ void tst_QMail_SortKeys::initTestCase()
message.setStatus(QMailMessage::Sent, true);
message.setServerUid("archivedMessage1");
message.setSize(15 * 1024);
- message.setContent(QMailMessage::VideoContent);
+ message.setContentCategory(QMailMessage::VideoContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -345,7 +345,7 @@ void tst_QMail_SortKeys::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("inboxMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(inboxMessage1);
message.setResponseType(QMailMessage::Forward);
message.setCustomField("present", "true");
@@ -372,7 +372,7 @@ void tst_QMail_SortKeys::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("savedMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(archivedMessage1);
message.setResponseType(QMailMessage::Reply);
message.setCustomField("present", "true");
@@ -483,7 +483,7 @@ void tst_QMail_SortKeys::test_messagesortkey()
QCOMPARE(ids.count(), allMessages.count());
ids = QMailStore::instance()->queryMessages(key, QMailMessageSortKey::parentAccountId());
QCOMPARE(ids.count(), allMessages.count());
- ids = QMailStore::instance()->queryMessages(key, QMailMessageSortKey::contentType());
+ ids = QMailStore::instance()->queryMessages(key, QMailMessageSortKey::contentCategory());
QCOMPARE(ids.count(), allMessages.count());
ids = QMailStore::instance()->queryMessages(key, QMailMessageSortKey::previousParentFolderId());
QCOMPARE(ids.count(), allMessages.count());
diff --git a/tests/tst_qmaildisconnected/tst_qmaildisconnected.cpp b/tests/tst_qmaildisconnected/tst_qmaildisconnected.cpp
index 75c9dfc9..dbdcb82c 100644
--- a/tests/tst_qmaildisconnected/tst_qmaildisconnected.cpp
+++ b/tests/tst_qmaildisconnected/tst_qmaildisconnected.cpp
@@ -267,7 +267,7 @@ void tst_QMailDisconnected::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("sim:12345");
message.setSize(1 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
message.setCustomField("todo", "true");
@@ -291,7 +291,7 @@ void tst_QMailDisconnected::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("inboxMessage1");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -315,7 +315,7 @@ void tst_QMailDisconnected::initTestCase()
message.setStatus(QMailMessage::Sent, true);
message.setServerUid("archivedMessage1");
message.setSize(15 * 1024);
- message.setContent(QMailMessage::VideoContent);
+ message.setContentCategory(QMailMessage::VideoContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -344,7 +344,7 @@ void tst_QMailDisconnected::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("inboxMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(inboxMessage1);
message.setResponseType(QMailMessage::Forward);
message.setCustomField("present", "true");
@@ -371,7 +371,7 @@ void tst_QMailDisconnected::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("savedMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(archivedMessage1);
message.setResponseType(QMailMessage::Reply);
message.setCustomField("present", "true");
diff --git a/tests/tst_qmailmessageset/tst_qmailmessageset.cpp b/tests/tst_qmailmessageset/tst_qmailmessageset.cpp
index f57d275a..c63212d8 100644
--- a/tests/tst_qmailmessageset/tst_qmailmessageset.cpp
+++ b/tests/tst_qmailmessageset/tst_qmailmessageset.cpp
@@ -274,7 +274,7 @@ void tst_QMailMessageSet::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("sim:12345");
message.setSize(1 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
message.setCustomField("todo", "true");
@@ -298,7 +298,7 @@ void tst_QMailMessageSet::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("inboxMessage1");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -322,7 +322,7 @@ void tst_QMailMessageSet::initTestCase()
message.setStatus(QMailMessage::Sent, true);
message.setServerUid("archivedMessage1");
message.setSize(15 * 1024);
- message.setContent(QMailMessage::VideoContent);
+ message.setContentCategory(QMailMessage::VideoContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -351,7 +351,7 @@ void tst_QMailMessageSet::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("inboxMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(inboxMessage1);
message.setResponseType(QMailMessage::Forward);
message.setCustomField("present", "true");
@@ -378,7 +378,7 @@ void tst_QMailMessageSet::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("savedMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(archivedMessage1);
message.setResponseType(QMailMessage::Reply);
message.setCustomField("present", "true");
diff --git a/tests/tst_qmailserviceaction/tst_qmailserviceaction.cpp b/tests/tst_qmailserviceaction/tst_qmailserviceaction.cpp
index f604a851..aa82f476 100644
--- a/tests/tst_qmailserviceaction/tst_qmailserviceaction.cpp
+++ b/tests/tst_qmailserviceaction/tst_qmailserviceaction.cpp
@@ -272,7 +272,7 @@ void tst_QMailServiceAction::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("sim:12345");
message.setSize(1 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
message.setCustomField("todo", "true");
@@ -296,7 +296,7 @@ void tst_QMailServiceAction::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("inboxMessage1");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -320,7 +320,7 @@ void tst_QMailServiceAction::initTestCase()
message.setStatus(QMailMessage::Sent, true);
message.setServerUid("archivedMessage1");
message.setSize(15 * 1024);
- message.setContent(QMailMessage::VideoContent);
+ message.setContentCategory(QMailMessage::VideoContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -349,7 +349,7 @@ void tst_QMailServiceAction::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("inboxMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(inboxMessage1);
message.setResponseType(QMailMessage::Forward);
message.setCustomField("present", "true");
@@ -376,7 +376,7 @@ void tst_QMailServiceAction::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("savedMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(archivedMessage1);
message.setResponseType(QMailMessage::Reply);
message.setCustomField("present", "true");
diff --git a/tests/tst_qmailstorageaction/tst_qmailstorageaction.cpp b/tests/tst_qmailstorageaction/tst_qmailstorageaction.cpp
index c8950d07..9a8497a0 100644
--- a/tests/tst_qmailstorageaction/tst_qmailstorageaction.cpp
+++ b/tests/tst_qmailstorageaction/tst_qmailstorageaction.cpp
@@ -348,7 +348,7 @@ void tst_QMailStorageAction::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("sim:12345");
message.setSize(1 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
message.setCustomField("todo", "true");
@@ -372,7 +372,7 @@ void tst_QMailStorageAction::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("inboxMessage1");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -396,7 +396,7 @@ void tst_QMailStorageAction::initTestCase()
message.setStatus(QMailMessage::Sent, true);
message.setServerUid("archivedMessage1");
message.setSize(15 * 1024);
- message.setContent(QMailMessage::VideoContent);
+ message.setContentCategory(QMailMessage::VideoContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -425,7 +425,7 @@ void tst_QMailStorageAction::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("inboxMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(inboxMessage1);
message.setResponseType(QMailMessage::Forward);
message.setCustomField("present", "true");
@@ -452,7 +452,7 @@ void tst_QMailStorageAction::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("savedMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(archivedMessage1);
message.setResponseType(QMailMessage::Reply);
message.setCustomField("present", "true");
@@ -496,7 +496,7 @@ void tst_QMailStorageAction::test_storageaction_add()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("savedMessage3");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setCustomField("present", "true");
messages << message;
@@ -748,7 +748,7 @@ void tst_QMailStorageAction::test_storageaction_rollBackUpdates()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("savedMessage5");
message.setSize(7 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -844,7 +844,7 @@ void tst_QMailStorageAction::test_storageaction_discardMessages()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("savedMessage4");
message.setSize(6 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
diff --git a/tests/tst_qmailstorekeys/tst_qmailstorekeys.cpp b/tests/tst_qmailstorekeys/tst_qmailstorekeys.cpp
index 0ab873d1..6891bc78 100644
--- a/tests/tst_qmailstorekeys/tst_qmailstorekeys.cpp
+++ b/tests/tst_qmailstorekeys/tst_qmailstorekeys.cpp
@@ -350,7 +350,7 @@ void tst_QMailStoreKeys::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("sim:12345");
message.setSize(1 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
message.setCustomField("todo", "true");
@@ -374,7 +374,7 @@ void tst_QMailStoreKeys::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("inboxMessage1");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -398,7 +398,7 @@ void tst_QMailStoreKeys::initTestCase()
message.setStatus(QMailMessage::Sent, true);
message.setServerUid("archivedMessage1");
message.setSize(15 * 1024);
- message.setContent(QMailMessage::VideoContent);
+ message.setContentCategory(QMailMessage::VideoContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -427,7 +427,7 @@ void tst_QMailStoreKeys::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("inboxMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(inboxMessage1);
message.setResponseType(QMailMessage::Forward);
message.setCustomField("present", "true");
@@ -454,7 +454,7 @@ void tst_QMailStoreKeys::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("savedMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(archivedMessage1);
message.setResponseType(QMailMessage::Reply);
message.setCustomField("present", "true");
@@ -2086,36 +2086,36 @@ void tst_QMailStoreKeys::messageAncestorFolderIds()
void tst_QMailStoreKeys::messageContentType()
{
// ContentType equality
- QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::PlainTextContent, Equal)), messageSet() << smsMessage << inboxMessage1);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::PlainTextContent, Equal)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2);
- QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::HtmlContent, Equal)), messageSet() << inboxMessage2 << savedMessage2);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::HtmlContent, Equal)), messageSet() << smsMessage << inboxMessage1 << archivedMessage1);
- QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::VoicemailContent, Equal)), noMessages);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::VoicemailContent, Equal)), allMessages);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::PlainTextContent, Equal)), messageSet() << smsMessage << inboxMessage1);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::PlainTextContent, Equal)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::HtmlContent, Equal)), messageSet() << inboxMessage2 << savedMessage2);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::HtmlContent, Equal)), messageSet() << smsMessage << inboxMessage1 << archivedMessage1);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::VoicemailContent, Equal)), noMessages);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::VoicemailContent, Equal)), allMessages);
// ContentType inequality
- QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::PlainTextContent, NotEqual)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::PlainTextContent, NotEqual)), messageSet() << smsMessage << inboxMessage1);
- QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::HtmlContent, NotEqual)), messageSet() << smsMessage << inboxMessage1 << archivedMessage1);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::HtmlContent, NotEqual)), messageSet() << inboxMessage2 << savedMessage2);
- QCOMPARE(messageSet(QMailMessageKey::contentType(QMailMessage::VoicemailContent, NotEqual)), allMessages);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QMailMessage::VoicemailContent, NotEqual)), noMessages);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::PlainTextContent, NotEqual)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::PlainTextContent, NotEqual)), messageSet() << smsMessage << inboxMessage1);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::HtmlContent, NotEqual)), messageSet() << smsMessage << inboxMessage1 << archivedMessage1);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::HtmlContent, NotEqual)), messageSet() << inboxMessage2 << savedMessage2);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QMailMessage::VoicemailContent, NotEqual)), allMessages);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QMailMessage::VoicemailContent, NotEqual)), noMessages);
// List inclusion
- QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>())), noMessages);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>())), allMessages);
- QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent)), messageSet() << archivedMessage1);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent)), messageSet() << smsMessage << inboxMessage1 << inboxMessage2 << savedMessage2);
- QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent << QMailMessage::HtmlContent)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent << QMailMessage::HtmlContent)), messageSet() << smsMessage << inboxMessage1);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>())), noMessages);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>())), allMessages);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent)), messageSet() << archivedMessage1);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent)), messageSet() << smsMessage << inboxMessage1 << inboxMessage2 << savedMessage2);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent << QMailMessage::HtmlContent)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent << QMailMessage::HtmlContent)), messageSet() << smsMessage << inboxMessage1);
// List exclusion
- QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>(), Excludes)), allMessages);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>(), Excludes)), noMessages);
- QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent, Excludes)), messageSet() << smsMessage << inboxMessage1 << inboxMessage2 << savedMessage2);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent, Excludes)), messageSet() << archivedMessage1);
- QCOMPARE(messageSet(QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent << QMailMessage::HtmlContent, Excludes)), messageSet() << smsMessage << inboxMessage1);
- QCOMPARE(messageSet(~QMailMessageKey::contentType(QList<QMailMessage::ContentType>() << QMailMessage::VideoContent << QMailMessage::HtmlContent, Excludes)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>(), Excludes)), allMessages);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>(), Excludes)), noMessages);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent, Excludes)), messageSet() << smsMessage << inboxMessage1 << inboxMessage2 << savedMessage2);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent, Excludes)), messageSet() << archivedMessage1);
+ QCOMPARE(messageSet(QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent << QMailMessage::HtmlContent, Excludes)), messageSet() << smsMessage << inboxMessage1);
+ QCOMPARE(messageSet(~QMailMessageKey::contentCategory(QList<QMailMessage::ContentCategory>() << QMailMessage::VideoContent << QMailMessage::HtmlContent, Excludes)), messageSet() << archivedMessage1 << inboxMessage2 << savedMessage2);
}
void tst_QMailStoreKeys::messagePreviousParentFolderId()
diff --git a/tests/tst_qmailthread/tst_qmailthread.cpp b/tests/tst_qmailthread/tst_qmailthread.cpp
index ae753c0e..2709c581 100644
--- a/tests/tst_qmailthread/tst_qmailthread.cpp
+++ b/tests/tst_qmailthread/tst_qmailthread.cpp
@@ -291,7 +291,7 @@ void tst_qmailthread::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("sim:12345");
message.setSize(1 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
message.setCustomField("todo", "true");
@@ -315,7 +315,7 @@ void tst_qmailthread::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("inboxMessage1");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::PlainTextContent);
+ message.setContentCategory(QMailMessage::PlainTextContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -339,7 +339,7 @@ void tst_qmailthread::initTestCase()
message.setStatus(QMailMessage::Sent, true);
message.setServerUid("archivedMessage1");
message.setSize(15 * 1024);
- message.setContent(QMailMessage::VideoContent);
+ message.setContentCategory(QMailMessage::VideoContent);
message.setCustomField("present", "true");
QVERIFY(QMailStore::instance()->addMessage(&message));
@@ -368,7 +368,7 @@ void tst_qmailthread::initTestCase()
message.setStatus(QMailMessage::Read, true);
message.setServerUid("inboxMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(inboxMessage1);
message.setResponseType(QMailMessage::Forward);
message.setCustomField("present", "true");
@@ -395,7 +395,7 @@ void tst_qmailthread::initTestCase()
message.setStatus(QMailMessage::Read, false);
message.setServerUid("savedMessage2");
message.setSize(5 * 1024);
- message.setContent(QMailMessage::HtmlContent);
+ message.setContentCategory(QMailMessage::HtmlContent);
message.setInResponseTo(archivedMessage1);
message.setResponseType(QMailMessage::Reply);
message.setCustomField("present", "true");
diff --git a/tests/tst_storagemanager/tst_storagemanager.cpp b/tests/tst_storagemanager/tst_storagemanager.cpp
index 7da2be70..48926590 100644
--- a/tests/tst_storagemanager/tst_storagemanager.cpp
+++ b/tests/tst_storagemanager/tst_storagemanager.cpp
@@ -160,7 +160,7 @@ void tst_StorageManager::initTestCase()
msg1.setStatus(QMailMessage::Read, true);
msg1.setServerUid("sim:12345");
msg1.setSize(1 * 1024);
- msg1.setContent(QMailMessage::PlainTextContent);
+ msg1.setContentCategory(QMailMessage::PlainTextContent);
msg1.setCustomField("present", "true");
msg1.setCustomField("todo", "true");
QVERIFY(QMailStore::instance()->addMessage(&msg1));
@@ -179,7 +179,7 @@ void tst_StorageManager::initTestCase()
msg2.setStatus(QMailMessage::Read, false);
msg2.setServerUid("inboxmsg21");
msg2.setSize(5 * 1024);
- msg2.setContent(QMailMessage::PlainTextContent);
+ msg2.setContentCategory(QMailMessage::PlainTextContent);
msg2.setCustomField("present", "true");
msg2.setBody(QMailMessageBody::fromData(mime1,QMailMessageContentType("multipart/digest"),QMailMessageBody::QuotedPrintable));
QVERIFY(QMailStore::instance()->addMessage(&msg2));
@@ -218,7 +218,7 @@ void tst_StorageManager::test_add()
msg3.setStatus(QMailMessage::Read, false);
msg3.setServerUid("inboxmsg22");
msg3.setSize(5 * 1024);
- msg3.setContent(QMailMessage::PlainTextContent);
+ msg3.setContentCategory(QMailMessage::PlainTextContent);
msg3.setCustomField("present", "true");
msg3.setBody(QMailMessageBody::fromData("plaintext",QMailMessageContentType("text/plain"),QMailMessageBody::QuotedPrintable));
msg3.setCustomField("qmf-detached-filename", "file1x2y-detached");
@@ -242,7 +242,7 @@ void tst_StorageManager::test_remove()
msg4.setStatus(QMailMessage::Read, false);
msg4.setServerUid("unique-inboxmsg22");
msg4.setSize(5 * 1024);
- msg4.setContent(QMailMessage::PlainTextContent);
+ msg4.setContentCategory(QMailMessage::PlainTextContent);
msg4.setCustomField("present", "true");
msg4.setBody(QMailMessageBody::fromData("plaintext",QMailMessageContentType("text/plain"),QMailMessageBody::QuotedPrintable));
msg4.setCustomField("qmf-detached-filename", "non-existent");
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 00:01:54 +0000