Merge lp:~mandel/ubuntu-download-manager/use-standard-dirs into lp:ubuntu-download-manager

[Manuel de la Peña]

Remove the XDG implementation and use the standard paths class found in qt.

Remove the XDG implementation and use the standard paths class found in qt.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:132
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/75
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/66

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/75/rebuild

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

nice branch

review: Approve

[Alejandro J. Cura (alecu)]

"simplify" is the word. One of my favorites.

review: Approve

[lp:~mandel/ubuntu-download-manager/use-standard-dirs]

133. By Manuel de la Peña on 2013-09-25

Merged remove-tests-qdebug into use-standard-dirs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/80/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/71

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/80/rebuild

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/use-standard-dirs]

134. By Manuel de la Peña on 2013-09-25

Merged remove-tests-qdebug into use-standard-dirs.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/84/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/84
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/75

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/84/rebuild

review: Approve (continuous-integration)

=== modified file 'libubuntudownloadmanager/apparmor.cpp'
--- libubuntudownloadmanager/apparmor.cpp	2013-09-19 12:17:48 +0000
+++ libubuntudownloadmanager/apparmor.cpp	2013-09-25 16:08:38 +0000
@@ -23,10 +23,11 @@
 #include <unistd.h>
 #include <QDBusConnection>
 #include <QDebug>
+#include <QDir>
 #include <QRegExp>
+#include <QStandardPaths>
 #include "./dbus_proxy.h"
 #include "./uuid_factory.h"
-#include "./xdg_basedir.h"
 #include "./apparmor.h"
 
 /*
@@ -79,9 +80,14 @@
         // as the local path root
         if (getuid() == 0){
             qDebug() << "Running as system bus using /tmp for downloads";
-            return QString("/tmp");
+            return QStandardPaths::writableLocation(
+                QStandardPaths::TempLocation);
         } else {
+            QString dataPath = QStandardPaths::writableLocation(
+                QStandardPaths::DataLocation);
             QStringList pathComponents;
+            pathComponents << dataPath;
+
             if (!appId.isEmpty()) {
                 QStringList appIdInfo = appId.split("_");
                 if (appIdInfo.count() > 0)
@@ -89,9 +95,15 @@
             }
 
             pathComponents << "Downloads";
-            QString localPath = XDGBasedir::saveDataPath(pathComponents);
-            qDebug() << "Local path is" << localPath;
-            return localPath;
+
+            QString path = pathComponents.join(QDir::separator());
+
+            bool wasCreated = QDir().mkpath(path);
+            if (!wasCreated) {
+                qCritical() << "Could not create the data path" << path;
+            }
+            qDebug() << "Local path is" << path;
+            return path;
         }  // not root
     }
 

=== modified file 'libubuntudownloadmanager/downloads_db.cpp'
--- libubuntudownloadmanager/downloads_db.cpp	2013-09-04 10:32:18 +0000
+++ libubuntudownloadmanager/downloads_db.cpp	2013-09-25 16:08:38 +0000
@@ -17,14 +17,15 @@
  */
 
 #include <QDebug>
+#include <QDir>
 #include <QFile>
 #include <QJsonDocument>
+#include <QStandardPaths>
 #include <QStringList>
 #include <QSqlDatabase>
 #include <QSqlQuery>
 #include <QSqlError>
 #include "./hash_algorithm.h"
-#include "./xdg_basedir.h"
 #include "./downloads_db.h"
 
 #define SINGLE_DOWNLOAD_TABLE "CREATE TABLE SingleDownload("\
@@ -107,9 +108,16 @@
     }
 
     void internalInit() {
-        QStringList pathComponents;
-        pathComponents << "download_manager";
-        _dbName = XDGBasedir::saveDataPath(pathComponents) + "/downloads.db";
+
+        QString dataPath = QStandardPaths::writableLocation(
+            QStandardPaths::DataLocation);
+        QString path = dataPath + QDir::separator() + "ubuntu-download-manager";
+
+        bool wasCreated = QDir().mkpath(path);
+        if (!wasCreated) {
+            qCritical() << "Could not create the data path" << path;
+        }
+        _dbName = path + QDir::separator() + "downloads.db";
         _db = QSqlDatabase::addDatabase("QSQLITE");
         _db.setDatabaseName(_dbName);
         qDebug() << "Db file is" << _dbName;
@@ -239,11 +247,13 @@
         query.bindValue(":headers",
             headersToString(download->headers()));
 
-        bool successs = query.exec();
+        bool success = query.exec();
+        if (!success)
+            qDebug() << query.lastError();
 
         _db.close();
 
-        return successs;
+        return success;
     }
 
  private:

=== modified file 'libubuntudownloadmanager/libubuntudownloadmanager.pro'
--- libubuntudownloadmanager/libubuntudownloadmanager.pro	2013-09-09 09:19:11 +0000
+++ libubuntudownloadmanager/libubuntudownloadmanager.pro	2013-09-25 16:08:38 +0000
@@ -30,7 +30,6 @@
     system_network_info.cpp \
     timer.cpp \
     uuid_factory.cpp \
-    xdg_basedir.cpp \
     download_factory.cpp \
     file_manager.cpp \
     download_struct.cpp \
@@ -62,7 +61,6 @@
     system_network_info.h \
     timer.h \
     uuid_factory.h \
-    xdg_basedir.h \
     download_factory.h \
     file_manager.h \
     download_struct.h \

=== modified file 'libubuntudownloadmanager/logger.cpp'
--- libubuntudownloadmanager/logger.cpp	2013-09-23 11:50:04 +0000
+++ libubuntudownloadmanager/logger.cpp	2013-09-25 16:08:38 +0000
@@ -19,9 +19,9 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <QDateTime>
+#include <QDebug>
 #include <QDir>
 #include <QStandardPaths>
-#include "./xdg_basedir.h"
 #include "./logger.h"
 
 
@@ -119,9 +119,16 @@
 
 QString
 Logger::getLogDir() {
-    QStringList pathComponents;
-    pathComponents << "ubuntu-download-manager";
-    return XDGBasedir::saveCachePath(pathComponents);
+    QString cachePath = QStandardPaths::writableLocation(
+        QStandardPaths::CacheLocation);
+    QString path = cachePath + QDir::separator() + "ubuntu-download-manager";
+    qDebug() << "Logging dir is" << path;
+
+    bool wasCreated = QDir().mkpath(path);
+    if (!wasCreated) {
+        qCritical() << "Could not create the logging path" << path;
+    }
+    return path;
 }
 
 void

=== modified file 'libubuntudownloadmanager/single_download.cpp'
--- libubuntudownloadmanager/single_download.cpp	2013-09-25 16:08:38 +0000
+++ libubuntudownloadmanager/single_download.cpp	2013-09-25 16:08:38 +0000
@@ -27,7 +27,6 @@
 #include "./hash_algorithm.h"
 #include "./single_download.h"
 #include "./network_reply.h"
-#include "./xdg_basedir.h"
 
 #define DATA_FILE_NAME "data.download"
 #define METADATA_FILE_NAME "metadata"

=== removed file 'libubuntudownloadmanager/xdg_basedir.cpp'
--- libubuntudownloadmanager/xdg_basedir.cpp	2013-07-25 21:28:12 +0000
+++ libubuntudownloadmanager/xdg_basedir.cpp	1970-01-01 00:00:00 +0000
@@ -1,204 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include <QDebug>
-#include <QDir>
-#include <QFile>
-#include <stdlib.h>
-#include "./xdg_basedir.h"
-
-// definitions of defaults
-#define DEFAULT_CACHE_HOME ".cache"
-#define DEFAULT_CONFIG_PATH "/etc/xdg"
-#define DEFAULT_CONFIG_HOME ".config"
-#define DEFAULT_DATA_PATH "/usr/local/share:/usr/share"
-#define DEFAULT_DATA_HOME ".local/share"
-#define XDG_CACHE_HOME "XDG_CACHE_HOME"
-#define XDG_CONFIG_HOME "XDG_CONFIG_HOME"
-#define XDG_DATA_HOME "XDG_DATA_HOME"
-#define XDG_CONFIG_DIRS "XDG_CONFIG_DIRS"
-#define XDG_DATA_DIRS "XDG_DATA_DIRS"
-
-QString
-XDGBasedir::cacheHome() {
-    QString env_path = QString::fromUtf8(getenv(XDG_CACHE_HOME)).trimmed();
-    if (env_path.isEmpty()) {
-        QString defaultValue = QDir(QDir::homePath()).filePath(
-                DEFAULT_CACHE_HOME);
-        return defaultValue;
-    }
-    return env_path;
-}
-
-QString
-XDGBasedir::configHome() {
-    QString env_path = QString::fromUtf8(getenv(XDG_CONFIG_HOME)).trimmed();
-    if (env_path.isEmpty()) {
-        QString defaultValue = QDir(QDir::homePath()).filePath(
-                DEFAULT_CONFIG_HOME);
-        return defaultValue;
-    }
-    return env_path;
-}
-
-QString
-XDGBasedir::dataHome() {
-    QString env_path = QString::fromUtf8(getenv(XDG_DATA_HOME)).trimmed();
-    if (env_path.isEmpty()) {
-        QString defaultValue = QDir(QDir::homePath()).filePath(
-                DEFAULT_DATA_HOME);
-        return defaultValue;
-    }
-    return env_path;
-}
-
-QList<QString>
-XDGBasedir::configDirs() {
-    QList<QString> result;
-    result.append(XDGBasedir::configHome());
-
-    QString env_path = QString::fromUtf8(getenv(XDG_CONFIG_DIRS)).trimmed();
-    if (env_path.isEmpty()) {
-        return result;
-    }
-
-    QStringList paths = env_path.split(":");
-    result.append(paths);
-
-    return result;
-}
-
-QList<QString>
-XDGBasedir::dataDirs() {
-    QList<QString> result;
-    result.append(XDGBasedir::dataHome());
-
-    QString env_path = QString::fromUtf8(getenv(XDG_DATA_DIRS)).trimmed();
-    if (env_path.isEmpty()) {
-        return result;
-    }
-
-    QStringList paths = env_path.split(":");
-    result.append(paths);
-    return result;
-}
-
-QList<QString>
-XDGBasedir::configPaths(QList<QString> resources) {
-    QList<QString> result;
-    QList<QString> configDirs = XDGBasedir::configDirs();
-    foreach (QString configDir, configDirs) {  // NOLINT(whitespace/parens)
-        QStringList pathComponents;
-        pathComponents.append(configDir);
-        pathComponents.append(resources);
-        QString path = pathComponents.join(QDir::separator());
-        if (QFile::exists(path)) {
-            result.append(path);
-        }
-    }
-
-    return result;
-}
-
-QList<QString>
-XDGBasedir::dataPaths(QList<QString> resources) {
-    QList<QString> result;
-    QList<QString> dataDirs = XDGBasedir::dataDirs();
-    foreach (QString dataDir, dataDirs) {  // NOLINT(whitespace/parens)
-        QStringList pathComponents;
-        pathComponents.append(dataDir);
-        pathComponents.append(resources);
-        QString path = pathComponents.join(QDir::separator());
-        if (QFile::exists(path)) {
-            result.append(path);
-        }
-    }
-    return result;
-}
-
-QString
-XDGBasedir::loadFirstConfig(QList<QString> resource) {
-    QList<QString> configPaths = XDGBasedir::configPaths(resource);
-    return configPaths.at(0);
-}
-
-QString
-XDGBasedir::saveCachePath(QList<QString> resources){
-    QString home = XDGBasedir::cacheHome();
-    QStringList pathComponents;
-    pathComponents.append(home);
-    pathComponents.append(resources);
-    QString path = pathComponents.join(QDir::separator());
-    QFileInfo info = QFileInfo(path);
-    if (!info.exists() || !info.isDir()) {
-        QDir dir(home);
-        QStringList child;
-        child.append(resources);
-        bool created = dir.mkpath(child.join(QDir::separator()));
-        if (!created) {
-            qCritical() << "Could not create path:"
-                << child.join(QDir::separator());
-            return QString("");
-        }
-    }
-    return path;
-}
-
-QString
-XDGBasedir::saveConfigPath(QList<QString> resources) {
-    QString home = XDGBasedir::configHome();
-    QStringList pathComponents;
-    pathComponents.append(home);
-    pathComponents.append(resources);
-    QString path = pathComponents.join(QDir::separator());
-    QFileInfo info = QFileInfo(path);
-    if (!info.exists() || !info.isDir()) {
-        QDir dir(home);
-        QStringList child;
-        child.append(resources);
-        bool created = dir.mkpath(child.join(QDir::separator()));
-        if (!created) {
-            qCritical() << "Could not create path:"
-                << child.join(QDir::separator());
-            return QString("");
-        }
-    }
-    return path;
-}
-
-QString
-XDGBasedir::saveDataPath(QList<QString> resources) {
-    QString home = XDGBasedir::dataHome();
-    QStringList pathComponents;
-    pathComponents.append(home);
-    pathComponents.append(resources);
-    QString path = pathComponents.join(QDir::separator());
-    QFileInfo info = QFileInfo(path);
-    if (!info.exists() || !info.isDir()) {
-        QDir dir(home);
-        QStringList child;
-        child.append(resources);
-        bool created = dir.mkpath(child.join(QDir::separator()));
-        if (!created) {
-            qCritical() << "Could not create path:"
-                << child.join(QDir::separator());
-            return QString("");
-        }
-    }
-    return path;
-}

=== removed file 'libubuntudownloadmanager/xdg_basedir.h'
--- libubuntudownloadmanager/xdg_basedir.h	2013-07-25 21:28:12 +0000
+++ libubuntudownloadmanager/xdg_basedir.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef DOWNLOADER_LIB_XDG_BASEDIR_H
-#define DOWNLOADER_LIB_XDG_BASEDIR_H
-
-#include <QList>
-#include <QObject>
-#include <QString>
-#include <stdio.h>
-#include <string>
-
-class XDGBasedir : public QObject {
-    Q_OBJECT
-
- public:
-    static QString cacheHome();
-    static QString configHome();
-    static QString dataHome();
-    static QList<QString> configDirs();
-    static QList<QString> dataDirs();
-    static QList<QString> configPaths(QList<QString> resource);
-    static QList<QString> dataPaths(QList<QString> resource);
-    static QString loadFirstConfig(QList<QString> resource);
-    static QString saveCachePath(QList<QString> resources);
-    static QString saveConfigPath(QList<QString> resource);
-    static QString saveDataPath(QList<QString> resource);
-
- private:
-    static QString DEFAULT_CACHE_HOME;
-    static QString DEFAULT_CONFIG_HOME;
-    static QString DEFAULT_CONFIG_PATH;
-    static QString DEFAULT_DATA_PATH;
-    static QString DEFAULT_DATA_HOME;
-    static std::string XDG_CACHE_HOME;
-    static std::string XDG_CONFIG_HOME;
-    static std::string XDG_DATA_HOME;
-    static std::string XDG_CONFIG_DIRS;
-    static std::string XDG_DATA_DIRS;
-};
-
-#endif  // DOWNLOADER_LIB_XDG_BASEDIR_H

=== modified file 'ubuntu-download-manager-tests/base_testcase.cpp'
--- ubuntu-download-manager-tests/base_testcase.cpp	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/base_testcase.cpp	2013-09-25 16:08:38 +0000
@@ -16,7 +16,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QDir>
 #include <QtGlobal>
+#include <QStandardPaths>
 #include "./base_testcase.h"
 
 void
@@ -29,11 +31,59 @@
     // do nothing
 }
 
-BaseTestCase::BaseTestCase(QObject *parent)
+BaseTestCase::BaseTestCase(const QString& testName, QObject *parent)
     : QObject(parent) {
+    setObjectName(testName);
+}
+
+QString
+BaseTestCase::testDirectory() {
+    // return the test directory using the standard paths
+    QString dataPath = QStandardPaths::writableLocation(
+        QStandardPaths::DataLocation);
+    QStringList pathComponents;
+    pathComponents << dataPath << objectName();
+    QString path = pathComponents.join(QDir::separator());
+
+    if (!QDir().exists(path))
+        QDir().mkpath(path);
+
+    return path;
+}
+
+bool
+BaseTestCase::removeDir(const QString& dirName) {
+    bool result = true;
+    QDir dir(dirName);
+
+    QFlags<QDir::Filter> filter =  QDir::NoDotAndDotDot | QDir::System
+        | QDir::Hidden  | QDir::AllDirs | QDir::Files;
+    if (dir.exists(dirName)) {
+        foreach(QFileInfo info, dir.entryInfoList(filter, QDir::DirsFirst)) {
+            if (info.isDir()) {
+                result = removeDir(info.absoluteFilePath());
+            } else {
+                result = QFile::remove(info.absoluteFilePath());
+            }
+
+            if (!result) {
+                return result;
+            }
+        }
+        result = dir.rmdir(dirName);
+    }
+
+    return result;
 }
 
 void
 BaseTestCase::init() {
     qInstallMessageHandler(noMessageOutput);
+    QStandardPaths::enableTestMode(true);
+}
+
+void
+BaseTestCase::cleanup() {
+    // remove the test dir if exists
+    removeDir(testDirectory());
 }

=== modified file 'ubuntu-download-manager-tests/base_testcase.h'
--- ubuntu-download-manager-tests/base_testcase.h	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/base_testcase.h	2013-09-25 16:08:38 +0000
@@ -25,12 +25,17 @@
 {
     Q_OBJECT
  public:
-    explicit BaseTestCase(QObject *parent = 0);
+    BaseTestCase(const QString& testName, QObject *parent = 0);
     
+    QString testDirectory();
+
  protected slots:  // NOLINT(whitespace/indent)
 
     virtual void init();
+    virtual void cleanup();
 
+ private:
+    bool removeDir(const QString& dirName);
 };
 
 #endif // BASE_TESTCASE_H

=== modified file 'ubuntu-download-manager-tests/test_download.cpp'
--- ubuntu-download-manager-tests/test_download.cpp	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_download.cpp	2013-09-25 16:08:38 +0000
@@ -17,7 +17,6 @@
  */
 
 #include <QDebug>
-#include <stdlib.h>
 #include <QNetworkRequest>
 #include <QSignalSpy>
 #include <QSslError>
@@ -27,50 +26,16 @@
 #include "./test_download.h"
 
 TestDownload::TestDownload(QObject* parent)
-    : BaseTestCase(parent) {
-}
-
-bool
-TestDownload::removeDir(const QString& dirName) {
-    bool result = true;
-    QDir dir(dirName);
-
-    QFlags<QDir::Filter> filter =  QDir::NoDotAndDotDot | QDir::System
-        | QDir::Hidden  | QDir::AllDirs | QDir::Files;
-    if (dir.exists(dirName)) {
-        foreach(QFileInfo info, dir.entryInfoList(filter, QDir::DirsFirst)) {
-            if (info.isDir()) {
-                result = removeDir(info.absoluteFilePath());
-            } else {
-                result = QFile::remove(info.absoluteFilePath());
-            }
-
-            if (!result) {
-                return result;
-            }
-        }
-        result = dir.rmdir(dirName);
-    }
-
-    return result;
+    : BaseTestCase("TestDownload", parent) {
 }
 
 void
 TestDownload::init() {
     BaseTestCase::init();
-    // set the xdg path so that we have control over it
-    _testDir = QDir("./tests");
-    _testDir.makeAbsolute();
-
-    if (!_testDir.exists()) {
-        _testDir.mkpath(_testDir.absolutePath());
-    }
-
-    setenv("XDG_DATA_HOME",
-        _testDir.absolutePath().toStdString().c_str(), 1);
+
     _id = QUuid::createUuid();
     _isConfined = false;
-    _rootPath = _testDir.absolutePath();
+    _rootPath = testDirectory();
     _path = "random path to dbus";
     _url = QUrl("http://ubuntu.com");
     _algo = "Sha256";
@@ -81,6 +46,8 @@
 
 void
 TestDownload::cleanup() {
+    BaseTestCase::cleanup();
+
     if (_networkInfo)
         delete _networkInfo;
     if (_reqFactory)
@@ -88,9 +55,6 @@
     if (_processFactory)
         delete _processFactory;
 
-    // try to remove the test dir
-    removeDir(_testDir.absolutePath());
-    unsetenv("XDG_DATA_HOME");
 }
 
 void

=== modified file 'ubuntu-download-manager-tests/test_download.h'
--- ubuntu-download-manager-tests/test_download.h	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_download.h	2013-09-25 16:08:38 +0000
@@ -38,7 +38,7 @@
  private slots:  // NOLINT(whitespace/indent)
 
     void init() override;
-    void cleanup();
+    void cleanup() override;
 
     // constructors tests
     void testNoHashConstructor();
@@ -132,10 +132,6 @@
     void testValidHashAlgorithm();
 
  private:
-    bool removeDir(const QString& dirName);
-
- private:
-    QDir _testDir;
     QUuid _id;
     bool _isConfined;
     QString _rootPath;

=== modified file 'ubuntu-download-manager-tests/test_download_daemon.cpp'
--- ubuntu-download-manager-tests/test_download_daemon.cpp	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_download_daemon.cpp	2013-09-25 16:08:38 +0000
@@ -19,7 +19,7 @@
 #include "./test_download_daemon.h"
 
 TestDownloadDaemon::TestDownloadDaemon(QObject *parent)
-    : BaseTestCase(parent) {
+    : BaseTestCase("TestDownloadDaemon", parent) {
 }
 
 void
@@ -37,6 +37,8 @@
 
 void
 TestDownloadDaemon::cleanup() {
+    BaseTestCase::cleanup();
+
     if (_app != NULL)
         delete _app;
     if (_conn != NULL)

=== modified file 'ubuntu-download-manager-tests/test_download_daemon.h'
--- ubuntu-download-manager-tests/test_download_daemon.h	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_download_daemon.h	2013-09-25 16:08:38 +0000
@@ -37,7 +37,7 @@
  private slots:  // NOLINT(whitespace/indent)
 
     void init() override;
-    void cleanup();
+    void cleanup() override;
     void testStart();
     void testStartFailServiceRegister();
     void testStartFailObjectRegister();

=== modified file 'ubuntu-download-manager-tests/test_download_factory.cpp'
--- ubuntu-download-manager-tests/test_download_factory.cpp	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_download_factory.cpp	2013-09-25 16:08:38 +0000
@@ -21,7 +21,7 @@
 #include "./test_download_factory.h"
 
 TestDownloadFactory::TestDownloadFactory(QObject *parent)
-    : BaseTestCase(parent) {
+    : BaseTestCase("TestDownloadFactory", parent) {
 }
 
 void
@@ -40,6 +40,8 @@
 
 void
 TestDownloadFactory::cleanup() {
+    BaseTestCase::cleanup();
+
     if (_downFactory != NULL)
         delete _downFactory;
 }

=== modified file 'ubuntu-download-manager-tests/test_download_factory.h'
--- ubuntu-download-manager-tests/test_download_factory.h	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_download_factory.h	2013-09-25 16:08:38 +0000
@@ -38,7 +38,7 @@
  private slots:  // NOLINT(whitespace/indent)
 
     void init() override;
-    void cleanup();
+    void cleanup() override;
 
     void testCreateDownload();
     void testCreateDownloadWithHash();

=== modified file 'ubuntu-download-manager-tests/test_download_manager.cpp'
--- ubuntu-download-manager-tests/test_download_manager.cpp	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_download_manager.cpp	2013-09-25 16:08:38 +0000
@@ -24,7 +24,7 @@
 #include "./test_download_manager.h"
 
 TestDownloadManager::TestDownloadManager(QObject *parent)
-    : BaseTestCase(parent) {
+    : BaseTestCase("TestDownloadManager", parent) {
 }
 
 void
@@ -51,6 +51,8 @@
 
 void
 TestDownloadManager::cleanup() {
+    BaseTestCase::cleanup();
+
     if (_networkInfo)
         delete _networkInfo;
     if (_q != NULL)

=== modified file 'ubuntu-download-manager-tests/test_download_manager.h'
--- ubuntu-download-manager-tests/test_download_manager.h	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_download_manager.h	2013-09-25 16:08:38 +0000
@@ -43,7 +43,7 @@
  private slots:  // NOLINT(whitespace/indent)
 
     void init() override;
-    void cleanup();
+    void cleanup() override;
 
     // data functions
     void testCreateDownload_data();

=== modified file 'ubuntu-download-manager-tests/test_download_queue.cpp'
--- ubuntu-download-manager-tests/test_download_queue.cpp	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_download_queue.cpp	2013-09-25 16:08:38 +0000
@@ -21,7 +21,7 @@
 #include "./test_download_queue.h"
 
 TestDownloadQueue::TestDownloadQueue(QObject *parent)
-    : BaseTestCase(parent) {
+    : BaseTestCase("TestDownloadQueue", parent) {
 }
 
 void
@@ -49,6 +49,8 @@
 
 void
 TestDownloadQueue::cleanup() {
+    BaseTestCase::cleanup();
+
     if (_q != NULL)
         delete _q;
 

=== modified file 'ubuntu-download-manager-tests/test_download_queue.h'
--- ubuntu-download-manager-tests/test_download_queue.h	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_download_queue.h	2013-09-25 16:08:38 +0000
@@ -38,7 +38,7 @@
  private slots:  // NOLINT(whitespace/indent)
 
     void init() override;
-    void cleanup();
+    void cleanup() override;
 
     void testAddDownload();
     void testStartDownloadWithNoCurrent();

=== modified file 'ubuntu-download-manager-tests/test_downloads_db.cpp'
--- ubuntu-download-manager-tests/test_downloads_db.cpp	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_downloads_db.cpp	2013-09-25 16:08:38 +0000
@@ -38,58 +38,24 @@
     "FROM SingleDownload WHERE uuid=:uuid;"
 
 TestDownloadsDb::TestDownloadsDb(QObject *parent)
-    : BaseTestCase(parent) {
-}
-
-bool
-TestDownloadsDb::removeDir(const QString& dirName) {
-    bool result = true;
-    QDir dir(dirName);
-
-    QFlags<QDir::Filter> filter =  QDir::NoDotAndDotDot | QDir::System
-        | QDir::Hidden  | QDir::AllDirs | QDir::Files;
-    if (dir.exists(dirName)) {
-        foreach(QFileInfo info, dir.entryInfoList(filter, QDir::DirsFirst)) {
-            qDebug() << "Removing" << info.absoluteFilePath();
-            if (info.isDir()) {
-                result = removeDir(info.absoluteFilePath());
-            } else {
-                result = QFile::remove(info.absoluteFilePath());
-            }
-
-            if (!result) {
-                return result;
-            }
-        }
-        result = dir.rmdir(dirName);
-    }
-
-    return result;
+    : BaseTestCase("TestDownloadsDb", parent) {
 }
 
 void
 TestDownloadsDb::init() {
     BaseTestCase::init();
-    _testDir = QDir("./tests");
-    _testDir.makeAbsolute();
-
-    if (!_testDir.exists()) {
-        _testDir.mkpath(_testDir.absolutePath());
-    }
-
-    setenv("XDG_DATA_HOME",
-        _testDir.absolutePath().toStdString().c_str(), 1);
-
     _db = new DownloadsDb();
 }
 
 void
 TestDownloadsDb::cleanup() {
-    // try to remove the test dir
+    BaseTestCase::cleanup();
+    QString dbFile = _db->filename();
+
     if (_db != NULL)
         delete _db;
-    removeDir(_testDir.absolutePath());
-    unsetenv("XDG_DATA_HOME");
+
+    QFile::remove(dbFile);
 }
 
 void

=== modified file 'ubuntu-download-manager-tests/test_downloads_db.h'
--- ubuntu-download-manager-tests/test_downloads_db.h	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_downloads_db.h	2013-09-25 16:08:38 +0000
@@ -33,7 +33,7 @@
  private slots:  // NOLINT(whitespace/indent)
 
     void init() override;
-    void cleanup();
+    void cleanup() override;
 
     void testTableCreations_data();
     void testTableCreations();
@@ -44,10 +44,6 @@
     void testStoreSingleDownloadPresent();
 
  private:
-    bool removeDir(const QString& dirName);
-
- private:
-    QDir _testDir;
     DownloadsDb* _db;
 };
 

=== modified file 'ubuntu-download-manager-tests/test_group_download.cpp'
--- ubuntu-download-manager-tests/test_group_download.cpp	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_group_download.cpp	2013-09-25 16:08:38 +0000
@@ -22,7 +22,7 @@
 #include "./test_group_download.h"
 
 TestGroupDownload::TestGroupDownload(QObject *parent)
-    : BaseTestCase(parent) {
+    : BaseTestCase("TestGroupDownload", parent) {
 }
 
 void
@@ -49,6 +49,8 @@
 
 void
 TestGroupDownload::cleanup() {
+    BaseTestCase::cleanup();
+
     if (_networkInfo != NULL)
         delete _networkInfo;
     if (_nam != NULL)

=== modified file 'ubuntu-download-manager-tests/test_group_download.h'
--- ubuntu-download-manager-tests/test_group_download.h	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_group_download.h	2013-09-25 16:08:38 +0000
@@ -40,7 +40,7 @@
  private slots:  // NOLINT(whitespace/indent)
 
     void init() override;
-    void cleanup();
+    void cleanup() override;
 
     void testCancelNoDownloads();
     void testCancelAllDownloads();

=== modified file 'ubuntu-download-manager-tests/test_network_reply.cpp'
--- ubuntu-download-manager-tests/test_network_reply.cpp	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_network_reply.cpp	2013-09-25 16:08:38 +0000
@@ -22,7 +22,7 @@
 #include "./fake_qnetwork_reply.h"
 
 TestNetworkReply::TestNetworkReply(QObject *parent)
-    : BaseTestCase(parent) {
+    : BaseTestCase("TestNetworkReply", parent) {
 }
 
 void
@@ -34,6 +34,8 @@
 
 void
 TestNetworkReply::cleanup() {
+    BaseTestCase::cleanup();
+
     if (_reply != NULL)
         _reply->deleteLater();
 

=== modified file 'ubuntu-download-manager-tests/test_network_reply.h'
--- ubuntu-download-manager-tests/test_network_reply.h	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_network_reply.h	2013-09-25 16:08:38 +0000
@@ -33,7 +33,7 @@
  private slots:  // NOLINT(whitespace/indent)
 
     void init() override;
-    void cleanup();
+    void cleanup() override;
 
     // data functions used in the tests
     void testDownloadProgressForwarded_data();

=== removed file 'ubuntu-download-manager-tests/test_xdg_basedir.cpp'
--- ubuntu-download-manager-tests/test_xdg_basedir.cpp	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_xdg_basedir.cpp	1970-01-01 00:00:00 +0000
@@ -1,203 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-
-#include <stdlib.h>
-#include <functional>
-#include <QDir>
-#include "./test_xdg_basedir.h"
-
-
-TestXDGBasedir::TestXDGBasedir(QObject *parent)
-    : BaseTestCase(parent) {
-}
-
-void
-TestXDGBasedir::init() {
-    BaseTestCase::init();
-    QList<QString> envVars;
-    envVars << "XDG_CACHE_HOME" << "XDG_CONFIG_HOME" << "XDG_DATA_HOME"
-        << "XDG_CONFIG_DIRS" << "XDG_DATA_DIRS";
-
-    // load all the env data in the has to be later set
-    foreach(QString var, envVars) {
-        char* env_path = getenv(var.toStdString().c_str());
-        if (env_path == NULL) {
-            _envData[var] = "NULL";
-        }
-        _envData[var] = QString(env_path);
-        // clean the data
-        unsetenv(var.toStdString().c_str());
-    }
-}
-
-void
-TestXDGBasedir::cleanup() {
-    // set env data back
-    QList<QString> keys = _envData.keys();
-    foreach(QString key, keys) {
-        QString data = _envData[key];
-        if (data == "NULL") {
-            unsetenv(key.toStdString().c_str());
-        } else {
-            setenv(key.toStdString().c_str(), data.toStdString().c_str(), 1);
-        }
-    }
-}
-
-void
-TestXDGBasedir::testDefault(QString envVar,
-                            std::function<QString(void)> callBack,
-                            QString expected) {
-    unsetenv(envVar.toStdString().c_str());
-    QString result = callBack();
-    QCOMPARE(expected, result);
-}
-
-void
-TestXDGBasedir::testUserSet(QString envVar,
-                            std::function<QString(void)> cb,
-                            QString expected) {
-    setenv(envVar.toStdString().c_str(), expected.toStdString().c_str(), 1);
-    QString result = cb();
-    QCOMPARE(expected, result);
-}
-
-void
-TestXDGBasedir::testCacheHomeDefault() {
-    QString expected = QDir(QDir::homePath()).filePath(".cache");
-    std::function<QString(void)> cb = []() {
-        return XDGBasedir::cacheHome();
-    };
-    testDefault(QString("XDG_CACHE_HOME"), cb, expected);
-}
-
-void
-TestXDGBasedir::testCacheHomeEnv() {
-    QString expected = "/path/to/cache";
-    std::function<QString(void)> cb = []() {
-        return XDGBasedir::cacheHome();
-    };
-    testUserSet(QString("XDG_CACHE_HOME"), cb, expected);
-}
-
-void
-TestXDGBasedir::testConfigHomeDefault() {
-    QString expected = QDir(QDir::homePath()).filePath(".config");
-    std::function<QString(void)> cb = []() {
-        return XDGBasedir::configHome();
-    };
-    testDefault(QString("XDG_CONFIG_HOME"), cb, expected);
-}
-
-void
-TestXDGBasedir::testConfigHomeEnv() {
-    QString expected = "/path/to/config/home";
-    std::function<QString(void)> cb = []() {
-        return XDGBasedir::configHome();
-    };
-    testUserSet(QString("XDG_CONFIG_HOME"), cb, expected);
-}
-
-void
-TestXDGBasedir::testDataHomeDefault() {
-    QString expected = QDir(QDir::homePath()).filePath(".local/share");
-    std::function<QString(void)> cb = []() {
-        return XDGBasedir::dataHome();
-    };
-    testDefault(QString("XDG_DATA_HOME"), cb, expected);
-}
-
-void
-TestXDGBasedir::testDataHomeEnv() {
-    QString expected = "/path/to/data";
-    std::function<QString(void)> cb = []() {
-        return XDGBasedir::dataHome();
-    };
-    testUserSet(QString("XDG_DATA_HOME"), cb, expected);
-}
-
-void
-TestXDGBasedir::testCollectionDefault(QString envVar,
-                                      std::function<QList<QString>()> cb,
-                                      QString expected) {
-    unsetenv(envVar.toStdString().c_str());
-    QList<QString> dirs = cb();
-    QVERIFY(1 == dirs.length());
-    QVERIFY(dirs.contains(expected));
-}
-
-void
-TestXDGBasedir::testCollectionEnv(QString envVar,
-                                  std::function<QList<QString>()> cb,
-                                  QList<QString> expected) {
-    QStringList list = QStringList(expected);
-    QString envData = list.join(":");
-    setenv(envVar.toStdString().c_str(), envData.toStdString().c_str(), 1);
-    QList<QString> dirs = cb();
-    QCOMPARE(dirs.length(), expected.length() + 1);  // add +1 for the default
-    foreach(QString data, expected) {
-        QVERIFY(dirs.contains(data));
-    }
-}
-
-void
-TestXDGBasedir::testConfigDirsDefault() {
-    QString envVar = "XDG_CONFIG_DIRS";
-    std::function<QList<QString>()> cb = []() {
-        return XDGBasedir::configDirs();
-    };
-    QString expected = XDGBasedir::configHome();
-    testCollectionDefault(envVar, cb, expected);
-}
-
-void
-TestXDGBasedir::testConfigEnv() {
-    QString envVar = "XDG_CONFIG_DIRS";
-    std::function<QList<QString>()> cb = []() {
-        return XDGBasedir::configDirs();
-    };
-    QList<QString> expected;
-    expected.append(QString("/path/to/config1"));
-    expected.append(QString("/path/to/config2"));
-    expected.append(QString("/path/to/config3"));
-    testCollectionEnv(envVar, cb, expected);
-}
-
-void
-TestXDGBasedir::testDataDirsDefault() {
-    QString envVar = "XDG_DATA_DIRS";
-    std::function<QList<QString>()> cb = []() {
-        return XDGBasedir::dataDirs();
-    };
-    QString expected = XDGBasedir::dataHome();
-    testCollectionDefault(envVar, cb, expected);
-}
-
-void
-TestXDGBasedir::testDataDirsEnv() {
-    QString envVar = "XDG_DATA_DIRS";
-    std::function<QList<QString>()> cb = []() {
-        return XDGBasedir::dataDirs();
-    };
-    QList<QString> expected;
-    expected.append(QString("/path/to/data1"));
-    expected.append(QString("/path/to/data2"));
-    expected.append(QString("/path/to/data3"));
-    testCollectionEnv(envVar, cb, expected);
-}

=== removed file 'ubuntu-download-manager-tests/test_xdg_basedir.h'
--- ubuntu-download-manager-tests/test_xdg_basedir.h	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/test_xdg_basedir.h	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright 2013 Canonical Ltd.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of version 3 of the GNU Lesser General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef TEST_XDG_BASEDIR_H
-#define TEST_XDG_BASEDIR_H
-
-#include <functional>
-#include <QHash>
-#include <QObject>
-#include "./base_testcase.h"
-#include "./xdg_basedir.h"
-#include "./test_runner.h"
-
-class TestXDGBasedir : public BaseTestCase {
-    Q_OBJECT
-
- public:
-    explicit TestXDGBasedir(QObject *parent = 0);
-
- private slots:  // NOLINT(whitespace/indent)
-
-    void init();
-    void cleanup();
-    void testCacheHomeDefault();
-    void testCacheHomeEnv();
-    void testConfigHomeDefault();
-    void testConfigHomeEnv();
-    void testDataHomeDefault();
-    void testDataHomeEnv();
-    void testConfigDirsDefault();
-    void testConfigEnv();
-    void testDataDirsDefault();
-    void testDataDirsEnv();
-
- private:
-    void testDefault(QString envVar,
-                     std::function<QString(void)> callBack,
-                     QString expected);
-    void testUserSet(QString envVar,
-                     std::function<QString(void)> cb,
-                     QString expected);
-    void testCollectionDefault(QString envVar,
-                               std::function<QList<QString>()> cb,
-                               QString expected);
-    void testCollectionEnv(QString envVar,
-                           std::function<QList<QString>()> cb,
-                           QList<QString> expected);
-    QHash<QString, QString> _envData;
-};
-
-DECLARE_TEST(TestXDGBasedir)
-
-#endif  // TEST_XDG_BASEDIR_H

=== modified file 'ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro'
--- ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-09-25 16:08:38 +0000
+++ ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-09-25 16:08:38 +0000
@@ -26,7 +26,6 @@
     test_download_manager.cpp \
     test_download_queue.cpp \
     test_network_reply.cpp \
-    test_xdg_basedir.cpp \
     fake_download_queue.cpp \
     fake_uuid_factory.cpp \
     fake_system_network_info.cpp \
@@ -56,7 +55,6 @@
     test_download_queue.h \
     test_network_reply.h \
     test_runner.h \
-    test_xdg_basedir.h \
     fake_download_queue.h \
     fake_uuid_factory.h \
     fake_system_network_info.h \