Merge branch 'Applications/15.08'

[dolphin.git] / src / tests / testdir.cpp

diff --git a/src/tests/testdir.cpp b/src/tests/testdir.cpp
index 5e961d2abecd1858c9b362b5750eb9b7fd24392d..b84b344b77f5c9d9833d6e8570891afbc8565156 100644 (file)
--- a/src/tests/testdir.cpp
+++ b/src/tests/testdir.cpp
@@ -27,7 +27,8 @@
 #include <sys/utime.h>
 #endif
 
-TestDir::TestDir()
+TestDir::TestDir(const QString& directoryPrefix) :
+    QTemporaryDir(directoryPrefix)
 {
 }
 
@@ -35,9 +36,9 @@ TestDir::~TestDir()
 {
 }
 
-KUrl TestDir::url() const
+QUrl TestDir::url() const
 {
-    return KUrl(name());
+    return QUrl::fromLocalFile(path());
 }
 
 /** The following function is taken from kdelibs/kio/tests/kiotesthelper.h, copyright (C) 2006 by David Faure */
@@ -84,7 +85,7 @@ void TestDir::createDir(const QString& path, const QDateTime& time)
 {
     QString absolutePath = path;
     makePathAbsoluteAndCreateParents(absolutePath);
-    QDir(name()).mkdir(absolutePath);
+    QDir(TestDir::path()).mkdir(absolutePath);
 
     if (time.isValid()) {
         setTimeStamp(absolutePath, time);
@@ -93,11 +94,28 @@ void TestDir::createDir(const QString& path, const QDateTime& time)
     Q_ASSERT(QFile::exists(absolutePath));
 }
 
+void TestDir::removeFiles(const QStringList& files)
+{
+    foreach (const QString& path, files) {
+        removeFile(path);
+    }
+}
+
+void TestDir::removeFile(const QString& path)
+{
+    QString absolutePath = path;
+    QFileInfo fileInfo(absolutePath);
+    if (!fileInfo.isAbsolute()) {
+        absolutePath = TestDir::path() + QLatin1Char('/') + path;
+    }
+    QFile::remove(absolutePath);
+}
+
 void TestDir::makePathAbsoluteAndCreateParents(QString& path)
 {
     QFileInfo fileInfo(path);
     if (!fileInfo.isAbsolute()) {
-        path = name() + path;
+        path = TestDir::path() + QLatin1Char('/') + path;
         fileInfo.setFile(path);
     }