Fix delete temporary repo

core/autotests/alarm/importalarmjobinterfacetest.cpp

@@ -52,6 +52,7 @@ void ImportAlarmJobInterfaceTest::importAlarmConfig()
     file->setExcludePath(Utils::alarmPath());
     ImportAlarmJobInterfaceTestImpl *impl = new ImportAlarmJobInterfaceTestImpl(this, options, file->archiveStorage(), 1);
     impl->setPathConfig(file->pathConfig());
+    impl->setExtractPath(file->extractPath());
     file->setAbstractImportExportJob(impl);
     file->setLoggingFilePath(impl->loggingFilePath());
     file->start();

core/autotests/alarm/importalarmjobinterfacetestimpl.cpp

@@ -32,7 +32,7 @@ ImportAlarmJobInterfaceTestImpl::ImportAlarmJobInterfaceTestImpl(QObject *parent
 ImportAlarmJobInterfaceTestImpl::~ImportAlarmJobInterfaceTestImpl()
 {
     //Clean up temp repo
-    QVERIFY(QDir(QDir::tempPath() + QLatin1Char('/') + Utils::storeAlarm()).removeRecursively());
+    QVERIFY(QDir(extractPath()).removeRecursively());
 }
 
 Akonadi::Collection::Id ImportAlarmJobInterfaceTestImpl::convertFolderPathToCollectionId(const QString &path)

core/autotests/calendar/importcalendarjobinterfacetest.cpp

@@ -53,6 +53,7 @@ void ImportCalendarJobInterfaceTest::importCalendar()
     file->setExcludePath(Utils::calendarPath());
     ImportCalendarJobInterfaceTestImpl *impl = new ImportCalendarJobInterfaceTestImpl(this, options, file->archiveStorage(), 1);
     impl->setPathConfig(file->pathConfig());
+    impl->setExtractPath(file->extractPath());
     file->setAbstractImportExportJob(impl);
     file->setLoggingFilePath(impl->loggingFilePath());
     file->start();

core/autotests/calendar/importcalendarjobinterfacetestimpl.cpp

@@ -30,7 +30,7 @@ ImportCalendarJobInterfaceTestImpl::ImportCalendarJobInterfaceTestImpl(QObject *
 ImportCalendarJobInterfaceTestImpl::~ImportCalendarJobInterfaceTestImpl()
 {
     //Clean up temp repo
-    QVERIFY(QDir(QDir::tempPath() + QLatin1Char('/') + Utils::storeCalendar()).removeRecursively());
+    QVERIFY(QDir(extractPath()).removeRecursively());
 }
 
 Akonadi::Collection::Id ImportCalendarJobInterfaceTestImpl::convertFolderPathToCollectionId(const QString &path)

core/autotests/mail/importmailjobinterfacetestimpl.cpp

@@ -34,7 +34,6 @@ ImportMailJobInterfaceTestImpl::ImportMailJobInterfaceTestImpl(QObject *parent,
 
 ImportMailJobInterfaceTestImpl::~ImportMailJobInterfaceTestImpl()
 {
-    //Clean up temp repo. FIXME !
     QVERIFY(QDir(extractPath()).removeRecursively());
 }