Merge lp:~mandel/ubuntu-download-manager/app-conn-pointers into lp:ubuntu-download-manager

[Manuel de la Peña]

Use pointers instead of shared pointers to later deal with the mem management better.

Use pointers instead of shared pointers to later deal with the mem management better.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Michał Karnicki (karni)]

With the QCOMPARE argument order in mind for the future, +1.

review: Approve

[lp:~mandel/ubuntu-download-manager/app-conn-pointers]

211. By Manuel de la Peña on 2013-12-17

Remove duplicated line.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'libubuntudownloadmanager/downloads/daemon.cpp'
--- libubuntudownloadmanager/downloads/daemon.cpp	2013-11-12 11:27:26 +0000
+++ libubuntudownloadmanager/downloads/daemon.cpp	2013-12-17 13:49:30 +0000
@@ -44,13 +44,13 @@
  public:
     explicit DaemonPrivate(Daemon* parent)
         : q_ptr(parent) {
-        _app = QSharedPointer<Application>(new Application());
-        _conn = QSharedPointer<DBusConnection>(new DBusConnection());
+        _app = new Application();
+        _conn = new DBusConnection();
         _shutDownTimer = new Timer();
         init();
     }
 
-    DaemonPrivate(QSharedPointer<Application> app,
+    DaemonPrivate(Application* app,
                   DBusConnection* conn,
                   Timer* timer,
                   Manager* man,
@@ -65,6 +65,8 @@
 
     ~DaemonPrivate() {
         // no need to delete the adaptor because the interface is its parent
+        delete _app;
+        delete _conn;
         delete _downInterface;
         delete _shutDownTimer;
 
@@ -195,9 +197,9 @@
     bool _isTimeoutEnabled = true;
     bool _stoppable = false;
     QList<QSslCertificate> _certs;
-    QSharedPointer<Application> _app;
+    Application* _app;
     Timer* _shutDownTimer;
-    QSharedPointer<DBusConnection> _conn;
+    DBusConnection* _conn;
     Manager* _downInterface;
     DownloadManagerAdaptor* _downAdaptor;
     Daemon* q_ptr;
@@ -212,7 +214,7 @@
       d_ptr(new DaemonPrivate(this)) {
 }
 
-Daemon::Daemon(QSharedPointer<Application> app,
+Daemon::Daemon(Application* app,
                DBusConnection* conn,
                Timer* timer,
                Manager* man,
@@ -221,6 +223,10 @@
       d_ptr(new DaemonPrivate(app, conn, timer, man, this)) {
 }
 
+Daemon::~Daemon() {
+    delete d_ptr;
+}
+
 bool
 Daemon::isTimeoutEnabled() {
     Q_D(Daemon);

=== modified file 'libubuntudownloadmanager/downloads/daemon.h'
--- libubuntudownloadmanager/downloads/daemon.h	2013-11-08 17:46:32 +0000
+++ libubuntudownloadmanager/downloads/daemon.h	2013-12-17 13:49:30 +0000
@@ -39,11 +39,12 @@
 
  public:
     explicit Daemon(QObject *parent = 0);
-    Daemon(QSharedPointer<Application> app,
+    Daemon(Application* app,
            DBusConnection* conn,
            Timer* timer,
            Manager* man,
            QObject *parent = 0);
+    virtual ~Daemon();
 
     bool isTimeoutEnabled();
     void enableTimeout(bool enabled);

=== modified file 'libubuntudownloadmanager/downloads/manager.cpp'
--- libubuntudownloadmanager/downloads/manager.cpp	2013-12-17 13:49:30 +0000
+++ libubuntudownloadmanager/downloads/manager.cpp	2013-12-17 13:49:30 +0000
@@ -28,8 +28,8 @@
 
 namespace DownloadManager {
 
-Manager::Manager(QSharedPointer<Application> app,
-                 QSharedPointer<DBusConnection> connection,
+Manager::Manager(Application* app,
+                 DBusConnection* connection,
                  bool stoppable,
                  QObject* parent)
     : QObject(parent),
@@ -42,15 +42,14 @@
     _networkInfo =  new SystemNetworkInfo();
     RequestFactory* nam = new RequestFactory(_stoppable);
     _processFactory = new ProcessFactory();
-    _downloadFactory = QSharedPointer<Factory>(
-        new Factory(_apparmor, _networkInfo, nam,
-            _processFactory));
+    _downloadFactory = new Factory(_apparmor, _networkInfo, nam,
+            _processFactory);
     _downloadsQueue = new Queue(_networkInfo);
     init();
 }
 
-Manager::Manager(QSharedPointer<Application> app,
-                 QSharedPointer<DBusConnection> connection,
+Manager::Manager(Application* app,
+                 DBusConnection* connection,
                  SystemNetworkInfo* networkInfo,
                  Factory* downloadFactory,
                  Queue* queue,

=== modified file 'libubuntudownloadmanager/downloads/manager.h'
--- libubuntudownloadmanager/downloads/manager.h	2013-12-17 13:49:30 +0000
+++ libubuntudownloadmanager/downloads/manager.h	2013-12-17 13:49:30 +0000
@@ -23,7 +23,6 @@
 #include <QByteArray>
 #include <QtDBus/QDBusObjectPath>
 #include <QtDBus/QDBusContext>
-#include <QSharedPointer>
 #include <QSslCertificate>
 #include "metatypes.h"
 #include "downloads/download.h"
@@ -41,12 +40,12 @@
     Q_OBJECT
 
  public:
-    Manager(QSharedPointer<Application> app,
-            QSharedPointer<DBusConnection> connection,
+    Manager(Application* app,
+            DBusConnection* connection,
             bool stoppable = false,
             QObject *parent = 0);
-    Manager(QSharedPointer<Application> app,
-            QSharedPointer<DBusConnection> connection,
+    Manager(Application* app,
+            DBusConnection* connection,
             SystemNetworkInfo* networkInfo,
             Factory* downloadFactory,
             Queue* queue,
@@ -98,14 +97,14 @@
     void onDownloadsChanged(QString);
 
  private:
-    QSharedPointer<Application> _app;
+    Application* _app;
     qulonglong _throttle;
     AppArmor* _apparmor;
     SystemNetworkInfo* _networkInfo;
     ProcessFactory* _processFactory;
-    QSharedPointer<Factory> _downloadFactory;
+    Factory* _downloadFactory;
     Queue* _downloadsQueue;
-    QSharedPointer<DBusConnection> _conn;
+    DBusConnection* _conn;
     bool _stoppable;
 };
 

=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.cpp'
--- ubuntu-download-manager-tests/downloads/test_daemon.cpp	2013-11-18 10:13:02 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.cpp	2013-12-17 13:49:30 +0000
@@ -24,37 +24,20 @@
 }
 
 void
-TestDaemon::init() {
-    BaseTestCase::init();
-    _timer = new FakeTimer();
-    _app = new FakeApplication();
-    _appPointer = QSharedPointer<Application>(_app);
-    _conn = QSharedPointer<FakeDBusConnection>(new FakeDBusConnection());
-    _man = new FakeDownloadManager(_appPointer, _conn);
-    _daemon = new Daemon(_appPointer,
-        _conn.data(), _timer, _man, this);
-}
-
-void
-TestDaemon::cleanup() {
-    BaseTestCase::cleanup();
-
-    delete _app;
-    delete _daemon;
-    delete _timer;
-    delete _man;
-}
-
-void
 TestDaemon::testStart() {
-    _conn->setRegisterServiceResult(true);
-    _conn->setRegisterObjectResult(true);
-    _conn->record();
-    _app->record();
-
-    _daemon->start();
-
-    QList<MethodData> calledMethods = _conn->calledMethods();
+    FakeTimer* timer = new FakeTimer();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    conn->setRegisterServiceResult(true);
+    conn->setRegisterObjectResult(true);
+    conn->record();
+    FakeApplication* app = new FakeApplication();
+    app->record();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    daemon->start();
+
+    QList<MethodData> calledMethods = conn->calledMethods();
 
     QCOMPARE(2, calledMethods.count());
     QCOMPARE(QString("registerService"), calledMethods[0].methodName());
@@ -67,21 +50,27 @@
     QCOMPARE(QString("registerObject"), calledMethods[1].methodName());
 
     // assert exit was NOT called
-    calledMethods = _app->calledMethods();
-    QCOMPARE(0, calledMethods.count());
+    calledMethods = app->calledMethods();
+    QCOMPARE(1, calledMethods.count());
+    QVERIFY("exit" != calledMethods[0].methodName());
 }
 
 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();
+    FakeTimer* timer = new FakeTimer();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    conn->setRegisterServiceResult(true);
+    conn->setRegisterObjectResult(true);
+    conn->record();
+    FakeApplication* app = new FakeApplication();
+    app->record();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    daemon->start(myPath);
+
+    QList<MethodData> calledMethods = conn->calledMethods();
 
     QCOMPARE(2, calledMethods.count());
     QCOMPARE(QString("registerService"), calledMethods[0].methodName());
@@ -93,125 +82,167 @@
     QCOMPARE(QString("registerObject"), calledMethods[1].methodName());
 
     // assert exit was NOT called
-    calledMethods = _app->calledMethods();
-    QCOMPARE(0, calledMethods.count());
+    calledMethods = app->calledMethods();
+    QCOMPARE(1, calledMethods.count());
+    QVERIFY("exit" != calledMethods[0].methodName());
 }
 
 void
 TestDaemon::testStartFailServiceRegister() {
-    _conn->setRegisterServiceResult(false);
-    _conn->setRegisterObjectResult(true);
-    _conn->record();
-    _app->record();
-
-    _daemon->start();
-
-    QList<MethodData> calledMethods = _conn->calledMethods();
+    FakeTimer* timer = new FakeTimer();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    conn->setRegisterServiceResult(false);
+    conn->setRegisterObjectResult(true);
+    conn->record();
+    FakeApplication* app = new FakeApplication();
+    app->record();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    daemon->start();
+
+    QList<MethodData> calledMethods = conn->calledMethods();
 
     QCOMPARE(1, calledMethods.count());
     QCOMPARE(QString("registerService"), calledMethods[0].methodName());
 
     // assert exit was called
-    calledMethods = _app->calledMethods();
-    QCOMPARE(1, calledMethods.count());
-    QCOMPARE(QString("exit"), calledMethods[0].methodName());
+    calledMethods = app->calledMethods();
+    QCOMPARE(2, calledMethods.count());
+    QCOMPARE(QString("exit"), calledMethods[1].methodName());
 }
 
 void
 TestDaemon::testStartFailObjectRegister() {
-    _conn->setRegisterServiceResult(true);
-    _conn->setRegisterObjectResult(false);
-    _conn->record();
-    _app->record();
-
-    _daemon->start();
-
-    QList<MethodData> calledMethods = _conn->calledMethods();
+    FakeTimer* timer = new FakeTimer();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    conn->setRegisterServiceResult(true);
+    conn->setRegisterObjectResult(false);
+    conn->record();
+    FakeApplication* app = new FakeApplication();
+    app->record();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    daemon->start();
+
+    QList<MethodData> calledMethods = conn->calledMethods();
 
     QCOMPARE(2, calledMethods.count());
     QCOMPARE(QString("registerService"), calledMethods[0].methodName());
     QCOMPARE(QString("registerObject"), calledMethods[1].methodName());
 
     // assert exit was called
-    calledMethods = _app->calledMethods();
-    QCOMPARE(1, calledMethods.count());
-    QCOMPARE(QString("exit"), calledMethods[0].methodName());
+    calledMethods = app->calledMethods();
+    QCOMPARE(2, calledMethods.count());
+    QCOMPARE(QString("exit"), calledMethods[1].methodName());
 }
 
 void
 TestDaemon::testTimerStop() {
-    _timer->setIsActive(true);
-    _timer->record();
-    _man->emitSizeChaged(1);
-
-    QList<MethodData> calledMethods = _timer->calledMethods();
-    QCOMPARE(2, calledMethods.count());
-    QCOMPARE(QString("isActive"), calledMethods[0].methodName());
-    QCOMPARE(QString("stop"), calledMethods[1].methodName());
+    FakeTimer* timer = new FakeTimer();
+    timer->setIsActive(true);
+    timer->record();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    FakeApplication* app = new FakeApplication();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+
+    man->emitSizeChaged(1);
+
+    QList<MethodData> calledMethods = timer->calledMethods();
+    QCOMPARE(3, calledMethods.count());
+    QCOMPARE(QString("isActive"), calledMethods[1].methodName());
+    QCOMPARE(QString("stop"), calledMethods[2].methodName());
 }
 
 void
 TestDaemon::testTimerStart() {
-    _timer->setIsActive(false);
-    _timer->record();
-    _man->emitSizeChaged(0);
-
-    QList<MethodData> calledMethods = _timer->calledMethods();
-    QCOMPARE(2, calledMethods.count());
-    QCOMPARE(QString("isActive"), calledMethods[0].methodName());
-    QCOMPARE(QString("start"), calledMethods[1].methodName());
+    FakeTimer* timer = new FakeTimer();
+    timer->setIsActive(false);
+    timer->record();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    FakeApplication* app = new FakeApplication();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+
+    man->emitSizeChaged(0);
+
+    QList<MethodData> calledMethods = timer->calledMethods();
+    QCOMPARE(3, calledMethods.count());
+    QCOMPARE(QString("isActive"), calledMethods[1].methodName());
+    QCOMPARE(QString("start"), calledMethods[2].methodName());
 }
 
 void
 TestDaemon::testTimeoutExit() {
-    _app->record();
+    FakeTimer* timer = new FakeTimer();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    FakeApplication* app = new FakeApplication();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    app->record();
+
     // emit the timeout signal and assert that exit was called
-    _timer->emitTimeout();
+    timer->emitTimeout();
 
-    QList<MethodData> calledMethods = _app->calledMethods();
+    QList<MethodData> calledMethods = app->calledMethods();
     QCOMPARE(1, calledMethods.count());
     QCOMPARE(QString("exit"), calledMethods[0].methodName());
 }
 
 void
 TestDaemon::testDisableTimeout() {
-    _timer->record();
+    FakeTimer* timer = new FakeTimer();
+    timer->record();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    FakeApplication* app = new FakeApplication();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
 
     // set the args so that we disable the timeout
     QStringList args;
     args << "-disable-timeout";
-    _app->setArguments(args);
+    app->setArguments(args);
 
     // assert that start is never called
-    _daemon = new Daemon(_appPointer, _conn.data(), _timer, _man, this);
-    QList<MethodData> calledMethods = _timer->calledMethods();
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QList<MethodData> calledMethods = timer->calledMethods();
     QCOMPARE(0, calledMethods.count());
 }
 
 void
 TestDaemon::testSelfSignedCerts() {
-    _man->record();
+    FakeTimer* timer = new FakeTimer();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    FakeApplication* app = new FakeApplication();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+    man->record();
+
     QStringList args;
     args << "-self-signed-certs" << "*.pem";
-    _app->setArguments(args);
+    app->setArguments(args);
 
     // assert that we set the certs
-    _daemon = new Daemon(_appPointer, _conn.data(), _timer, _man, this);
-    QList<MethodData> calledMethods = _man->calledMethods();
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QList<MethodData> calledMethods = man->calledMethods();
     QCOMPARE(1, calledMethods.count());
     QCOMPARE(QString("setAcceptedCertificates"), calledMethods[0].methodName());
 }
 
 void
 TestDaemon::testSelfSignedCertsMissingPath() {
-    _man->record();
+    FakeTimer* timer = new FakeTimer();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    FakeApplication* app = new FakeApplication();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+    man->record();
     QStringList args;
     args << "-self-signed-certs";
-    _app->setArguments(args);
+    app->setArguments(args);
 
     // assert that we do not crash
-    _daemon = new Daemon(_appPointer, _conn.data(), _timer, _man, this);
-    QList<MethodData> calledMethods = _man->calledMethods();
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    QList<MethodData> calledMethods = man->calledMethods();
     QCOMPARE(1, calledMethods.count());
 }
 
@@ -225,10 +256,15 @@
 
 void
 TestDaemon::testStoppable() {
+    FakeTimer* timer = new FakeTimer();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    FakeApplication* app = new FakeApplication();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+
     QFETCH(bool, enabled);
-    _daemon = new Daemon(_appPointer, _conn.data(), _timer, _man, this);
-    _daemon->setStoppable(enabled);
-    QCOMPARE(_daemon->isStoppable(), enabled);
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    daemon->setStoppable(enabled);
+    QCOMPARE(daemon->isStoppable(), enabled);
 }
 
 void
@@ -241,19 +277,29 @@
 
 void
 TestDaemon::testSetTimeout() {
+    FakeTimer* timer = new FakeTimer();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    FakeApplication* app = new FakeApplication();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+
     QFETCH(bool, enabled);
-    _daemon = new Daemon(_appPointer, _conn.data(), _timer, _man, this);
-    _daemon->enableTimeout(enabled);
-    QCOMPARE(enabled, _daemon->isTimeoutEnabled());
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    daemon->enableTimeout(enabled);
+    QCOMPARE(enabled, daemon->isTimeoutEnabled());
 }
 
 void
 TestDaemon::testSetSelfSignedSslCerts() {
+    FakeTimer* timer = new FakeTimer();
+    FakeDBusConnection* conn = new FakeDBusConnection();
+    FakeApplication* app = new FakeApplication();
+    FakeDownloadManager* man = new FakeDownloadManager(app, conn);
+
     QList<QSslCertificate> certs = QSslCertificate::fromPath(
         dataDirectory() + "/*.pem");
-    _daemon = new Daemon(_appPointer, _conn.data(), _timer, _man, this);
-    _daemon->setSelfSignedCerts(certs);
-    QList<QSslCertificate> daemonCerts = _daemon->selfSignedCerts();
+    QScopedPointer<Daemon> daemon(new Daemon(app, conn, timer, man, this));
+    daemon->setSelfSignedCerts(certs);
+    QList<QSslCertificate> daemonCerts = daemon->selfSignedCerts();
     QCOMPARE(certs.count(), daemonCerts.count());
     foreach(QSslCertificate cert, certs) {
         QVERIFY(daemonCerts.contains(cert));

=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.h'
--- ubuntu-download-manager-tests/downloads/test_daemon.h	2013-11-16 18:46:06 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.h	2013-12-17 13:49:30 +0000
@@ -36,8 +36,6 @@
 
  private slots:  // NOLINT(whitespace/indent)
 
-    void init() override;
-    void cleanup() override;
     void testStart();
     void testStartPath();
     void testStartFailServiceRegister();
@@ -53,14 +51,6 @@
     void testSetTimeout_data();
     void testSetTimeout();
     void testSetSelfSignedSslCerts();
-
- private:
-    FakeTimer* _timer;
-    FakeApplication* _app;
-    QSharedPointer<Application> _appPointer;
-    FakeDownloadManager* _man;
-    QSharedPointer<FakeDBusConnection> _conn;
-    Daemon* _daemon;
 };
 
 DECLARE_TEST(TestDaemon)

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_manager.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_manager.cpp	2013-12-17 13:49:30 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_manager.cpp	2013-12-17 13:49:30 +0000
@@ -32,8 +32,7 @@
 TestDownloadManager::init() {
     BaseTestCase::init();
     _app = new FakeApplication();
-    _appPointer = QSharedPointer<Application>(_app);
-    _conn = QSharedPointer<FakeDBusConnection>(new FakeDBusConnection());
+    _conn = new FakeDBusConnection();
     _networkInfo = new FakeSystemNetworkInfo();
     _q = new FakeDownloadQueue(_networkInfo);
     _uuidFactory = QSharedPointer<FakeUuidFactory>(new FakeUuidFactory());
@@ -41,7 +40,7 @@
     _requestFactory = new FakeRequestFactory();
     _downloadFactory = new FakeDownloadFactory(_apparmor, _networkInfo,
         _requestFactory, new FakeProcessFactory());
-    _man = new Manager(_appPointer, _conn, _networkInfo, _downloadFactory, _q);
+    _man = new Manager(_app, _conn, _networkInfo, _downloadFactory, _q);
 }
 
 void
@@ -255,7 +254,7 @@
     _downloadFactory = new FakeDownloadFactory(_apparmor,
         new FakeSystemNetworkInfo(), new FakeRequestFactory(),
         new FakeProcessFactory());
-    _man = new Manager(_appPointer, _conn, _networkInfo,
+    _man = new Manager(_app, _conn, _networkInfo,
         _downloadFactory, _q);
 
     QSignalSpy spy(_man, SIGNAL(downloadCreated(QDBusObjectPath)));
@@ -302,7 +301,7 @@
     _downloadFactory = new FakeDownloadFactory(_apparmor,
         new FakeSystemNetworkInfo(), new FakeRequestFactory(),
         new FakeProcessFactory());
-    _man = new Manager(_appPointer, _conn, _networkInfo,
+    _man = new Manager(_app, _conn, _networkInfo,
         _downloadFactory, _q);
 
     QSignalSpy spy(_man, SIGNAL(downloadCreated(QDBusObjectPath)));
@@ -380,7 +379,7 @@
     _downloadFactory = new FakeDownloadFactory(_apparmor,
         new FakeSystemNetworkInfo(), new FakeRequestFactory(),
         new FakeProcessFactory());
-    _man = new Manager(_appPointer, _conn, _networkInfo,
+    _man = new Manager(_app, _conn, _networkInfo,
         _downloadFactory, _q);
 
     QString firstUrl("http://www.ubuntu.com"),
@@ -472,9 +471,8 @@
 void
 TestDownloadManager::testStoppable() {
     _app->record();
-    _man = new Manager(
-        _appPointer, qSharedPointerCast<DBusConnection>(_conn),
-        _networkInfo, _downloadFactory, _q, true);
+    _man = new Manager(_app, _conn, _networkInfo,
+        _downloadFactory, _q, true);
     _man->exit();
     QList<MethodData> calledMethods = _app->calledMethods();
     QCOMPARE(1, calledMethods.count());
@@ -483,9 +481,8 @@
 void
 TestDownloadManager::testNotStoppable() {
     _app->record();
-    _man = new Manager(
-        _appPointer, qSharedPointerCast<DBusConnection>(_conn),
-        _networkInfo, _downloadFactory, _q, false);
+    _man = new Manager(_app, _conn, _networkInfo,
+        _downloadFactory, _q, false);
     _man->exit();
     QList<MethodData> calledMethods = _app->calledMethods();
     QCOMPARE(0, calledMethods.count());

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_manager.h'
--- ubuntu-download-manager-tests/downloads/test_download_manager.h	2013-11-25 14:46:52 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_manager.h	2013-12-17 13:49:30 +0000
@@ -71,11 +71,10 @@
 
  private:
     FakeApplication* _app;
-    QSharedPointer<Application> _appPointer;
     FakeSystemNetworkInfo* _networkInfo;
     FakeRequestFactory* _requestFactory;
     FakeDownloadFactory* _downloadFactory;
-    QSharedPointer<FakeDBusConnection> _conn;
+    FakeDBusConnection* _conn;
     FakeDownloadQueue* _q;
     QSharedPointer<FakeUuidFactory> _uuidFactory;
     FakeAppArmor* _apparmor;

=== modified file 'ubuntu-download-manager-tests/fakes/fake_download_manager.cpp'
--- ubuntu-download-manager-tests/fakes/fake_download_manager.cpp	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/fakes/fake_download_manager.cpp	2013-12-17 13:49:30 +0000
@@ -18,10 +18,9 @@
 
 #include "./fake_download_manager.h"
 
-FakeDownloadManager::FakeDownloadManager(
-                                    QSharedPointer<Application> app,
-                                    QSharedPointer<DBusConnection> connection,
-                                    QObject *parent)
+FakeDownloadManager::FakeDownloadManager(Application* app,
+                                         DBusConnection* connection,
+                                         QObject *parent)
     : Manager(app, connection, parent),
       Fake() {
 }

=== modified file 'ubuntu-download-manager-tests/fakes/fake_download_manager.h'
--- ubuntu-download-manager-tests/fakes/fake_download_manager.h	2013-10-30 11:04:37 +0000
+++ ubuntu-download-manager-tests/fakes/fake_download_manager.h	2013-12-17 13:49:30 +0000
@@ -29,8 +29,8 @@
     Q_OBJECT
 
  public:
-    explicit FakeDownloadManager(QSharedPointer<Application> app,
-                                 QSharedPointer<DBusConnection> connection,
+    explicit FakeDownloadManager(Application* app,
+                                 DBusConnection* connection,
                                  QObject *parent = 0);
 
     void emitSizeChaged(int size);