4 files changed, 32 insertions, 6 deletions

diff --git a/examples/maildirresource/libmaildir/maildir.cpp b/examples/maildirresource/libmaildir/maildir.cpp
index 94363b8..28cf46e 100644
--- a/examples/maildirresource/libmaildir/maildir.cpp
+++ b/examples/maildirresource/libmaildir/maildir.cpp
@@ -770,7 +770,7 @@ bool Maildir::removeEntry(const QString& key)
 //     return newUniqueKey;
 // }
 //
-Maildir::Flags Maildir::readEntryFlags(const QString& key) const
+Maildir::Flags Maildir::readEntryFlags(const QString& key)
 {
     Flags flags;
     const QRegExp rx = *(statusSeparatorRx());
diff --git a/examples/maildirresource/libmaildir/maildir.h b/examples/maildirresource/libmaildir/maildir.h
index f80ba5d..fefd5a7 100644
--- a/examples/maildirresource/libmaildir/maildir.h
+++ b/examples/maildirresource/libmaildir/maildir.h
@@ -178,7 +178,7 @@ public:
     /**
      * Return the flags encoded in the maildir file name for an entry
      **/
-    Flags readEntryFlags( const QString& key ) const;
+    static Flags readEntryFlags( const QString& key );
 
     /**
      * Return the contents of the headers section of the file the maildir with the given @p file, that
diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index 3531b92..5d540be 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -295,7 +295,25 @@ void MaildirResource::removeFromDisk(const QByteArray &instanceIdentifier)
 
 KAsync::Job<void> MaildirResource::inspect(int inspectionType, const QByteArray &inspectionId, const QByteArray &domainType, const QByteArray &entityId, const QByteArray &property, const QVariant &expectedValue)
 {
+    auto synchronizationStore = QSharedPointer<Akonadi2::Storage>::create(Akonadi2::storageLocation(), mResourceInstanceIdentifier + ".synchronization", Akonadi2::Storage::ReadOnly);
+    auto synchronizationTransaction = synchronizationStore->createTransaction(Akonadi2::Storage::ReadOnly);
     Trace() << "Inspecting " << inspectionType << domainType << entityId << property << expectedValue;
+    if (domainType == ENTITY_TYPE_MAIL) {
+        if (inspectionType == Akonadi2::Resources::Inspection::PropertyInspectionType) {
+            if (property == "unread") {
+                const auto remoteId = resolveLocalId(ENTITY_TYPE_MAIL, entityId, synchronizationTransaction);
+                const auto flags = KPIM::Maildir::readEntryFlags(remoteId.split('/').last());
+                if (expectedValue.toBool() && !(flags & KPIM::Maildir::Seen)) {
+                    return KAsync::error<void>(1, "Expected seen but couldn't find it.");
+                }
+                if (!expectedValue.toBool() && (flags & KPIM::Maildir::Seen)) {
+                    return KAsync::error<void>(1, "Expected seen but couldn't find it.");
+                }
+                return KAsync::null<void>();
+            }
+        }
+    }
+    return KAsync::null<void>();
 }
 
 MaildirResourceFactory::MaildirResourceFactory(QObject *parent)
diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp
index c649536..046c920 100644
--- a/tests/maildirresourcetest.cpp
+++ b/tests/maildirresourcetest.cpp
@@ -353,14 +353,22 @@ private Q_SLOTS:
                     return Akonadi2::Store::modify(*mail);
                 })
                 .then<void>(Akonadi2::Store::flushMessageQueue(query.resources))
-                .then<void, KAsync::Job<void> >([folder]() -> KAsync::Job<void> {
+                .then<void, KAsync::Job<void> >([folder]() {
                     return Store::fetchAll<Mail>(
                         Query::PropertyFilter("folder", folder) + Query::RequestedProperties(QByteArrayList() << "folder" << "subject" << "unread")
                     )
-                    .then<void, QList<Mail::Ptr> >([](const QList<Mail::Ptr> &mails) {
-                        QCOMPARE(mails.size(), 1);
+                    .then<void, KAsync::Job<void>, QList<Mail::Ptr>>([](const QList<Mail::Ptr> &mails) {
+                        //Can't use QCOMPARE because it tries to return
+                        if (mails.size() != 1) {
+                            return KAsync::error<void>(1, "Wrong number of mails.");
+                        }
                         auto mail = mails.first();
-                        QCOMPARE(mail->getProperty("unread").toBool(), true);
+                        //Can't use QCOMPARE because it tries to return
+                        if (mail->getProperty("unread").toBool() != true) {
+                            return KAsync::error<void>(1, "Wrong property value.");
+                        }
+                        auto inspectionCommand = Akonadi2::Resources::Inspection::PropertyInspection(*mail, "unread", true);
+                        return Akonadi2::Resources::inspect<Mail>(inspectionCommand);
                     })
                     .then<void>([](){});
                 });