← Back to branch summary

~ps-jenkins/ubuntu-download-manager/latestsnapshot-0.2+13.10.20131104-0ubuntu1

« back to all changes in this revision

Viewing changes to ubuntu-download-manager-tests/test_download_daemon.cpp

  • Committer: Tarmac
  • Author(s): Manuel de la Pena
  • Date: 2013-09-24 12:56:26 UTC
  • mfrom: (105.3.6 stoppable)
  • Revision ID: tarmac-20130924125626-h1gyxsg8vadzrlrp
Provide new arg and new method to simplify tests. Fixes: https://bugs.launchpad.net/bugs/1228233.

Approved by PS Jenkins bot, Diego Sarmentero, Mike McCracken.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntu-download-manager-tests/test_download_daemon.cpp
26
26
TestDownloadDaemon::init() {
27
27
    _timer = new FakeTimer();
28
28
    _app = new FakeApplication();
 
29
    _appPointer = QSharedPointer<Application>(_app);
29
30
    _conn = new FakeDBusConnection();
30
 
    _man = new FakeDownloadManager(QSharedPointer<DBusConnection>(_conn));
31
 
    _daemon = new DownloadDaemon(_app, _conn, _timer, _man, this);
 
31
    _man = new FakeDownloadManager(_appPointer,
 
32
        QSharedPointer<DBusConnection>(_conn));
 
33
    _daemon = new DownloadDaemon(_appPointer,
 
34
        _conn, _timer, _man, this);
32
35
}
33
36
 
34
37
void
151
154
    _app->setArguments(args);
152
155
 
153
156
    // assert that start is never called
154
 
    _daemon = new DownloadDaemon(_app, _conn, _timer, _man, this);
 
157
    _daemon = new DownloadDaemon(_appPointer, _conn, _timer, _man, this);
155
158
    QList<MethodData> calledMethods = _timer->calledMethods();
156
159
    QCOMPARE(0, calledMethods.count());
157
160
}
164
167
    _app->setArguments(args);
165
168
 
166
169
    // assert that we set the certs
167
 
    _daemon = new DownloadDaemon(_app, _conn, _timer, _man, this);
 
170
    _daemon = new DownloadDaemon(_appPointer, _conn, _timer, _man, this);
168
171
    QList<MethodData> calledMethods = _man->calledMethods();
169
172
    QCOMPARE(1, calledMethods.count());
170
173
    QCOMPARE(QString("setAcceptedCertificates"), calledMethods[0].methodName());
178
181
    _app->setArguments(args);
179
182
 
180
183
    // assert that we do not crash
181
 
    _daemon = new DownloadDaemon(_app, _conn, _timer, _man, this);
 
184
    _daemon = new DownloadDaemon(_appPointer, _conn, _timer, _man, this);
182
185
    QList<MethodData> calledMethods = _man->calledMethods();
183
186
    QCOMPARE(1, calledMethods.count());
184
187
}