Merge lp:~mandel/ubuntu-download-manager/testable-dbus-paths into lp:ubuntu-download-manager

[Manuel de la Peña]

Allow to pass the path of the service to be started so that it is easier to test.

Allow to pass the path of the service to be started so that it is easier to test.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:166
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/201/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/90
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/90

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-download-manager-ci/201/rebuild

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Manuel de la Peña (mandel)]

Approving with a single review because it is a quite simple branch.

=== modified file 'libubuntudownloadmanager/downloads/daemon.cpp'
--- libubuntudownloadmanager/downloads/daemon.cpp	2013-10-25 11:44:53 +0000
+++ libubuntudownloadmanager/downloads/daemon.cpp	2013-11-07 00:06:20 +0000
@@ -74,11 +74,10 @@
         Logger::stopLogging();
     }
 
-    void start() {
+    void start(QString path) {
         TRACE;
         _downAdaptor = new DownloadManagerAdaptor(_downInterface);
-        bool ret = _conn->registerService(
-            "com.canonical.applications.Downloader");
+        bool ret = _conn->registerService(path);
         if (ret) {
             qDebug() << "Service registered to"
                 << "com.canonical.applications.Downloader";
@@ -201,9 +200,9 @@
 }
 
 void
-Daemon::start() {
+Daemon::start(QString path) {
     Q_D(Daemon);
-    d->start();
+    d->start(path);
 }
 
 }  // DownloadManager

=== modified file 'libubuntudownloadmanager/downloads/daemon.h'
--- libubuntudownloadmanager/downloads/daemon.h	2013-10-25 11:44:53 +0000
+++ libubuntudownloadmanager/downloads/daemon.h	2013-11-07 00:06:20 +0000
@@ -45,7 +45,7 @@
            QObject *parent = 0);
 
  public slots:  // NOLINT (whitespace/indent)
-    void start();
+    void start(QString path="com.canonical.applications.Downloader");
 
  private:
     Q_PRIVATE_SLOT(d_func(), void onTimeout())

=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.cpp'
--- ubuntu-download-manager-tests/downloads/test_daemon.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.cpp	2013-11-07 00:06:20 +0000
@@ -16,6 +16,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QDebug>
 #include "test_daemon.h"
 
 TestDaemon::TestDaemon(QObject *parent)
@@ -64,6 +65,38 @@
 
     QCOMPARE(2, calledMethods.count());
     QCOMPARE(QString("registerService"), calledMethods[0].methodName());
+
+    StringWrapper* wrapper = reinterpret_cast<StringWrapper*>(
+        calledMethods[0].params().inParams()[0]);
+    QCOMPARE(QString("com.canonical.applications.Downloader"),
+        wrapper->value());
+
+    QCOMPARE(QString("registerObject"), calledMethods[1].methodName());
+
+    // assert exit was NOT called
+    calledMethods = _app->calledMethods();
+    QCOMPARE(0, calledMethods.count());
+}
+
+void
+TestDaemon::testStartPath() {
+    QString myPath = "com.canonical.tests";
+    _conn->setRegisterServiceResult(true);
+    _conn->setRegisterObjectResult(true);
+    _conn->record();
+    _app->record();
+
+    _daemon->start(myPath);
+
+    QList<MethodData> calledMethods = _conn->calledMethods();
+
+    QCOMPARE(2, calledMethods.count());
+    QCOMPARE(QString("registerService"), calledMethods[0].methodName());
+
+    StringWrapper* wrapper = reinterpret_cast<StringWrapper*>(
+        calledMethods[0].params().inParams()[0]);
+    QCOMPARE(myPath, wrapper->value());
+
     QCOMPARE(QString("registerObject"), calledMethods[1].methodName());
 
     // assert exit was NOT called

=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.h'
--- ubuntu-download-manager-tests/downloads/test_daemon.h	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.h	2013-11-07 00:06:20 +0000
@@ -39,6 +39,7 @@
     void init() override;
     void cleanup() override;
     void testStart();
+    void testStartPath();
     void testStartFailServiceRegister();
     void testStartFailObjectRegister();
     void testTimerStop();