From a36683d3d78910cfe51d827e35007eb21e188945 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Thu, 31 Dec 2015 10:23:36 +0100
Subject: Reset the maildir after every test

---
 tests/maildirresourcetest.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/maildirresourcetest.cpp b/tests/maildirresourcetest.cpp
index b0bc30b..741706c 100644
--- a/tests/maildirresourcetest.cpp
+++ b/tests/maildirresourcetest.cpp
@@ -51,12 +51,11 @@ class MaildirResourceTest : public QObject
     Q_OBJECT
 
     QTemporaryDir tempDir;
+    QString targetPath;
 private Q_SLOTS:
     void initTestCase()
     {
-        QVERIFY(tempDir.isValid());
-        auto targetPath = tempDir.path() + "/maildir1/";
-        copyRecursively(TESTDATAPATH "/maildir1", targetPath);
+        targetPath = tempDir.path() + "/maildir1/";
 
         Akonadi2::Log::setDebugOutputLevel(Akonadi2::Log::Trace);
         MaildirResource::removeFromDisk("org.kde.maildir.instance1");
@@ -71,7 +70,8 @@ private Q_SLOTS:
     {
         Akonadi2::Store::shutdown(QByteArray("org.kde.maildir.instance1")).exec().waitForFinished();
         MaildirResource::removeFromDisk("org.kde.maildir.instance1");
-        Akonadi2::Store::start(QByteArray("org.kde.maildir.instance1")).exec().waitForFinished();
+        QDir dir(targetPath);
+        dir.removeRecursively();
     }
 
     void init()
@@ -79,6 +79,8 @@ private Q_SLOTS:
         qDebug();
         qDebug() << "-----------------------------------------";
         qDebug();
+        copyRecursively(TESTDATAPATH "/maildir1", targetPath);
+        Akonadi2::Store::start(QByteArray("org.kde.maildir.instance1")).exec().waitForFinished();
     }
 
     void testListFolders()
-- 
cgit v1.2.3