summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPekka Vuorela <pvuorela@iki.fi>2025-09-27 19:59:32 +0300
committerPekka Vuorela <pvuorela@iki.fi>2025-09-29 14:36:45 +0300
commitc920b71baf962cde974f55cc034e64c5bffe6b21 (patch)
tree673f4bab92e76ef03635568efe233ec3f255d8c9 /tests
parent8f4a54e9ab0a3cba69c837dc373b74b5f687b808 (diff)
Avoid (explicit) QmfList outside the library
Paving the way to get rid of the QmfList which was added sort of stopgap on Qt6 migration because of the QList changes. - Imap plugin using for() loop which should work for any container type returned by the methods. - tst_qmailstore unit test just getting the list of addresses after we are sure those won't change. A few more lines but avoids the custom type. - On previous changed also indexing fully 0 based to keep it more robust. "Hi 0" type of subjects shouldn't really matter on tests. Change-Id: I7a74dbe7654d5f3dd80435d5bf9af110b875b03a 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_qmailstore/tst_qmailstore.cpp55
1 files changed, 31 insertions, 24 deletions
diff --git a/tests/tst_qmailstore/tst_qmailstore.cpp b/tests/tst_qmailstore/tst_qmailstore.cpp
index c2e1e3aa..9d7e01ca 100644
--- a/tests/tst_qmailstore/tst_qmailstore.cpp
+++ b/tests/tst_qmailstore/tst_qmailstore.cpp
@@ -456,9 +456,8 @@ void tst_QMailStore::addMessages()
QCOMPARE(QMailStore::instance()->countFolders(), 1);
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
- QmfList<QMailMessage> messages;
- QList<QMailMessage*> messageAddresses;
- for (int i = 1; i <= 10; ++i) {
+ QList<QMailMessage> messages;
+ for (int i = 0; i < 10; ++i) {
QMailMessage message;
message.setParentAccountId(account.id());
message.setParentFolderId(folder.id());
@@ -466,7 +465,11 @@ void tst_QMailStore::addMessages()
message.setSubject(QString("Message %1").arg(i));
message.setBody(QMailMessageBody::fromData(QString("Hi #%1").arg(i), QMailMessageContentType("text/plain"), QMailMessageBody::SevenBit));
messages.append(message);
- messageAddresses.append(&messages[i-1]);
+ }
+
+ QList<QMailMessage*> messageAddresses;
+ for (int i = 0; i < messages.size(); ++i) {
+ messageAddresses.append(&messages[i]);
}
// Verify that addition is successful
@@ -482,8 +485,8 @@ void tst_QMailStore::addMessages()
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
// Verify that retrieval yields matching result
- for (int i = 1; i <= 10; ++i) {
- QMailMessage message(messages.at(i - 1).id());
+ for (int i = 0; i < 10; ++i) {
+ QMailMessage message(messages.at(i).id());
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
QCOMPARE(message.subject(), QString("Message %1").arg(i));
QCOMPARE(message.body().data(), QString("Hi #%1").arg(i));
@@ -532,9 +535,8 @@ void tst_QMailStore::addMessages2()
QCOMPARE(QMailStore::instance()->countFolders(), 1);
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
- QmfList<QMailMessage> messages;
- QList<QMailMessage*> messageAddresses;
- for (int i = 1; i <= 10; ++i) {
+ QList<QMailMessage> messages;
+ for (int i = 0; i < 10; ++i) {
QMailMessage message;
message.setParentAccountId(account.id());
message.setParentFolderId(folder.id());
@@ -542,7 +544,11 @@ void tst_QMailStore::addMessages2()
message.setSubject(QString("Message %1").arg(i));
message.setBody(QMailMessageBody::fromData(QString("Hi #%1").arg(i), QMailMessageContentType("text/plain"), QMailMessageBody::SevenBit));
messages.append(message);
- messageAddresses.append(&messages[i-1]);
+ }
+
+ QList<QMailMessage*> messageAddresses;
+ for (int i = 0; i < messages.size(); ++i) {
+ messageAddresses.append(&messages[i]);
}
// Verify that addition is successful
@@ -558,8 +564,8 @@ void tst_QMailStore::addMessages2()
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
// Verify that retrieval yields matching result
- for (int i = 1; i <= 10; ++i) {
- QMailMessage message(messages.at(i - 1).id());
+ for (int i = 0; i < 10; ++i) {
+ QMailMessage message(messages[i].id());
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
QCOMPARE(message.subject(), QString("Message %1").arg(i));
QCOMPARE(message.body().data(), QString("Hi #%1").arg(i));
@@ -1251,17 +1257,21 @@ void tst_QMailStore::updateMessages()
QCOMPARE(QMailStore::instance()->countFolders(), 1);
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
- QmfList<QMailMessage> messages;
- QList<QMailMessage*> messageAddresses;
- for (int i = 1; i <= 10; ++i) {
+ QList<QMailMessage> messages;
+ for (int i = 0; i < 10; ++i) {
QMailMessage message;
message.setParentAccountId(account.id());
message.setParentFolderId(folder.id());
message.setMessageType(QMailMessage::Sms);
message.setSubject(QString("Message %1").arg(i));
- message.setBody(QMailMessageBody::fromData(QString("Hi #%1").arg(i), QMailMessageContentType("text/plain"), QMailMessageBody::SevenBit));
+ message.setBody(QMailMessageBody::fromData(QString("Hi #%1").arg(i), QMailMessageContentType("text/plain"),
+ QMailMessageBody::SevenBit));
messages.append(message);
- messageAddresses.append(&messages[i-1]);
+ }
+
+ QList<QMailMessage*> messageAddresses;
+ for (int i = 0; i < messages.size(); ++i) {
+ messageAddresses.append(&messages[i]);
}
// Verify that addition is successful
@@ -1277,8 +1287,8 @@ void tst_QMailStore::updateMessages()
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
// Change the properties of each message
- for (int i = 1; i <= 10; ++i) {
- QMailMessage *message(messageAddresses.at(i - 1));
+ for (int i = 0; i < 10; ++i) {
+ QMailMessage *message(messageAddresses.at(i));
message->setSubject(QString("Message %1").arg(i + 100));
message->setBody(QMailMessageBody::fromData(QString("Hi #%1").arg(i + 100), QMailMessageContentType("text/plain"), QMailMessageBody::SevenBit));
}
@@ -1292,8 +1302,8 @@ void tst_QMailStore::updateMessages()
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
// Verify that retrieval yields matching result
- for (int i = 1; i <= 10; ++i) {
- QMailMessage message(messages.at(i - 1).id());
+ for (int i = 0; i < 10; ++i) {
+ QMailMessage message(messages.at(i).id());
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
QCOMPARE(message.subject(), QString("Message %1").arg(i + 100));
QCOMPARE(message.body().data(), QString("Hi #%1").arg(i + 100));
@@ -1580,7 +1590,6 @@ void tst_QMailStore::remove1000Messages()
QCOMPARE(QMailStore::instance()->lastError(), QMailStore::NoError);
QCOMPARE(QMailStore::instance()->countMessages(),0);
-
//with message removal record
for (int i = 0; i < largeMessageCount; ++i) {
@@ -1808,8 +1817,6 @@ void tst_QMailStore::implementationbase()
}
QVERIFY(QMailStore::instance()->addAccount(&account1, &config1));
-
-
QMailStoreNullImplementation impl(QMailStore::instance());
QVERIFY(!impl.asynchronousEmission());
impl.flushIpcNotifications();
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 00:04:21 +0000