Merge lp:~mandel/ubuntu-download-manager/programatically-set-daemon into lp:ubuntu-download-manager

[Manuel de la Peña]

Provide setters and getters for the daemon command line args. Added self signed ssl certs for testing purposes.

Provide setters and getters for the daemon command line args. Added self signed ssl certs for testing purposes.

[lp:~mandel/ubuntu-download-manager/programatically-set-daemon]

171. By Manuel de la Peña on 2013-11-08

Merged with trunk.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Roberto Alsina (ralsina)]

review: Approve

=== modified file 'libubuntudownloadmanager/downloads/daemon.cpp'
--- libubuntudownloadmanager/downloads/daemon.cpp	2013-11-07 00:04:41 +0000
+++ libubuntudownloadmanager/downloads/daemon.cpp	2013-11-08 17:53:31 +0000
@@ -74,6 +74,30 @@
         Logger::stopLogging();
     }
 
+    bool isTimeoutEnabled() {
+        return _isTimeoutEnabled;
+    }
+
+    void enableTimeout(bool enabled) {
+        _isTimeoutEnabled = enabled;
+    }
+
+    bool isStoppable() {
+        return _stoppable;
+    }
+
+    void setStoppable(bool stoppable) {
+        _stoppable = stoppable;
+    }
+
+    QList<QSslCertificate> selfSignedCerts() {
+        return _certs;
+    }
+
+    void setSelfSignedCerts(QList<QSslCertificate> certs) {
+        _certs = certs;
+    }
+
     void start(QString path) {
         TRACE;
         _downAdaptor = new DownloadManagerAdaptor(_downInterface);
@@ -199,6 +223,42 @@
       d_ptr(new DaemonPrivate(app, conn, timer, man, this)) {
 }
 
+bool
+Daemon::isTimeoutEnabled() {
+    Q_D(Daemon);
+    return d->isTimeoutEnabled();
+}
+
+void
+Daemon::enableTimeout(bool enabled) {
+    Q_D(Daemon);
+    d->enableTimeout(enabled);
+}
+
+bool
+Daemon::isStoppable() {
+    Q_D(Daemon);
+    return d->isStoppable();
+}
+
+void
+Daemon::setStoppable(bool stoppable) {
+    Q_D(Daemon);
+    d->setStoppable(stoppable);
+}
+
+QList<QSslCertificate>
+Daemon::selfSignedCerts() {
+    Q_D(Daemon);
+    return d->selfSignedCerts();
+}
+
+void
+Daemon::setSelfSignedCerts(QList<QSslCertificate> certs) {
+    Q_D(Daemon);
+    d->setSelfSignedCerts(certs);
+}
+
 void
 Daemon::start(QString path) {
     Q_D(Daemon);

=== modified file 'libubuntudownloadmanager/downloads/daemon.h'
--- libubuntudownloadmanager/downloads/daemon.h	2013-11-07 00:04:41 +0000
+++ libubuntudownloadmanager/downloads/daemon.h	2013-11-08 17:53:31 +0000
@@ -20,6 +20,7 @@
 #define DOWNLOADER_LIB_DOWNLOAD_DAEMON_H
 
 #include <QObject>
+#include <QSslCertificate>
 #include <QSharedPointer>
 #include "app-downloader-lib_global.h"
 #include "downloads/manager.h"
@@ -44,6 +45,15 @@
            Manager* man,
            QObject *parent = 0);
 
+    bool isTimeoutEnabled();
+    void enableTimeout(bool enabled);
+
+    bool isStoppable();
+    void setStoppable(bool stoppable);
+
+    QList<QSslCertificate> selfSignedCerts();
+    void setSelfSignedCerts(QList<QSslCertificate> cert);
+
  public slots:  // NOLINT (whitespace/indent)
     void start(QString path="com.canonical.applications.Downloader");
 

=== modified file 'ubuntu-download-manager-tests/base_testcase.cpp'
--- ubuntu-download-manager-tests/base_testcase.cpp	2013-09-25 10:30:57 +0000
+++ ubuntu-download-manager-tests/base_testcase.cpp	2013-11-08 17:53:31 +0000
@@ -19,7 +19,8 @@
 #include <QDir>
 #include <QtGlobal>
 #include <QStandardPaths>
-#include "./base_testcase.h"
+#include <string.h>
+#include "base_testcase.h"
 
 void
 noMessageOutput(QtMsgType type,
@@ -51,6 +52,16 @@
     return path;
 }
 
+QString
+BaseTestCase::dataDirectory() {
+    // get the file name and use it to get the data path that is in the
+    // same dir
+    QDir dir(".");
+    dir.makeAbsolute();
+
+    return dir.path() + "/data";
+}
+
 bool
 BaseTestCase::removeDir(const QString& dirName) {
     bool result = true;

=== modified file 'ubuntu-download-manager-tests/base_testcase.h'
--- ubuntu-download-manager-tests/base_testcase.h	2013-09-25 10:30:57 +0000
+++ ubuntu-download-manager-tests/base_testcase.h	2013-11-08 17:53:31 +0000
@@ -28,6 +28,7 @@
     BaseTestCase(const QString& testName, QObject *parent = 0);
     
     QString testDirectory();
+    QString dataDirectory();
 
  protected slots:  // NOLINT(whitespace/indent)
 

=== added directory 'ubuntu-download-manager-tests/data'
=== added file 'ubuntu-download-manager-tests/data/bad_cert.pem'
--- ubuntu-download-manager-tests/data/bad_cert.pem	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/bad_cert.pem	2013-11-08 17:53:31 +0000
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIJAPQ/j6faumV6MA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMRwwGgYDVQQKDBNJbWFnZSBCYXNl
+ZCBVcGRhdGVzMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTMwNTEzMjIwODExWhcN
+MjMwNTExMjIwODExWjBUMQswCQYDVQQGEwJVUzETMBEGA1UECAwKU29tZS1TdGF0
+ZTEcMBoGA1UECgwTSW1hZ2UgQmFzZWQgVXBkYXRlczESMBAGA1UEAwwJbG9jYWxo
+b3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w8OthblYYtvnxTk
++yiaK/z96/YT3DWuwnrxu5LozowkXlp83MXKXAAs7xRDdXLKl5UYeosC1Qh7oPOz
+34T2ukMeA1JwuXb88OvfKSxmPnoRJw+J067hwy0hf/eKnclKIaPMJshmUCL8DXum
+C+Ss4yg/+q0xSp/uZwzOZWvgQLhLjIZ0UVE3gPmtaQ97MjnVmYF5frVkUaeE5ggn
+x36JBw6yxIFlzXMPtxnPGDf1X4KyUEYR6dKdfKV+rNEKl+keHUmiG5gmtuBPBhH7
+Q8nVGzUVV9erCJ3JcdKd5XW/f3p9nYc4yjKQ9f01GfSmkODStcpCZzQhRlicWLBM
+LZ3m3wIDAQABo1AwTjAdBgNVHQ4EFgQUWNYFPW/h1vsiUtc7EpSqh8sfrpowHwYD
+VR0jBBgwFoAUWNYFPW/h1vsiUtc7EpSqh8sfrpowDAYDVR0TBAUwAwEB/zANBgkq
+hkiG9w0BAQUFAAOCAQEAbwbWBubZxS/D9VGfbOnZ9z/ZvqREZ6TD8wPfDywGUdHP
+W036tMSZM9ORRvPmbHTRRspiASH66zfh3e3k0i0dT9JJnbxpsgLw/GnomwbrvqEX
+NuZTTwYCRSZ8gFgRYgDYQxQKk60Nb/9CmNGef0KDVbO0mKGPudSuENTwuviG/FH8
+hdqPPq63UrEe79FC+yCe0bFZDv4+ZYH3GsaB7CRw7HQAePBHSJPqFzwlw69X4bhi
+TzC14gNpWsTLeGutODE+pCzwpr1l7CfwIOmCu/N92hmyBDT4GFYClJVL9YCbJHq1
+OXHUstNghnd1SppFlteS3Id6mBrHQ4E5gFfP7xKBXg==
+-----END CERTIFICATE-----

=== added file 'ubuntu-download-manager-tests/data/bad_key.pem'
--- ubuntu-download-manager-tests/data/bad_key.pem	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/bad_key.pem	2013-11-08 17:53:31 +0000
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDbDw62FuVhi2+f
+FOT7KJor/P3r9hPcNa7CevG7kujOjCReWnzcxcpcACzvFEN1csqXlRh6iwLVCHug
+87PfhPa6Qx4DUnC5dvzw698pLGY+ehEnD4nTruHDLSF/94qdyUoho8wmyGZQIvwN
+e6YL5KzjKD/6rTFKn+5nDM5la+BAuEuMhnRRUTeA+a1pD3syOdWZgXl+tWRRp4Tm
+CCfHfokHDrLEgWXNcw+3Gc8YN/VfgrJQRhHp0p18pX6s0QqX6R4dSaIbmCa24E8G
+EftDydUbNRVX16sInclx0p3ldb9/en2dhzjKMpD1/TUZ9KaQ4NK1ykJnNCFGWJxY
+sEwtnebfAgMBAAECggEAEELo46mFc51HNvb1HJPiBfvs2ZRV2xX9GCDKSxNXxuVu
+Wba76COipvu4WjMV4uUXlvMRcx9YoXnUu5j7tE8JhcAvvS1kgtALbNMFqOfL2z1y
+goTLxXQI/FUgVICKwLXNk/u1zvc3aSF/tnyEUgOytdYqEbDDpPeEWhAATlUYu5UP
+h9vvdTp0bKrNXGmNXzLk/cEGr0X+l+wpDDWv0uiPgL53dDk0mD5ZK/qNBDKenYrf
+LmYTsA+w/cDuFVKIrQ70Nu4OyJze3uc/1+BsMhzr8Arf8SzUzorTPliTgq4vX4N+
+k45areYfieS5Zw1db3I/e73wm4r1rV6gM4OmtSD0qQKBgQD6ebsMoVT/Iry5+iW0
+C1igt/PWm0qmoVGFbjcQNcUENNuftwSQVxB1KMyRVd5t1Jry4eK50b8brxqNrbsf
+6nfCLQlFPTapcLMypTY69kJSB0FQ7vH6DSdibqg3vkGO9+kJg8AkDo/B7SwwDWJs
+w1lqO0xj8190nScHJBF6cDuLIwKBgQDf4/ADLFUq5Apu+bs4TLM0veAfX5DzXclz
+Dm5tJuJiLjwdYfY9T+wh7o9H0q5qpTCkXrGItVb2ztzGdy+zcnlyyDFUC7Sazmew
+642AE8xWWih+eWEj/dmNGc1SCduFUUVBANbNXapqbDQJUroWMEMcLc0LeG55LjP5
+LXjDR9jfFQKBgFYbdyRWaiPzyzGcP03wAJ3v31HNvRIfryjRxPg7o+lYSpBTmKwO
+YkgEqJ7mCDt1tXb+FLWQ18QqpFREf2nvbxA/70nwS1RgvBoTFdubQR12BQxPuLwf
+vYRnSkkvjNYbf++XbXx3zQ/7+w7h6w488gZFMHPD/PLX+8zGp4OSBcZFAoGBAMku
+v1t6mMVDyQRTr6I1ecro294VN+EX449Z5mx6xm5G8YnNn0EU8jDDd0iozkXSTlVF
+Ke6YVJ7O36APNXPgZ7V2oqzNH+sDkjVuVOZD5BesSDrtwxZeYwDhsJgJd5LipoJ0
+yJAdnKaouFGwXrrVf1hw55FpFIwbsmQ0MhH4G67JAoGBAMUNYhdEVHrSANOSfUgK
+eQ+0smuanLcH1DLaZCf1W4jrEcwWhLzIT175mwd9QhyW1st7BeBhmrb/GLs3Khrm
+8QgaVvDuM1sIW22tqnCJBy1Z+5qwfyTcieXzTuMT8N1CqC7oArvrpccLg8ljC5r3
+nEGmZjwQEp7vpTYfkZLPGkM6
+-----END PRIVATE KEY-----

=== added file 'ubuntu-download-manager-tests/data/cert.pem'
--- ubuntu-download-manager-tests/data/cert.pem	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/cert.pem	2013-11-08 17:53:31 +0000
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIJAKSjaMNTvxe2MA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMR0wGwYDVQQKDBRJbWFnZSBCYXNl
+ZCBVcGdyYWRlczESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTEzMDUxMzE5NDEyMFoX
+DTIzMDUxMTE5NDEyMFowVTELMAkGA1UEBhMCVVMxEzARBgNVBAgMClNvbWUtU3Rh
+dGUxHTAbBgNVBAoMFEltYWdlIEJhc2VkIFVwZ3JhZGVzMRIwEAYDVQQDDAlsb2Nh
+bGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClg10agVIHs/fy
+Lh1b7pAIN7c+uWwRk664OmVBJXA/wPEvC1G/FtDL0QnNRWyNHZBFwippXMgyslHi
+JFHDOTONqUH4JucsrsqYsZrk6oWJXLIZ2b+v0kAJlJ4AvCdPo0aJo1egze1ZxCtM
+RuJN3yiZo6q5mYKYPOBgNcZFp2WGnxJduj7p85cp101u7WbY9i/p+idcBRs/ylhZ
+vd8SzXWH3dmsci+6auLTD3TLYnldneNZEnjNzxPuRAl3o8+VeFblM8/qIOurBxAM
+R5UPrCy0XdDELXq4Fea07qVzdzchBrcY1HykF824VI3hNiYRLOXHrJIYE/TfVwKM
+n6+ACfgDAgMBAAGjUDBOMB0GA1UdDgQWBBSClon/pvRAiAr75kZhRnklweC/8jAf
+BgNVHSMEGDAWgBSClon/pvRAiAr75kZhRnklweC/8jAMBgNVHRMEBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQCBpXr9SgJmTTP4V73Lt+MlbCt1TGSBqZ5jKCWrEy9p
+vRJhGTeQyqofAXRMD1RcFJZEonDZMVIYb+Ml25XtHbBiZUX2r1h/dfUyq8v5ZTHo
+MLs6tUUojWjQ1TQ4iRruSdAflA5A7Lsy6yEvDPreQRxi+IPmVyX/655Iv+GUZn0g
+I4trcNYoIxd+Dr+PQjF8JH/ikljt8om7gYf9OvVW+/kKjhkkBoZTVO9MMwta3USp
+2uT7G/C8+90pcNe1ywB74KbzxEcd4zGZDFP+mxNfZb5XWfHgEB0Lf2aasx+fl0PD
+e+wiDfOJ8XUhG6WUfmvSVpGS0+bQgZCdarltDQiildF4
+-----END CERTIFICATE-----

=== added file 'ubuntu-download-manager-tests/data/expired_cert.pem'
--- ubuntu-download-manager-tests/data/expired_cert.pem	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/expired_cert.pem	2013-11-08 17:53:31 +0000
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIJAL6MaQcCVQhBMA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMR0wGwYDVQQKDBRJbWFnZSBCYXNl
+ZCBVcGdyYWRlcjESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTEzMDUwMTIwMDUzM1oX
+DTEzMDUwMjIwMDUzM1owVTELMAkGA1UEBhMCVVMxEzARBgNVBAgMClNvbWUtU3Rh
+dGUxHTAbBgNVBAoMFEltYWdlIEJhc2VkIFVwZ3JhZGVyMRIwEAYDVQQDDAlsb2Nh
+bGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRPjLNbEBSuHhy
+NhiyhHO71RTe0Lcm5GE3tZa9bymADrqnjNm5RhsP85SFy/kQ0e2LdYadA3+XrHm/
++vXtMe7HWQPu8q+OMiMpW8knHmi2QUCqMqImoqe5Nvms93mosoKoNe2d5XzwhKyA
+DjIlW2o72OPZg5ShVZBfc5TG+2Nf5CIdagzamyOY6zfpbhfks9PiMKtHeDp05BD0
+LMsPaS947tYFVzQ3RCzKNc9JNqh43TXiywQPOvBGJnTtYDydRTUh6t2nA8c+az1+
+dSNrLh+v5+iY0z20x34ZY25bpaeIZhbrkn0T968yh1HE01niJWpz/1e6+oHxXvTv
+2EVgLoh1AgMBAAGjUDBOMB0GA1UdDgQWBBQLbxWu2KYhdixmIgvV5POZYlntojAf
+BgNVHSMEGDAWgBQLbxWu2KYhdixmIgvV5POZYlntojAMBgNVHRMEBTADAQH/MA0G
+CSqGSIb3DQEBBQUAA4IBAQCLbGZ7gIU26FJp/OAbSVa0tT5pPCBNHjMNIfp/Smep
++waPVjSzkHZCYYknP9A9/P4d+idvpTyURRkQECiiUjYzeSgF1dR3kvnsXnCJnugG
+GVeZpMnRlktb+dMcwprQhgChVyWDrMR6VpcMkoNC+yJ4XhbN0jhlooEfmnDAOI0j
+5QJmhR+dzfH+xMfFlu41i/budHdwvRqU/G9eNA0i6jn1GI8LHiTRe3tPF4wDpljd
+0/QR47QdiXLUsE9vDljjAI0KfXYo7KyjvdmyD3xX2QVNORlVv2GpzyREiyXnx7RB
+OmQZVDLtaFwmJSQdciZGCSm9bSLNPENAZIDpf1GKXsEx
+-----END CERTIFICATE-----

=== added file 'ubuntu-download-manager-tests/data/expired_key.pem'
--- ubuntu-download-manager-tests/data/expired_key.pem	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/expired_key.pem	2013-11-08 17:53:31 +0000
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDRPjLNbEBSuHhy
+NhiyhHO71RTe0Lcm5GE3tZa9bymADrqnjNm5RhsP85SFy/kQ0e2LdYadA3+XrHm/
++vXtMe7HWQPu8q+OMiMpW8knHmi2QUCqMqImoqe5Nvms93mosoKoNe2d5XzwhKyA
+DjIlW2o72OPZg5ShVZBfc5TG+2Nf5CIdagzamyOY6zfpbhfks9PiMKtHeDp05BD0
+LMsPaS947tYFVzQ3RCzKNc9JNqh43TXiywQPOvBGJnTtYDydRTUh6t2nA8c+az1+
+dSNrLh+v5+iY0z20x34ZY25bpaeIZhbrkn0T968yh1HE01niJWpz/1e6+oHxXvTv
+2EVgLoh1AgMBAAECggEBAM96NTWsGTvs3sGhEmwxGfEuIDuwCWvvGNb8oDPGfggU
+ktCAwYMNGNiAVs00rAsZncmjB4+5YFMtGqxaVHCWCoZwpY3R5nHBFUx1TsgTRxEx
+MsWQ32gf8N+eu4PfACtell/k2XCvlWuIouN3MBIKyxP8xDFyX3Z6OWXsXaHQs4Do
+Eje39Q5WS/LLD5+Hzg31C//u1vp4fUH/q4rZH4PFXk6WczuSItHO2FFoza67azL5
+/iJuR45tZ76ery+PKbvcxVKrJJVHxSlFA0gTBvSsZGQARex9eXlyc5rVqz+w9vDh
+P3U4fqHV4KjPLHxhp38j2lOxRo/cVsr8Zo8vMU//PyECgYEA7BD5spPODhZ9+eee
+WKdAoNoIPwUTJOdxv4pdAuBwvhcbl49uKR2tTNmfyVG3IWxzUS/nTsxcWTm8dqZU
+JRGgGq5giXP/6FOdB1zMjMwAWKJQmLMg1l8ust8zOI8B4eLiKw1X6dqg6bQeur3+
+O2ncGUVYrCvyvyABbHDYcgSUNx8CgYEA4ulil9U83D3aXuYkqL8v19aKmQmjO9WA
+wwRAIA+P1b5F07W1PQFAvBL/GXH2faG2oQyYuZeAHSmSb61SRZPgWQL/MO6L4b/f
+dsf45L/xExkrncDPeAqzX3yWG25sZ6Dx4J+DZGIB9Bw9E+iNsJKGi71ezljoKARA
+D2ZM0N8NMesCgYEAx9ZK+uBio8xokoB/rH7RmBlat7adETWYNlR0DnZfGpxHMFMs
+J0RHK3Ji8LLrOzEqocTSpAMd/i6BG1QMkWDNTyjk8hcvwMXffZcSVfJwLJgjcFDb
+cH4c8zE9lBiDuGwvl9Bw5re8VnqzNNSXfkZMG1x4BzAhC6iVa+5PXJ4BtnMCgYAe
+kax7ofmR/i82C7EynpcWb8u6NEcuX2P6Yc81woLxG7IShG9HKa0L6U8+oVDAuhF9
+ftHwZs2WoCwfKW1k/DgEJdg1Ql3L6upy+Ru5zXXvybtLhFcu59okagda6LRn/ZG4
+XiT4WA/FUCyWSwUTnZnMp5VnHSkhgvkSWgjNNs9zQwKBgQDEiTqE+8PNUJBud+7n
+RkNbke1bXxVcpQ0SrxXirWQyRP3xUgoj5aZ4BZ9yZCBkjHloNn4NteNOvbxutWle
+pISwnN385/GD19mseTQEjyFJyP+9nwQSnTuK911oQCOe/zt/9SBNW1KzRuqeyC/b
+qsi1XDRL8h6X3uEOi+6MpH11QQ==
+-----END PRIVATE KEY-----

=== added file 'ubuntu-download-manager-tests/data/key.pem'
--- ubuntu-download-manager-tests/data/key.pem	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/key.pem	2013-11-08 17:53:31 +0000
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQClg10agVIHs/fy
+Lh1b7pAIN7c+uWwRk664OmVBJXA/wPEvC1G/FtDL0QnNRWyNHZBFwippXMgyslHi
+JFHDOTONqUH4JucsrsqYsZrk6oWJXLIZ2b+v0kAJlJ4AvCdPo0aJo1egze1ZxCtM
+RuJN3yiZo6q5mYKYPOBgNcZFp2WGnxJduj7p85cp101u7WbY9i/p+idcBRs/ylhZ
+vd8SzXWH3dmsci+6auLTD3TLYnldneNZEnjNzxPuRAl3o8+VeFblM8/qIOurBxAM
+R5UPrCy0XdDELXq4Fea07qVzdzchBrcY1HykF824VI3hNiYRLOXHrJIYE/TfVwKM
+n6+ACfgDAgMBAAECggEAQjxu3vOP01tXR4ji4O54n4FEiQqFUAds7XcZHFgSMsFR
+A8Wg4jsMNfSi2o4E4fhJy1DnziB+UaOBF2H3gov6sJ9ish9Hdl9A3ph8501fQVhi
+QewdRQx76hmanaquhLVPvjcrE0Q1zy2tMipP2GANDGcuJHZlh+0c0gPTI/7Yp2WO
+a5wvTh1sJRbLJbcaVBv2DppAEKreCbuytvQCjYTxzjmNzV9jVFK+KTf1f2lXrvkI
+wAXikUxEuZErvGHX1XeGv2XlIaiFdfxyEqn6T5MrNVoy24b0ib7jIMnjYCQifMBy
+TSw+NnOb8igOJd47j3oaXTl5+X42ZcGC0dzRgvJ5WQKBgQDYX7QkjnGO59FTTnki
+Z70p+DqCpwJNsyyFpqSFPYtc9+uD0PYe94ajmE68T8g0BfSfI5KdktyF4XfzoN/2
+SRezNjPiaPhys6BmW0nHo5EEXSzOqMIOH/zYDj7SgAITxP9IO2mZKwA96vR4EKsJ
+TPouGoKdFd2VC/oKnMh5Wja5HQKBgQDD0yXdqTomdAd6WeeSpRHrVxznEA1E/2rb
+WegDo4p4WDzKoMzPkiKQ2c5Zg9ynb82AcXHkeNpY+L1QZi1BSc6OH1d/Z9J1QJbk
+HAeBSpeVEoJxD/PNpmc72O+ZsW38qxLfUwgOK5oKwNUgJvaG+lrlIUCSOnF801+y
+KX4Fr9/LnwKBgDYF9yllc0717Fq7bh07/4v6EUnLvxR9VvFrwQoPartknyYDR2BF
+9xTjk00LMnZiwkf1jsbPA0ZeHB/1G9YXO9agAuZVxSqGVNcZldtFqJCJXwWeNw1l
+yTB8pgzSrzIWbpKvWtdGWEIdZrqPltS0poZaUiA8dF2hZuW9bYR3FNC1AoGBALLH
+OnK75NLma01QdxJykYGB7mklRngPl8bate9chzaHmDiFxXZbvCLyNmmS8QgMElmJ
+OKmVjAJeVLfqELbiYyltg7xVVNanORrYXCG1r93xIBWIstS1bto8m8J9MiTTKk+o
+xlnphKD8m5bW+4sPVZyKVyEpKiMD9wH4z4zxnCeRAoGAWhtWSi6mfBr5VVX901Qk
+h+GDCmFYqN45fhHW+2PClYlycldjU5J4MoxFZmoGdtn+tFgwvSiC2XqNgIhDoK3I
+m584SfNywMPypVrTi163kHkHwk/67VhLEJqT3OlKZRVsDZWgq7g5ffjxZdfd7Gqz
+WdOKy8sAjcC0jYoIMQCm+jc=
+-----END PRIVATE KEY-----

=== added file 'ubuntu-download-manager-tests/data/nasty_cert.pem'
--- ubuntu-download-manager-tests/data/nasty_cert.pem	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/nasty_cert.pem	2013-11-08 17:53:31 +0000
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDiTCCAnGgAwIBAgIJALS35E1u3JqeMA0GCSqGSIb3DQEBBQUAMFsxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMR0wGwYDVQQKDBRJbWFnZSBCYXNl
+ZCBVcGdyYWRlcjEYMBYGA1UEAwwPd3d3LmV4YW1wbGUuY29tMB4XDTEzMDUxNDIx
+MzczOFoXDTIzMDUxMjIxMzczOFowWzELMAkGA1UEBhMCVVMxEzARBgNVBAgMClNv
+bWUtU3RhdGUxHTAbBgNVBAoMFEltYWdlIEJhc2VkIFVwZ3JhZGVyMRgwFgYDVQQD
+DA93d3cuZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDUSmVCIHUanrTM018h8kYAc+IAXv8EO8y1B8eO41ojd2OOq1tlhATBdgSQYvhr
+0593EUHkrgu/7ouHiAcuXYR8OyliQEwlSYWLcKAL5QVrff1cTpyBWCy+mHbAPHmK
+ZK2qkLtjM7MoE1v8v+MNyXC5xodkcvlDpsci99fOAW1JbokgcQGrPFq5fRhZCk78
+mAkTYN4KV0GNIf5ubNQPrspha2DP73WxTWgv6HOKH3IcnO3rXBGWo1ywnam8vtVH
+6OexphTMssdhhYxyay4cW5Jk8atvbM8xc+NGisk2KZOzL6mXJ/i8qS+3uDJoRlz2
+uGNRmN3qdCoeGk6/quY9BlQNAgMBAAGjUDBOMB0GA1UdDgQWBBT9RsLjGzSYEyzu
+qFR+KG9F8RKYhTAfBgNVHSMEGDAWgBT9RsLjGzSYEyzuqFR+KG9F8RKYhTAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA/ZPCrw6RLJtzUMZbTDjrDd0Wg
+UflA3K4BTXe8pJOInkwcZG/7cTs0TWpNVIXmBHxzmvWgLd8aFWTfWx1gzOyl8q4t
+CIBVsHYsqlLsIfR1vojhDDC37+9mL/lbKq6lYs45tEiDfMuRZRxK06U5tDQouEep
+DP1QSt3JOUwidGp0Xs+WsIh5WDZNr9A6BibOV14/S1e5KQ53zKEUmuw9LgmEnZ9b
+LT/DS/syhKlgTfG1iZZFqsxAWGajaohcJ1PCSFedkdUDyPsszDBlZ8OFwIZKmle7
+YKM6KV5uPrvTi5jAyjo/dfCCTqlrGbi0hSnMKR7uuwdx+f4yiIsLhW46Q/ra
+-----END CERTIFICATE-----

=== added file 'ubuntu-download-manager-tests/data/nasty_key.pem'
--- ubuntu-download-manager-tests/data/nasty_key.pem	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/nasty_key.pem	2013-11-08 17:53:31 +0000
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDUSmVCIHUanrTM
+018h8kYAc+IAXv8EO8y1B8eO41ojd2OOq1tlhATBdgSQYvhr0593EUHkrgu/7ouH
+iAcuXYR8OyliQEwlSYWLcKAL5QVrff1cTpyBWCy+mHbAPHmKZK2qkLtjM7MoE1v8
+v+MNyXC5xodkcvlDpsci99fOAW1JbokgcQGrPFq5fRhZCk78mAkTYN4KV0GNIf5u
+bNQPrspha2DP73WxTWgv6HOKH3IcnO3rXBGWo1ywnam8vtVH6OexphTMssdhhYxy
+ay4cW5Jk8atvbM8xc+NGisk2KZOzL6mXJ/i8qS+3uDJoRlz2uGNRmN3qdCoeGk6/
+quY9BlQNAgMBAAECggEBAKt7iP34j/+30Z5e48rdFJTLBvV7xw3ZbEuThCy1FBvw
+FdiqLML8+IZ52cf0Wm1nXbnlk8+wk8cvX0BUrlBStHFRrOUzwQ6hrCFuEapqDo29
+EQseaSfGXSZ8q/gvIZKcLvjHvsasfXzS3ox1SGjbnpZCex22DgoKz3M8tvMujeQw
+z0dlk1UxQGgcd57nwGvquwOfZc2bBqID0WOREHSiif4mpHcWNUPqU6grv4TyzMCi
+j7x6oVcgkiW8pGWMMaap5S+bIy5Kv87cH0Gy1Qr/2Ar2V1d3KqV8j0lG2BovxNA8
+/+S63ReJXc9XhOy2Jcb8jMFf0m/+atg0yeoiYB6hGNUCgYEA+cxTjlFEusJS0zMs
+ZIPw3+JbBKhZKhkg23JeVDMsYxplVAgH9h5OvWqi1K8FawGxwkp7VA1cJNb/nagG
+LgjbSmsBnJbobPDo6A3eL5IlHY3oGNq/1Beod/eQ/Wp1u2R7QwyU3W0NfL3jdLVl
+vBVd9sJ0hfZg79D2WjNhSUZRNTcCgYEA2Y+tf9VpXltn9M9KYVrnFcdxG+TLsnLT
+wYhZbyfA9eZb0ZexgqE6d9QOx5zyOKU1w9Vm7vV1k8Q/yvivggfxOXB61u+Fvjy7
+97V3jcaXrdXK8XlE3xHPTaqGkCRGWpKtTRAibzlQKvUL/3WEJuXR40W/Nt93QFLb
+q3msX12notsCgYEAvxmivpjLpLivFmXqy0bpCs4nZYvJEtzAd0Gqim3Pwk1aQYwX
+UyFiiaQ/x8fRtEhKjmHesbG60XAtg5YcjDE4Wlk8lWgZjeZLt+OMHAaJIHAEpKcM
+5BvpRUX/BO/h+6dmaSgB5tfb3peCoDF6EAakqPegny+afzz0ipMOFTmXPMcCgYEA
+mVXoZIaXQweNVz+aHs+guvrcP1qcLmM719Uvo2YTW7xFzozpcTYNLVNqL0nwdfgK
+0sFfUN/zRHg2telcWXsbiu45xa7/RjssB8QARQ5I7R4XcOWVotq8jvK28HSAmWlz
+dzL98gIk/IHFOQEsaPXlXhdUU2pgdBdx94ND99rcQa0CgYEAgT/m6eXJK1o2lLJY
+AjBug8AYy27ATmGJDyDhdYiZgyKKi/BXjz+jROwnFO07UztWJO2OYX8+RT5cVHzf
+0HzQZIId8wjVCLJIwXw6X6yZ0568cehgaOwEbuuFT2R/u+OObhY8MiQkztikAYya
++KrVICnpThS9bGpSdeebDS9TpVI=
+-----END PRIVATE KEY-----

=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.cpp'
--- ubuntu-download-manager-tests/downloads/test_daemon.cpp	2013-11-07 00:04:41 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.cpp	2013-11-08 17:53:31 +0000
@@ -221,3 +221,48 @@
     QList<MethodData> calledMethods = _man->calledMethods();
     QCOMPARE(1, calledMethods.count());
 }
+
+void
+TestDaemon::testStoppable_data() {
+    QTest::addColumn<bool>("enabled");
+
+    QTest::newRow("Enabled") << true;
+    QTest::newRow("Disabled") << false;
+}
+
+void
+TestDaemon::testStoppable() {
+    QFETCH(bool, enabled);
+    _daemon = new Daemon(_appPointer, _conn, _timer, _man, this);
+    _daemon->setStoppable(enabled);
+    QCOMPARE(_daemon->isStoppable(), enabled);
+}
+
+void
+TestDaemon::testSetTimeout_data() {
+    QTest::addColumn<bool>("enabled");
+
+    QTest::newRow("Enabled") << true;
+    QTest::newRow("Disabled") << false;
+}
+
+void
+TestDaemon::testSetTimeout() {
+    QFETCH(bool, enabled);
+    _daemon = new Daemon(_appPointer, _conn, _timer, _man, this);
+    _daemon->enableTimeout(enabled);
+    QCOMPARE(enabled, _daemon->isTimeoutEnabled());
+}
+
+void
+TestDaemon::testSetSelfSignedSslCerts() {
+    QList<QSslCertificate> certs = QSslCertificate::fromPath(
+        dataDirectory() + "/*.pem");
+    _daemon = new Daemon(_appPointer, _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-07 00:04:41 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.h	2013-11-08 17:53:31 +0000
@@ -48,6 +48,11 @@
     void testDisableTimeout();
     void testSelfSignedCerts();
     void testSelfSignedCertsMissingPath();
+    void testStoppable_data();
+    void testStoppable();
+    void testSetTimeout_data();
+    void testSetTimeout();
+    void testSetSelfSignedSslCerts();
 
  private:
     FakeTimer* _timer;