Fixed maildirresourcetest

2 files changed, 14 insertions, 6 deletions

diff --git a/examples/maildirresource/maildirresource.cpp b/examples/maildirresource/maildirresource.cpp
index f888b5d..8770ff0 100644
--- a/examples/maildirresource/maildirresource.cpp
+++ b/examples/maildirresource/maildirresource.cpp
@@ -52,6 +52,10 @@ MaildirResource::MaildirResource(const QByteArray &instanceIdentifier, const QSh
             QVector<Akonadi2::Preprocessor*>() << new DefaultIndexUpdater<Akonadi2::ApplicationDomain::Folder>);
     auto config = ResourceConfig::getConfiguration(instanceIdentifier);
     mMaildirPath = config.value("path").toString();
+    //Chop a trailing slash if necessary
+    if (mMaildirPath.endsWith(QDir::separator())) {
+        mMaildirPath.chop(1);
+    }
     Trace() << "Started maildir resource for maildir: " << mMaildirPath;
 }
 
diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp
index bef94ba..d279a36 100644
--- a/tests/maildirresourcetest.cpp
+++ b/tests/maildirresourcetest.cpp
@@ -18,8 +18,10 @@ static bool copyRecursively(const QString &srcFilePath,
     if (srcFileInfo.isDir()) {
         QDir targetDir(tgtFilePath);
         targetDir.cdUp();
-        if (!targetDir.mkdir(QFileInfo(tgtFilePath).fileName()))
+        if (!targetDir.mkdir(QFileInfo(srcFilePath).fileName())) {
+            qWarning() << "Failed to create directory " << tgtFilePath;
             return false;
+        }
         QDir sourceDir(srcFilePath);
         QStringList fileNames = sourceDir.entryList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden | QDir::System);
         foreach (const QString &fileName, fileNames) {
@@ -31,8 +33,10 @@ static bool copyRecursively(const QString &srcFilePath,
                 return false;
         }
     } else {
-        if (!QFile::copy(srcFilePath, tgtFilePath))
+        if (!QFile::copy(srcFilePath, tgtFilePath)) {
+            qWarning() << "Failed to copy file " << tgtFilePath;
             return false;
+        }
     }
     return true;
 }
@@ -45,13 +49,13 @@ static bool copyRecursively(const QString &srcFilePath,
 class MaildirResourceTest : public QObject
 {
     Q_OBJECT
+
+    QTemporaryDir tempDir;
 private Q_SLOTS:
     void initTestCase()
     {
-        auto targetPath = QDir::tempPath() + QDir::separator() + "maildirresourcetest" + QDir::separator() + "maildir1";
-        QDir dir(targetPath);
-        dir.removeRecursively();
-
+        QVERIFY(tempDir.isValid());
+        auto targetPath = tempDir.path() + QDir::separator() + "maildir1/";
         copyRecursively(TESTDATAPATH "/maildir1", targetPath);
 
         Akonadi2::Log::setDebugOutputLevel(Akonadi2::Log::Trace);