Merge lp:~marcustomlinson/keeper/client-lib into lp:keeper

[Marcus Tomlinson]

Add keeper-client lib

[lp:~marcustomlinson/keeper/client-lib]

85. By Marcus Tomlinson on 2016-08-11

Missing QVariant include

[Charles Kerr (charlesk)]

LGTM

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-09 04:39:25 +0000
+++ CMakeLists.txt	2016-08-11 00:26:19 +0000
@@ -1,3 +1,7 @@
+# Version
+set(KEEPER_MAJOR "0")
+set(KEEPER_MINOR "0")
+set(KEEPER_MICRO "1")
 
 # Default install location. Must be set here, before setting the project.
 if(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -5,8 +9,8 @@
   set(LOCAL_INSTALL "ON")
 endif()
 
-project(keeper C CXX)
 cmake_minimum_required(VERSION 3.0.2)
+project(keeper VERSION ${KEEPER_MAJOR}.${KEEPER_MINOR}.${KEEPER_MICRO} LANGUAGES C CXX)
 
 ##
 ##  Build Type

=== modified file 'debian/control'
--- debian/control	2016-07-28 13:52:30 +0000
+++ debian/control	2016-08-11 00:26:19 +0000
@@ -55,3 +55,23 @@
          systemd | systemd-shim,
 Description: Backup Tool
  A backup/restore utility for Ubuntu (client application)
+
+Package: libkeeper-client
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+Description: Client library for Keeper
+ Runtime support for Keeper clients.
+
+Package: keeper-client-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: libkeeper-client (= ${binary:Version}),
+         ${misc:Depends},
+Description: Header files for the Keeper client libraries
+ Development headers for Keeper clients.
+

=== added file 'debian/keeper-client-dev.install'
--- debian/keeper-client-dev.install	1970-01-01 00:00:00 +0000
+++ debian/keeper-client-dev.install	2016-08-11 00:26:19 +0000
@@ -0,0 +1,2 @@
+usr/include/keeper
+usr/lib/*/pkgconfig/keeper-client.pc

=== added file 'debian/libkeeper-client.install'
--- debian/libkeeper-client.install	1970-01-01 00:00:00 +0000
+++ debian/libkeeper-client.install	2016-08-11 00:26:19 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libkeeper-client-*.so

=== added directory 'include/client'
=== added file 'include/client/client.h'
--- include/client/client.h	1970-01-01 00:00:00 +0000
+++ include/client/client.h	2016-08-11 00:26:19 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Marcus Tomlinson <[e-mail]>
+ */
+
+#pragma once
+
+#define KEEPER_EXPORT __attribute__((visibility("default")))
+
+#include <QObject>
+#include <QScopedPointer>
+#include <QVariant>
+
+class KeeperClientPrivate;
+
+class KEEPER_EXPORT KeeperClient final : public QObject
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(KeeperClient)
+
+public:
+    explicit KeeperClient(QObject* parent = nullptr);
+    ~KeeperClient();
+
+    QMap<QString, QVariantMap> GetBackupChoices() const;
+    void StartBackup(QStringList const& uuids) const;
+
+    QMap<QString, QVariantMap> GetState() const;
+
+Q_SIGNALS:
+
+private:
+    QScopedPointer<KeeperClientPrivate> const d_ptr;
+};

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-07-28 13:52:30 +0000
+++ src/CMakeLists.txt	2016-08-11 00:26:19 +0000
@@ -4,6 +4,7 @@
 )
 
 add_subdirectory(cli)
+add_subdirectory(client)
 add_subdirectory(helper)
 add_subdirectory(qdbus-stubs)
 add_subdirectory(service)

=== modified file 'src/cli/main.cpp'
--- src/cli/main.cpp	2016-08-10 05:41:26 +0000
+++ src/cli/main.cpp	2016-08-11 00:26:19 +0000
@@ -51,7 +51,7 @@
         qDebug() << QDBusConnection::sessionBus().baseService();
     }
 
-    qDebug() << "Argc = " << argc;
+    qDebug() << "Argc =" << argc;
     if (argc == 2 && QString("--use-uuids") == argv[1])
     {
         QScopedPointer<DBusInterfaceKeeperUser> user_iface(new DBusInterfaceKeeperUser(
@@ -62,7 +62,7 @@
         QDBusReply<QVariantDictMap> choices = user_iface->call("GetBackupChoices");
         if (!choices.isValid())
         {
-            qWarning() << "Error getting backup choices: " << choices.error().message();
+            qWarning() << "Error getting backup choices:" << choices.error().message();
         }
 
         QStringList uuids;
@@ -76,7 +76,7 @@
                 if (iter_values.value().toString() == "folder")
                 {
                     // got it
-                    qDebug() << "Adding uuid " << iter.key() << " with type: " << "folder";
+                    qDebug() << "Adding uuid" << iter.key() << "with type:" << "folder";
                     uuids << iter.key();
                 }
             }
@@ -86,7 +86,7 @@
 
         if (!backup_reply.isValid())
         {
-            qWarning() << "Error starting backup: " << backup_reply.error().message();
+            qWarning() << "Error starting backup:" << backup_reply.error().message();
         }
     }
     else

=== added directory 'src/client'
=== added file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/client/CMakeLists.txt	2016-08-11 00:26:19 +0000
@@ -0,0 +1,54 @@
+set(
+  CLIENT_LIB
+  keeper-client-${KEEPER_MAJOR}.${KEEPER_MINOR}
+)
+
+set(
+  CLIENT_HEADERS
+  ${CMAKE_SOURCE_DIR}/include/client/client.h
+)
+
+add_library(
+  ${CLIENT_LIB} SHARED
+  client.cpp
+  ${CLIENT_HEADERS}
+)
+
+set_target_properties(
+  ${CLIENT_LIB}
+  PROPERTIES
+  AUTOMOC TRUE
+)
+
+target_link_libraries(
+  ${CLIENT_LIB}
+  qdbus-stubs
+  Qt5::Core
+  Qt5::DBus
+)
+
+set(
+  COVERAGE_REPORT_TARGETS
+  ${COVERAGE_REPORT_TARGETS}
+  ${CLIENT_LIB}
+  PARENT_SCOPE
+)
+
+install(
+  FILES ${CLIENT_HEADERS}
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/keeper
+)
+
+install(
+  TARGETS ${CLIENT_LIB}
+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+configure_file(
+    keeper-client.pc.in
+    keeper-client.pc
+)
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/keeper-client.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+)

=== added file 'src/client/client.cpp'
--- src/client/client.cpp	1970-01-01 00:00:00 +0000
+++ src/client/client.cpp	2016-08-11 00:26:19 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2016 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Marcus Tomlinson <[e-mail]>
+ */
+
+#include <client/client.h>
+
+#include <qdbus-stubs/keeper_user_interface.h>
+
+class KeeperClientPrivate final
+{
+    Q_DISABLE_COPY(KeeperClientPrivate)
+
+public:
+    KeeperClientPrivate()
+        : user_iface(new DBusInterfaceKeeperUser(
+                         DBusTypes::KEEPER_SERVICE,
+                         DBusTypes::KEEPER_USER_PATH,
+                         QDBusConnection::sessionBus()
+                         ))
+    {
+    }
+
+    ~KeeperClientPrivate() = default;
+
+    QScopedPointer<DBusInterfaceKeeperUser> user_iface;
+};
+
+KeeperClient::KeeperClient(QObject* parent)
+    : QObject{parent}
+    , d_ptr(new KeeperClientPrivate())
+{
+    DBusTypes::registerMetaTypes();
+}
+
+KeeperClient::~KeeperClient() = default;
+
+QMap<QString, QVariantMap> KeeperClient::GetBackupChoices() const
+{
+    QDBusReply<QMap<QString, QVariantMap>> choices = d_ptr->user_iface->call("GetBackupChoices");
+
+    if (!choices.isValid())
+    {
+        qWarning() << "Error getting backup choices:" << choices.error().message();
+        return QMap<QString, QVariantMap>();
+    }
+
+    return choices.value();
+}
+
+void KeeperClient::StartBackup(const QStringList& uuids) const
+{
+    QDBusReply<void> backup_reply = d_ptr->user_iface->call("StartBackup", uuids);
+
+    if (!backup_reply.isValid())
+    {
+        qWarning() << "Error starting backup:" << backup_reply.error().message();
+    }
+}
+
+QMap<QString, QVariantMap> KeeperClient::GetState() const
+{
+    return d_ptr->user_iface->state();
+}

=== added file 'src/client/keeper-client.pc.in'
--- src/client/keeper-client.pc.in	1970-01-01 00:00:00 +0000
+++ src/client/keeper-client.pc.in	2016-08-11 00:26:19 +0000
@@ -0,0 +1,6 @@
+Name: keeper-client
+Description: A Qt client library for Keeper
+Version: @PROJECT_VERSION@
+Requires.private: Qt5Core Qt5DBus
+Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/keeper
+Libs: @CMAKE_INSTALL_FULL_LIBDIR@/libkeeper-client-@KEEPER_MAJOR@.@KEEPER_MINOR@.so

=== modified file 'src/helper/backup-helper.cpp'
--- src/helper/backup-helper.cpp	2016-08-09 03:58:59 +0000
+++ src/helper/backup-helper.cpp	2016-08-11 00:26:19 +0000
@@ -195,7 +195,7 @@
             else {
                 if (n < 0) {
                     write_error_ = true;
-                    qWarning() << "Write error: " << storage_framework_socket_->errorString();
+                    qWarning() << "Write error:" << storage_framework_socket_->errorString();
                     stop();
                 }
                 break;
@@ -263,11 +263,11 @@
 
     void ual_start(QStringList const& url_strings)
     {
-        qDebug() << "Starting helper for app: " << appid_;
+        qDebug() << "Starting helper for app:" << appid_;
 
         std::vector<ubuntu::app_launch::Helper::URL> urls;
         for(const auto& url_string : url_strings) {
-            qDebug() << "url " << url_string;
+            qDebug() << "url" << url_string;
             urls.push_back(ubuntu::app_launch::Helper::URL::from_raw(url_string.toStdString()));
         }
 
@@ -281,7 +281,7 @@
 
     void ual_stop()
     {
-        qDebug() << "Stopping helper for app: " << appid_;
+        qDebug() << "Stopping helper for app:" << appid_;
         auto backupType = ubuntu::app_launch::Helper::Type::from_raw(HELPER_TYPE);
 
         auto appid = ubuntu::app_launch::AppID::parse(appid_.toStdString());
@@ -298,14 +298,14 @@
 
     static void on_helper_started(const char* appid, const char* /*instance*/, const char* /*type*/, void* vself)
     {
-        qDebug() << "HELPER STARTED +++++++++++++++++++++++++++++++++++++ " << appid;
+        qDebug() << "HELPER STARTED +++++++++++++++++++++++++++++++++++++" << appid;
         auto self = static_cast<BackupHelperPrivate*>(vself);
         self->q_ptr->set_state(Helper::State::STARTED);
     }
 
     static void on_helper_stopped(const char* appid, const char* /*instance*/, const char* /*type*/, void* vself)
     {
-        qDebug() << "HELPER STOPPED +++++++++++++++++++++++++++++++++++++ " << appid;
+        qDebug() << "HELPER STOPPED +++++++++++++++++++++++++++++++++++++" << appid;
         auto self = static_cast<BackupHelperPrivate*>(vself);
         self->check_for_done();
         self->stop_inactivity_timer();

=== modified file 'src/helper/data-dir-registry.cpp'
--- src/helper/data-dir-registry.cpp	2016-08-09 04:39:25 +0000
+++ src/helper/data-dir-registry.cpp	2016-08-11 00:26:19 +0000
@@ -101,9 +101,9 @@
         }
 
         for (auto const& url : urls_in)
-            qDebug() << "in: " << url;
+            qDebug() << "in:" << url;
         for (auto const& url : urls)
-            qDebug() << "out: " << url;
+            qDebug() << "out:" << url;
 
         return urls;
     }

=== modified file 'src/service/backup-choices.cpp'
--- src/service/backup-choices.cpp	2016-08-09 01:07:04 +0000
+++ src/service/backup-choices.cpp	2016-08-11 00:26:19 +0000
@@ -79,7 +79,7 @@
     }
     if (error != nullptr)
     {
-        qCritical() << "Error getting click manifests: " << error->message;
+        qCritical() << "Error getting click manifests:" << error->message;
         g_clear_error(&error);
     }
 

=== modified file 'src/service/keeper-helper.cpp'
--- src/service/keeper-helper.cpp	2016-07-12 21:18:30 +0000
+++ src/service/keeper-helper.cpp	2016-08-11 00:26:19 +0000
@@ -50,5 +50,5 @@
 
 void KeeperHelper::UpdateStatus(const QString &app_id, const QString &status, double percentage)
 {
-    qDebug() << "KeeperHelper::UpdateStatus( " << app_id << ", " << status << ", " << percentage << ")";
+    qDebug() << "KeeperHelper::UpdateStatus(" << app_id << "," << status << "," << percentage << ")";
 }

=== modified file 'src/service/keeper.cpp'
--- src/service/keeper.cpp	2016-08-10 07:34:02 +0000
+++ src/service/keeper.cpp	2016-08-11 00:26:19 +0000
@@ -81,7 +81,7 @@
 
     void start_task(QString const &uuid)
     {
-        qDebug() << "Starting task: " << uuid;
+        qDebug() << "Starting task:" << uuid;
         auto metadata = get_uuid_metadata(cached_backup_choices_, uuid);
         if (metadata.uuid() == uuid)
         {
@@ -91,7 +91,7 @@
             if (urls.isEmpty())
             {
                 // TODO Report error to user
-                qWarning() << "ERROR: uuid: " << uuid << " has no url";
+                qWarning() << "ERROR: uuid:" << uuid << "has no url";
                 return;
             }
 

=== modified file 'src/storage-framework/storage_framework_client.cpp'
--- src/storage-framework/storage_framework_client.cpp	2016-08-10 06:44:47 +0000
+++ src/storage-framework/storage_framework_client.cpp	2016-08-11 00:26:19 +0000
@@ -73,7 +73,7 @@
     }
     catch (std::exception & e)
     {
-        qDebug() << "ERROR: StorageFrameworkClient::getNewFileForBackup(): " << e.what();
+        qDebug() << "ERROR: StorageFrameworkClient::getNewFileForBackup():" << e.what();
     }
 }
 
@@ -103,14 +103,14 @@
     }
     catch (std::exception & e)
     {
-        qDebug() << "ERROR: StorageFrameworkClient::closeUploader(): " << e.what();
+        qDebug() << "ERROR: StorageFrameworkClient::closeUploader():" << e.what();
     }
 }
 
 void StorageFrameworkClient::onUploaderClosed()
 {
     auto file = uploader_closed_watcher_.result();
-    qDebug() << "Uploader for file " << file->name() << " was closed";
+    qDebug() << "Uploader for file" << file->name() << "was closed";
     qDebug() << "Uploader was closed";
     uploader_->socket()->disconnectFromServer();
     uploader_.reset();
@@ -133,7 +133,7 @@
     }
     try
     {
-        qDebug() << "Retrieving parents of file " << file->name();
+        qDebug() << "Retrieving parents of file" << file->name();
 
         // block here until we get a response
         QVector<std::shared_ptr<Folder>> parents = file->parents().result();
@@ -143,7 +143,7 @@
 
         if (file->name().length() < suffix.length() + 1)
         {
-            qWarning() << "The file " << file->name() << " has an invalid name, and could not remove the suffix " << TMP_SUFFIX << " from it";
+            qWarning() << "The file" << file->name() << "has an invalid name, and could not remove the suffix" << TMP_SUFFIX << "from it";
             return false;
         }
         newName.remove((file->name().length() - suffix.length()), suffix.length());
@@ -152,12 +152,12 @@
         for (const auto& parent : parents)
         {
             auto item = file->move(parent, newName).result();
-            qDebug() << "File name changed to " << item->name();
+            qDebug() << "File name changed to" << item->name();
         }
     }
     catch (std::exception & e)
     {
-        qDebug() << "ERROR: StorageFrameworkClient::removeTmpSuffix(): " << e.what();
+        qDebug() << "ERROR: StorageFrameworkClient::removeTmpSuffix():" << e.what();
         return false;
     }
     return true;
@@ -172,7 +172,7 @@
     }
     catch (std::exception & e)
     {
-        qDebug() << "ERROR: StorageFrameworkClient::deleteFile(): " << e.what();
+        qDebug() << "ERROR: StorageFrameworkClient::deleteFile():" << e.what();
         return false;
     }
     return true;

=== modified file 'src/tar/main.cpp'
--- src/tar/main.cpp	2016-08-03 18:58:01 +0000
+++ src/tar/main.cpp	2016-08-11 00:26:19 +0000
@@ -107,14 +107,14 @@
 
     // gotta have the bus path
     if (bus_path.isEmpty()) {
-        std::cerr << "Missing required argument: --bus-path " << std::endl;
+        std::cerr << "Missing required argument: --bus-path" << std::endl;
         parser.showHelp(EXIT_FAILURE);
     }
 
     // gotta have files
     const auto filenames = get_filenames_from_file(stdin);
     for (const auto& filename : filenames)
-        qDebug() << "filename: " << filename;
+        qDebug() << "filename:" << filename;
     if (filenames.empty()) {
         std::cerr << "no files listed" << std::endl;
         parser.showHelp(EXIT_FAILURE);

=== modified file 'tests/fakes/fake-backup-helper.cpp'
--- tests/fakes/fake-backup-helper.cpp	2016-08-05 14:10:32 +0000
+++ tests/fakes/fake-backup-helper.cpp	2016-08-11 00:26:19 +0000
@@ -51,7 +51,7 @@
     const auto object_path = QString::fromUtf8(DBusTypes::KEEPER_HELPER_PATH);
     DBusInterfaceKeeperHelper helper_iface (DBusTypes::KEEPER_SERVICE, object_path, conn);
 
-    qDebug() << "Is valid: " << helper_iface.isValid();
+    qDebug() << "Is valid:" << helper_iface.isValid();
 
     auto blob_size = blob.size();
 #ifdef COMPILE_WITH_FAILURE

=== modified file 'tests/integration/helpers/helpers-test-failure.cpp'
--- tests/integration/helpers/helpers-test-failure.cpp	2016-08-09 03:58:59 +0000
+++ tests/integration/helpers/helpers-test-failure.cpp	2016-08-11 00:26:19 +0000
@@ -55,7 +55,7 @@
 
     auto user_dir = qgetenv(user_option.toLatin1().data());
     ASSERT_FALSE(user_dir.isEmpty());
-    qDebug() << "USER DIR: " << user_dir;
+    qDebug() << "USER DIR:" << user_dir;
 
     // fill something in the music dir
     ASSERT_TRUE(FileUtils::fillTemporaryDirectory(user_dir, qrand() % 1000));
@@ -63,7 +63,7 @@
     // search for the user folder uuid
     auto user_folder_uuid = getUUIDforXdgFolderPath(user_dir, choices.value());
     ASSERT_FALSE(user_folder_uuid.isEmpty());
-    qDebug() << "User folder UUID is: " << user_folder_uuid;
+    qDebug() << "User folder UUID is:" << user_folder_uuid;
 
     // Now we know the music folder uuid, let's start the backup for it.
     QDBusReply<void> backup_reply = user_iface->call("StartBackup", QStringList{user_folder_uuid});

=== modified file 'tests/integration/helpers/helpers-test.cc'
--- tests/integration/helpers/helpers-test.cc	2016-08-09 03:58:59 +0000
+++ tests/integration/helpers/helpers-test.cc	2016-08-11 00:26:19 +0000
@@ -240,7 +240,7 @@
 
     auto user_dir = qgetenv(user_option.toLatin1().data());
     ASSERT_FALSE(user_dir.isEmpty());
-    qDebug() << "USER DIR: " << user_dir;
+    qDebug() << "USER DIR:" << user_dir;
 
     // fill something in the music dir
     ASSERT_TRUE(FileUtils::fillTemporaryDirectory(user_dir, qrand() % 1000));
@@ -248,13 +248,13 @@
     // search for the user folder uuid
     auto user_folder_uuid = getUUIDforXdgFolderPath(user_dir, choices.value());
     ASSERT_FALSE(user_folder_uuid.isEmpty());
-    qDebug() << "User folder UUID is: " << user_folder_uuid;
+    qDebug() << "User folder UUID is:" << user_folder_uuid;
 
     QString user_option_2 = "XDG_VIDEOS_DIR";
 
     auto user_dir_2 = qgetenv(user_option_2.toLatin1().data());
     ASSERT_FALSE(user_dir_2.isEmpty());
-    qDebug() << "USER DIR 2: " << user_dir_2;
+    qDebug() << "USER DIR 2:" << user_dir_2;
 
     // fill something in the music dir
     ASSERT_TRUE(FileUtils::fillTemporaryDirectory(user_dir_2, qrand() % 1000));
@@ -262,7 +262,7 @@
     // search for the user folder uuid
     auto user_folder_uuid_2 = getUUIDforXdgFolderPath(user_dir_2, choices.value());
     ASSERT_FALSE(user_folder_uuid_2.isEmpty());
-    qDebug() << "User folder 2 UUID is: " << user_folder_uuid_2;
+    qDebug() << "User folder 2 UUID is:" << user_folder_uuid_2;
 
     // Now we know the music folder uuid, let's start the backup for it.
     QDBusReply<void> backup_reply = user_iface->call("StartBackup", QStringList{user_folder_uuid, user_folder_uuid_2});

=== modified file 'tests/integration/helpers/test-helpers-base.cpp'
--- tests/integration/helpers/test-helpers-base.cpp	2016-08-10 07:44:55 +0000
+++ tests/integration/helpers/test-helpers-base.cpp	2016-08-11 00:26:19 +0000
@@ -88,7 +88,7 @@
     g_setenv("XDG_CACHE_HOME", CMAKE_SOURCE_DIR "/libertine-data", TRUE);
     g_setenv("XDG_DATA_HOME", xdg_data_home_dir.path().toLatin1().data(), TRUE);
 
-    qDebug() << "XDG_DATA_HOME ON SETUP is: " << xdg_data_home_dir.path();
+    qDebug() << "XDG_DATA_HOME ON SETUP is:" << xdg_data_home_dir.path();
 
     service = dbus_test_service_new(NULL);
 
@@ -308,22 +308,22 @@
 {
     QTemporaryDir tempDir;
 
-    qDebug() << "Comparing tar content for dir: " << sourceDir << " with tar: " << tarPath;
+    qDebug() << "Comparing tar content for dir:" << sourceDir << "with tar:" << tarPath;
 
     QFileInfo checkFile(tarPath);
     if (!checkFile.exists())
     {
-        qWarning() << "File: " << tarPath << " does not exist";
+        qWarning() << "File:" << tarPath << "does not exist";
         return false;
     }
     if (!checkFile.isFile())
     {
-        qWarning() << "Item: " << tarPath << " is not a file";
+        qWarning() << "Item:" << tarPath << "is not a file";
         return false;
     }
     if (!tempDir.isValid())
     {
-        qWarning() << "Temporary directory: " << tempDir.path() << " is not valid";
+        qWarning() << "Temporary directory:" << tempDir.path() << "is not valid";
         return false;
     }
 
@@ -413,7 +413,7 @@
     QFile storage_framework_file(lastFile);
     if(!storage_framework_file.open(QFile::ReadOnly))
     {
-        qWarning() << "ERROR: opening file: " << lastFile;
+        qWarning() << "ERROR: opening file:" << lastFile;
         return false;
     }
 
@@ -451,7 +451,7 @@
             {
                 helper_mark.remove();
                 timer.restart();
-                qDebug() << "HELPER FINISHED, WAITING FOR " << times_to_wait << " MORE";
+                qDebug() << "HELPER FINISHED, WAITING FOR" << times_to_wait << "MORE";
             }
             else
             {

=== modified file 'tests/unit/tar/tar-creator-libarchive-failure-test.cpp'
--- tests/unit/tar/tar-creator-libarchive-failure-test.cpp	2016-08-04 18:28:25 +0000
+++ tests/unit/tar/tar-creator-libarchive-failure-test.cpp	2016-08-11 00:26:19 +0000
@@ -179,5 +179,5 @@
 
     EXPECT_TRUE(error_string.contains(QString::fromUtf8(FATAL_ERROR_MESSAGE)))
         << "expected: '" << FATAL_ERROR_MESSAGE << "'" << std::endl
-        << " got: '" << qPrintable(error_string) << "'" << std::endl;
+        << "got: '" << qPrintable(error_string) << "'" << std::endl;
 }

=== modified file 'tests/utils/file-utils.cpp'
--- tests/utils/file-utils.cpp	2016-07-29 14:20:23 +0000
+++ tests/utils/file-utils.cpp	2016-08-11 00:26:19 +0000
@@ -49,7 +49,7 @@
     f.setAutoRemove(false);
     if(!f.open())
     {
-        qWarning() << "Error opening temporary file: " << f.errorString();
+        qWarning() << "Error opening temporary file:" << f.errorString();
         return info;
     }
     static constexpr qint64 max_step = 1024;
@@ -62,7 +62,7 @@
             buf[i] = 'a' + char(qrand() % ('z'-'a'));
         if (f.write(buf, this_step) < this_step)
         {
-            qWarning() << "Error writing to temporary file: " << f.errorString();
+            qWarning() << "Error writing to temporary file:" << f.errorString();
         }
         left -= this_step;
     }
@@ -71,7 +71,7 @@
     // get a checksum
     if(!f.open())
     {
-        qWarning() << "Error opening temporary file: " << f.errorString();
+        qWarning() << "Error opening temporary file:" << f.errorString();
         return info;
     }
     QCryptographicHash hash(QCryptographicHash::Sha1);
@@ -104,7 +104,7 @@
             auto newDirName = QString("Directory_%1").arg(j);
             if (!dir.mkdir(newDirName))
             {
-                qWarning() << "Error creating temporary directory " << newDirName << " under " << dirPath;
+                qWarning() << "Error creating temporary directory" << newDirName << "under" << dirPath;
                 return false;
             }
 
@@ -191,19 +191,19 @@
     QFileInfo info2(filePath2);
     if (!info1.isFile())
     {
-        qWarning() << "Origin file: " << info1.absoluteFilePath() << " does not exist";
+        qWarning() << "Origin file:" << info1.absoluteFilePath() << "does not exist";
         return false;
     }
     if (!info2.isFile())
     {
-        qWarning() << "File to compare: " << info2.absoluteFilePath() << " does not exist";
+        qWarning() << "File to compare:" << info2.absoluteFilePath() << "does not exist";
         return false;
     }
     auto checksum1 = fileChecksum(filePath1, QCryptographicHash::Md5);
     auto checksum2 = fileChecksum(filePath1, QCryptographicHash::Md5);
     if (checksum1 != checksum2)
     {
-        qWarning() << "Checksum for file: " << filePath1 << " differ";
+        qWarning() << "Checksum for file:" << filePath1 << "differ";
     }
     return checksum1 == checksum2;
 }