Merge lp:~mandel/ubuntu-download-manager/mms-download-start into lp:ubuntu-download-manager

[Manuel de la Peña]

Provide a new method that allows to create mms downloads that are not queued and take the APN proxy details to be used for the get request.

Provide a new method that allows to create mms downloads that are not queued and take the APN proxy details to be used for the get request.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'docs/com.canonical.applications.download_manager.xml'
--- docs/com.canonical.applications.download_manager.xml	2013-12-03 13:03:53 +0000
+++ docs/com.canonical.applications.download_manager.xml	2014-01-29 12:16:44 +0000
@@ -6,6 +6,15 @@
         <arg name="downloadPath" type="o" direction="out" />
     </method>
 
+    <method name="createMmsDownload">
+        <arg name="url" type="s" direction="in" />
+        <arg name="hostname" type="s" direction="in" />
+        <arg name="port" type="i" direction="in" />
+        <arg name="username" type="s" direction="in" />
+        <arg name="password" type="s" direction="in" />
+        <arg name="downloadPath" type="o" direction="out" />
+    </method>
+
     <method name="createDownloadGroup">
         <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="StructList"/>
         <annotation name="org.qtproject.QtDBus.QtTypeName.In3" value="QVariantMap"/>

=== modified file 'ubuntu-download-manager-priv/downloads/download.cpp'
--- ubuntu-download-manager-priv/downloads/download.cpp	2014-01-28 16:03:24 +0000
+++ ubuntu-download-manager-priv/downloads/download.cpp	2014-01-29 12:16:44 +0000
@@ -96,6 +96,11 @@
 }
 
 void
+Download::setAddToQueue(bool addToQueue) {
+    _addToQueue = addToQueue;
+}
+
+void
 Download::setLastError(const QString& lastError) {
     _lastError = lastError;
 }

=== modified file 'ubuntu-download-manager-priv/downloads/download.h'
--- ubuntu-download-manager-priv/downloads/download.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-priv/downloads/download.h	2014-01-29 12:16:44 +0000
@@ -97,6 +97,11 @@
     virtual bool isValid() const {
         return _isValid;
     }
+
+    bool addToQueue() const {
+        return _addToQueue;
+    }
+
     virtual QString lastError() const {
         return _lastError;
     }
@@ -125,18 +130,26 @@
 
     inline void cancel() {
         setState(Download::CANCEL);
+        if(!_addToQueue)
+            cancelDownload();
     }
 
     inline void pause() {
         setState(Download::PAUSE);
+        if(!_addToQueue)
+            pauseDownload();
     }
 
     inline void resume() {
         setState(Download::RESUME);
+        if(!_addToQueue)
+            resumeDownload();
     }
 
     inline void start() {
         setState(Download::START);
+        if(!_addToQueue)
+            startDownload();
     }
 
     // slots to be implemented by the children
@@ -158,11 +171,13 @@
 
  protected:
     void setIsValid(bool isValid);
+    void setAddToQueue(bool addToQueue);
     void setLastError(const QString& lastError);
     virtual void emitError(const QString& error);
 
  private:
     bool _isValid = true;
+    bool _addToQueue = true;
     QString _lastError = "";
     QString _id;
     qulonglong _throttle;
@@ -174,7 +189,7 @@
     QVariantMap _metadata;
     QMap<QString, QString> _headers;
     SystemNetworkInfo* _networkInfo;
-    QObject* _adaptor = NULL;
+    QObject* _adaptor = nullptr;
 };
 
 }  // Daemon

=== modified file 'ubuntu-download-manager-priv/downloads/download_manager_adaptor.cpp'
--- ubuntu-download-manager-priv/downloads/download_manager_adaptor.cpp	2014-01-09 15:21:14 +0000
+++ ubuntu-download-manager-priv/downloads/download_manager_adaptor.cpp	2014-01-29 12:16:44 +0000
@@ -61,6 +61,14 @@
     return download;
 }
 
+QDBusObjectPath DownloadManagerAdaptor::createMmsDownload(const QString &url, const QString &hostname, int port, const QString &username, const QString &password)
+{
+    // handle method call com.canonical.applications.DownloadManager.createMmsDownload
+    QDBusObjectPath downloadPath;
+    QMetaObject::invokeMethod(parent(), "createMmsDownload", Q_RETURN_ARG(QDBusObjectPath, downloadPath), Q_ARG(QString, url), Q_ARG(QString, hostname), Q_ARG(int, port), Q_ARG(QString, username), Q_ARG(QString, password));
+    return downloadPath;
+}
+
 qulonglong DownloadManagerAdaptor::defaultThrottle()
 {
     // handle method call com.canonical.applications.DownloadManager.defaultThrottle

=== modified file 'ubuntu-download-manager-priv/downloads/download_manager_adaptor.h'
--- ubuntu-download-manager-priv/downloads/download_manager_adaptor.h	2013-12-11 13:55:36 +0000
+++ ubuntu-download-manager-priv/downloads/download_manager_adaptor.h	2014-01-29 12:16:44 +0000
@@ -9,8 +9,8 @@
  * before re-generating it.
  */
 
-#ifndef DOWNLOAD_MANAGER_ADAPTOR_H_1379689315
-#define DOWNLOAD_MANAGER_ADAPTOR_H_1379689315
+#ifndef DOWNLOAD_MANAGER_ADAPTOR_H_1390996214
+#define DOWNLOAD_MANAGER_ADAPTOR_H_1390996214
 
 #include <QtCore/QObject>
 #include <QtDBus/QtDBus>
@@ -45,6 +45,14 @@
 "      <arg direction=\"in\" type=\"(sssa{sv}a{ss})\" name=\"download\"/>\n"
 "      <arg direction=\"out\" type=\"o\" name=\"downloadPath\"/>\n"
 "    </method>\n"
+"    <method name=\"createMmsDownload\">\n"
+"      <arg direction=\"in\" type=\"s\" name=\"url\"/>\n"
+"      <arg direction=\"in\" type=\"s\" name=\"hostname\"/>\n"
+"      <arg direction=\"in\" type=\"i\" name=\"port\"/>\n"
+"      <arg direction=\"in\" type=\"s\" name=\"username\"/>\n"
+"      <arg direction=\"in\" type=\"s\" name=\"password\"/>\n"
+"      <arg direction=\"out\" type=\"o\" name=\"downloadPath\"/>\n"
+"    </method>\n"
 "    <method name=\"createDownloadGroup\">\n"
 "      <annotation value=\"StructList\" name=\"org.qtproject.QtDBus.QtTypeName.In0\"/>\n"
 "      <annotation value=\"QVariantMap\" name=\"org.qtproject.QtDBus.QtTypeName.In3\"/>\n"
@@ -91,6 +99,7 @@
     void allowGSMDownload(bool allowed);
     QDBusObjectPath createDownload(DownloadStruct download);
     QDBusObjectPath createDownloadGroup(StructList downloads, const QString &algorithm, bool allowed3G, const QVariantMap &metadata, StringMap headers);
+    QDBusObjectPath createMmsDownload(const QString &url, const QString &hostname, int port, const QString &username, const QString &password);
     qulonglong defaultThrottle();
     void exit();
     QList<QDBusObjectPath> getAllDownloads();

=== modified file 'ubuntu-download-manager-priv/downloads/factory.cpp'
--- ubuntu-download-manager-priv/downloads/factory.cpp	2014-01-28 16:03:24 +0000
+++ ubuntu-download-manager-priv/downloads/factory.cpp	2014-01-29 12:16:44 +0000
@@ -16,11 +16,13 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QNetworkProxy>
 #include <QPair>
 #include "downloads/download_adaptor.h"
 #include "downloads/group_download.h"
 #include "downloads/group_download_adaptor.h"
 #include "downloads/file_download.h"
+#include "downloads/mms_file_download.h"
 #include "downloads/factory.h"
 #include "system/logger.h"
 
@@ -133,6 +135,30 @@
 }
 
 Download*
+Factory::createMmsDownload(const QString& dbusOwner,
+                           const QUrl& url,
+                           const QString& hostname,
+                           int port,
+                           const QString& username,
+                           const QString& password) {
+    QNetworkProxy proxy(QNetworkProxy::HttpProxy, hostname,
+        port, username, password);
+    QString id;
+    QString dbusPath;
+    QString rootPath;
+    bool isConfined = false;
+    QVariantMap metadata;
+    QMap<QString, QString> headers;
+    getDownloadPath(dbusOwner, metadata, id, dbusPath, rootPath,
+        isConfined);
+    Download* down = new MmsFileDownload(id, dbusPath, isConfined,
+        rootPath, url, metadata, headers, proxy);
+    DownloadAdaptor* adaptor = new DownloadAdaptor(down);
+    down->setAdaptor(adaptor);
+    return down;
+}
+
+Download*
 Factory::createDownloadForGroup(bool isConfined,
                                 const QString& rootPath,
                                 const QUrl& url,

=== modified file 'ubuntu-download-manager-priv/downloads/factory.h'
--- ubuntu-download-manager-priv/downloads/factory.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-priv/downloads/factory.h	2014-01-29 12:16:44 +0000
@@ -62,6 +62,13 @@
                                      const QVariantMap& metadata,
                                      StringMap headers);
 
+    virtual Download* createMmsDownload(const QString& dbusOwner,
+                                        const QUrl& url,
+                                        const QString& hostname,
+                                        int port,
+                                        const QString& username,
+                                        const QString& password);
+
     // create downloads from a group download
 
     virtual Download* createDownloadForGroup(bool isConfined,

=== modified file 'ubuntu-download-manager-priv/downloads/file_download.cpp'
--- ubuntu-download-manager-priv/downloads/file_download.cpp	2014-01-29 10:02:08 +0000
+++ ubuntu-download-manager-priv/downloads/file_download.cpp	2014-01-29 12:16:44 +0000
@@ -526,10 +526,10 @@
     QFile::FileError error = QFile::NoError;
     if (_currentData != nullptr) {
         success = _currentData->remove();
-    
+
         if (!success)
             error = _currentData->error();
-    
+
         _currentData->deleteLater();
         _currentData = nullptr;
     } else {
@@ -538,7 +538,7 @@
         if (!success)
             error = tempFile->error();
     }
-    
+
     if (!success)
         qWarning() << "Error " << error <<
             "removing file with path" << _filePath;

=== modified file 'ubuntu-download-manager-priv/downloads/file_download.h'
--- ubuntu-download-manager-priv/downloads/file_download.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-priv/downloads/file_download.h	2014-01-29 12:16:44 +0000
@@ -94,6 +94,9 @@
  protected:
     void emitError(const QString& error) override;
 
+ protected:
+    RequestFactory* _requestFactory;
+
  private:
     QNetworkRequest buildRequest();
     void cleanUpCurrentData();
@@ -122,7 +125,6 @@
     QCryptographicHash::Algorithm _algo;
     NetworkReply* _reply = NULL;
     File* _currentData = NULL;
-    RequestFactory* _requestFactory;
 };
 
 }  // Daemon

=== modified file 'ubuntu-download-manager-priv/downloads/manager.cpp'
--- ubuntu-download-manager-priv/downloads/manager.cpp	2014-01-28 16:03:24 +0000
+++ ubuntu-download-manager-priv/downloads/manager.cpp	2014-01-29 12:16:44 +0000
@@ -175,6 +175,21 @@
 }
 
 QDBusObjectPath
+Manager::createMmsDownload(const QString& url,
+                           const QString& hostname,
+                           int port,
+                           const QString& username,
+                           const QString& password) {
+    DownloadCreationFunc createDownloadFunc =
+        [this, url, hostname, port, username, password](QString owner) {
+        auto download = _downloadFactory->createMmsDownload(owner, url,
+            hostname, port, username, password);
+        return download;
+    };
+    return createDownload(createDownloadFunc);
+}
+
+QDBusObjectPath
 Manager::createDownloadGroup(StructList downloads,
                              const QString& algo,
                              bool allowed3G,

=== modified file 'ubuntu-download-manager-priv/downloads/manager.h'
--- ubuntu-download-manager-priv/downloads/manager.h	2014-01-10 16:40:27 +0000
+++ ubuntu-download-manager-priv/downloads/manager.h	2014-01-29 12:16:44 +0000
@@ -61,6 +61,11 @@
 
  public slots:  // NOLINT(whitespace/indent)
     virtual QDBusObjectPath createDownload(DownloadStruct download);
+    virtual QDBusObjectPath createMmsDownload(const QString& url,
+                                              const QString& hostname,
+                                              int port,
+                                              const QString& username,
+                                              const QString& password);
 
     virtual QDBusObjectPath createDownloadGroup(StructList downloads,
                                                 const QString& algorithm,

=== added file 'ubuntu-download-manager-priv/downloads/mms_file_download.cpp'
--- ubuntu-download-manager-priv/downloads/mms_file_download.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-priv/downloads/mms_file_download.cpp	2014-01-29 12:16:44 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "system/apn_request_factory.h"
+#include "mms_file_download.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+namespace Daemon {
+
+MmsFileDownload::MmsFileDownload(const QString& id,
+                    const QString& path,
+                    bool isConfined,
+                    const QString& rootPath,
+                    const QUrl& url,
+                    const QVariantMap& metadata,
+                    const QMap<QString, QString>& headers,
+                    const QNetworkProxy& proxy,
+                    QObject* parent)
+    : FileDownload(id, path, isConfined, rootPath, url,
+                   metadata, headers, parent){
+    _requestFactory = new ApnRequestFactory(proxy);
+    setAddToQueue(false);
+}
+
+MmsFileDownload::~MmsFileDownload() {
+    delete _requestFactory;
+}
+
+}  // Daemon
+
+}  // DownloadManager
+
+}  // Ubuntu

=== added file 'ubuntu-download-manager-priv/downloads/mms_file_download.h'
--- ubuntu-download-manager-priv/downloads/mms_file_download.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-priv/downloads/mms_file_download.h	2014-01-29 12:16:44 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef MMS_FILE_DOWNLOAD_H
+#define MMS_FILE_DOWNLOAD_H
+
+#include <QNetworkProxy>
+#include <QObject>
+#include "file_download.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+namespace Daemon {
+
+class MmsFileDownload : public FileDownload {
+    Q_OBJECT
+
+ public:
+    MmsFileDownload(const QString& id,
+                    const QString& path,
+                    bool isConfined,
+                    const QString& rootPath,
+                    const QUrl& url,
+                    const QVariantMap& metadata,
+                    const QMap<QString, QString>& headers,
+                    const QNetworkProxy& proxy,
+                    QObject* parent = 0);
+    ~MmsFileDownload();
+};
+
+}  // Daemon
+
+}  // DownloadManager
+
+}  // Ubunut
+
+#endif // MMS_FILE_DOWNLOAD_H

=== modified file 'ubuntu-download-manager-priv/downloads/queue.cpp'
--- ubuntu-download-manager-priv/downloads/queue.cpp	2014-01-28 16:03:24 +0000
+++ ubuntu-download-manager-priv/downloads/queue.cpp	2014-01-29 12:16:44 +0000
@@ -44,8 +44,14 @@
     _sortedPaths.append(path);
     _downloads[path] = download;
 
-    connect(download, &Download::stateChanged,
-        this, &Queue::onDownloadStateChanged);
+    if (download->addToQueue()) {
+        connect(download, &Download::stateChanged,
+            this, &Queue::onManagedDownloadStateChanged);
+    } else {
+        connect(download, &Download::stateChanged,
+            this, &Queue::onUnmanagedDownloadStateChanged);
+    }
+
     emit downloadAdded(path);
 }
 
@@ -86,7 +92,7 @@
 }
 
 void
-Queue::onDownloadStateChanged() {
+Queue::onManagedDownloadStateChanged() {
     TRACE;
     // get the appdownload that emited the signal and
     // decide what to do with it
@@ -129,6 +135,25 @@
 }
 
 void
+Queue::onUnmanagedDownloadStateChanged() {
+    TRACE;
+    // grab the download and clean it when needed
+    Download* down = qobject_cast<Download*>(sender());
+    switch (down->state()) {
+        case Download::CANCEL:
+        case Download::ERROR:
+        case Download::FINISH:
+            // remove the registered object in dbus, remove the download
+            // and the adapter from the list
+            remove(down->path());
+            break;
+        default:
+            // do nothing
+            break;
+    }
+}
+
+void
 Queue::onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode) {
     TRACE << mode;
     if (mode != QNetworkInfo::UnknownMode) {

=== modified file 'ubuntu-download-manager-priv/downloads/queue.h'
--- ubuntu-download-manager-priv/downloads/queue.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-priv/downloads/queue.h	2014-01-29 12:16:44 +0000
@@ -54,7 +54,8 @@
     void downloadRemoved(QString path);
 
  private:
-    void onDownloadStateChanged();
+    void onManagedDownloadStateChanged();
+    void onUnmanagedDownloadStateChanged();
     void onCurrentNetworkModeChanged(QNetworkInfo::NetworkMode mode);
     void remove(const QString& path);
     void updateCurrentDownload();

=== added file 'ubuntu-download-manager-priv/system/apn_proxy.cpp'
--- ubuntu-download-manager-priv/system/apn_proxy.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-priv/system/apn_proxy.cpp	2014-01-29 12:16:44 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "apn_proxy.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+namespace System {
+
+ApnProxy::ApnProxy(QObject *parent)
+    : QObject(parent) {
+}
+
+QNetworkProxy
+ApnProxy::getProxy() {
+    QNetworkProxy proxy;
+    return proxy;
+}
+
+}
+
+}
+
+}

=== added file 'ubuntu-download-manager-priv/system/apn_proxy.h'
--- ubuntu-download-manager-priv/system/apn_proxy.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-priv/system/apn_proxy.h	2014-01-29 12:16:44 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef DOWNLOADER_LIB_APN_PROXY_H
+#define DOWNLOADER_LIB_APN_PROXY_H
+
+#include <QNetworkProxy>
+#include <QObject>
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+namespace System {
+
+class ApnProxy : public QObject {
+    Q_OBJECT
+
+ public:
+    explicit ApnProxy(QObject *parent = 0);
+
+    virtual QNetworkProxy getProxy();
+
+};
+
+} //  System
+
+}  // DownloadManager
+
+}  // Ubuntu
+#endif // APN_PROXY_H

=== added file 'ubuntu-download-manager-priv/system/apn_request_factory.cpp'
--- ubuntu-download-manager-priv/system/apn_request_factory.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-priv/system/apn_request_factory.cpp	2014-01-29 12:16:44 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "apn_proxy.h"
+#include "apn_request_factory.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+namespace System {
+
+ApnRequestFactory::ApnRequestFactory(const QNetworkProxy& proxy,
+                                     bool stoppable,
+                                     QObject* parent)
+    : RequestFactory(stoppable, parent) {
+    _nam->setProxy(proxy);
+}
+
+}  // System
+
+}  // DownloadManager
+
+}  // Ubuntu

=== added file 'ubuntu-download-manager-priv/system/apn_request_factory.h'
--- ubuntu-download-manager-priv/system/apn_request_factory.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-priv/system/apn_request_factory.h	2014-01-29 12:16:44 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef DOWNLOADER_LIB_APN_REQUEST_FACTORY_H
+#define DOWNLOADER_LIB_APN_REQUEST_FACTORY_H
+
+#include <QNetworkProxy>
+#include <QObject>
+#include "request_factory.h"
+
+namespace Ubuntu {
+
+namespace DownloadManager {
+
+namespace System {
+
+class ApnRequestFactory : public RequestFactory {
+    Q_OBJECT
+
+ public:
+    ApnRequestFactory(const QNetworkProxy& proxy,
+                      bool stoppable = false,
+                      QObject* parent=0);
+};
+
+}  // System
+
+}  // DownloadManager
+
+}  // Ubuntu
+
+#endif // APN_REQUEST_FACTORY_H

=== modified file 'ubuntu-download-manager-priv/system/request_factory.h'
--- ubuntu-download-manager-priv/system/request_factory.h	2013-11-27 16:00:50 +0000
+++ ubuntu-download-manager-priv/system/request_factory.h	2014-01-29 12:16:44 +0000
@@ -62,6 +62,9 @@
     void onFinished();
     void onSslErrors(const QList<QSslError>&);
 
+ protected:
+    QNetworkAccessManager* _nam;
+
  private:
     // used for the singleton
     static RequestFactory* _instance;
@@ -72,7 +75,6 @@
     bool _stoppable = false;
     QList<NetworkReply*> _replies;
     QList<QSslCertificate> _certs;
-    QNetworkAccessManager* _nam;
 };
 
 }  // System

=== modified file 'ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro'
--- ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro	2014-01-24 11:54:24 +0000
+++ ubuntu-download-manager-priv/ubuntu-download-manager-priv.pro	2014-01-29 12:16:44 +0000
@@ -38,7 +38,10 @@
     system/network_reply.cpp \
     system/dbus_proxy.cpp \
     downloads/state_machines/state.cpp \
-    downloads/state_machines/final_state.cpp
+    downloads/state_machines/final_state.cpp \
+    system/apn_request_factory.cpp \
+    downloads/mms_file_download.cpp \
+    system/apn_proxy.cpp
 
 HEADERS +=\
     app-downloader-lib_global.h \
@@ -69,7 +72,10 @@
     system/network_reply.h \
     system/dbus_proxy.h \
     downloads/state_machines/state.h \
-    downloads/state_machines/final_state.h
+    downloads/state_machines/final_state.h \
+    system/apn_request_factory.h \
+    downloads/mms_file_download.h \
+    system/apn_proxy.h
 
 OTHER_FILES += \
     generate_adaptors.sh \

=== modified file 'ubuntu-download-manager-test-lib/ubuntu-download-manager-test-lib.pro'
--- ubuntu-download-manager-test-lib/ubuntu-download-manager-test-lib.pro	2014-01-22 10:30:56 +0000
+++ ubuntu-download-manager-test-lib/ubuntu-download-manager-test-lib.pro	2014-01-29 12:16:44 +0000
@@ -32,7 +32,8 @@
            ubuntu/download_manager/tests/client/testing_daemon.cpp \
            ubuntu/download_manager/tests/client/testing_manager.cpp \
            ubuntu/download_manager/tests/client/testing_manager_adaptor.cpp \
-           ubuntu/download_manager/tests/client/testing_interface.cpp
+           ubuntu/download_manager/tests/client/testing_interface.cpp \
+           ubuntu/download_manager/tests/server/apn_request_factory.cpp
 
 HEADERS += ubuntu/download_manager/tests/base_testcase.h \
            ubuntu/download_manager/tests/fake.h\
@@ -58,7 +59,8 @@
            ubuntu/download_manager/tests/client/testing_daemon.h \
            ubuntu/download_manager/tests/client/testing_manager.h \
            ubuntu/download_manager/tests/client/testing_manager_adaptor.h \
-           ubuntu/download_manager/tests/client/testing_interface.h
+           ubuntu/download_manager/tests/client/testing_interface.h \
+           ubuntu/download_manager/tests/server/apn_request_factory.h
 
 LIBS += -L$$OUT_PWD/../ubuntu-download-manager-common/ -lubuntu-download-manager-common
 

=== added file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apn_request_factory.cpp'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apn_request_factory.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apn_request_factory.cpp	2014-01-29 12:16:44 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "apn_request_factory.h"
+
+FakeApnRequestFactory::FakeApnRequestFactory(const QNetworkProxy& proxy,
+                                             bool stoppable,
+                                             QObject* parent)
+    : ApnRequestFactory(proxy, stoppable, parent) {
+}
+
+QString
+FakeApnRequestFactory::proxyHost() {
+    return _nam->proxy().hostName();
+}
+
+int
+FakeApnRequestFactory::proxyPort() {
+    return _nam->proxy().port();
+}
+
+QString
+FakeApnRequestFactory::proxyUsername() {
+    return _nam->proxy().user();
+}
+
+QString
+FakeApnRequestFactory::proxyPassword() {
+    return _nam->proxy().password();
+}
+
+QNetworkProxy::ProxyType
+FakeApnRequestFactory::proxyType() {
+    return _nam->proxy().type();
+}

=== added file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apn_request_factory.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apn_request_factory.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/apn_request_factory.h	2014-01-29 12:16:44 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef FAKE_APN_REQUEST_FACTORY_H
+#define FAKE_APN_REQUEST_FACTORY_H
+
+#include <QObject>
+#include <system/apn_request_factory.h>
+#include "ubuntu/download_manager/tests/fake.h"
+
+using namespace  Ubuntu::DownloadManager::System;
+
+class FakeApnRequestFactory : public ApnRequestFactory {
+    Q_OBJECT
+
+ public:
+    FakeApnRequestFactory(const QNetworkProxy& proxy,
+                          bool stoppable = false,
+                          QObject* parent=0);
+
+    QString proxyHost();
+    int proxyPort();
+    QString proxyUsername();
+    QString proxyPassword();
+    QNetworkProxy::ProxyType proxyType();
+};
+
+#endif // FAKE_APN_REQUEST_FACTORY_H

=== modified file 'ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/download.h'
--- ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/download.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-test-lib/ubuntu/download_manager/tests/server/download.h	2014-01-29 12:16:44 +0000
@@ -18,6 +18,7 @@
 
 #ifndef FAKE_DOWNLOAD_H
 #define FAKE_DOWNLOAD_H
+
 #include <QSharedPointer>
 #include <downloads/file_download.h>
 #include <system/system_network_info.h>
@@ -62,6 +63,8 @@
     void emitFinished(const QString& path);
     void emitError(const QString& error);
 
+    using Download::setAddToQueue;
+
  private:
     bool _canDownload;
 };

=== added file 'ubuntu-download-manager-tests/downloads/test_base_download.cpp'
--- ubuntu-download-manager-tests/downloads/test_base_download.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/downloads/test_base_download.cpp	2014-01-29 12:16:44 +0000
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "test_base_download.h"
+
+TestBaseDownload::TestBaseDownload(QObject *parent)
+    : BaseTestCase("TestBaseDownload", parent){
+}
+
+void
+TestBaseDownload::init() {
+    BaseTestCase::init();
+
+    _id = "download-id";
+    _path = "path-to-be-used";
+    _isConfined = false;
+    _rootPath = "/root/path/to/use";
+    _url = QUrl("http://test.com");
+}
+
+void
+TestBaseDownload::testStartQueued() {
+    QScopedPointer<FakeDownload> down(
+        new FakeDownload(_id, _path, _isConfined, _rootPath, _url,
+            _metadata, _headers));
+    down->record();
+    down->start();
+
+    QCOMPARE(0, down->calledMethods().count());
+}
+
+void
+TestBaseDownload::testStartNotQueued() {
+    QScopedPointer<FakeDownload> down(
+        new FakeDownload(_id, _path, _isConfined, _rootPath, _url,
+            _metadata, _headers));
+    down->record();
+    down->setAddToQueue(false);
+    down->start();
+
+    QCOMPARE(1, down->calledMethods().count());
+    QCOMPARE(QString("startDownload"), down->calledMethods()[0].methodName());
+}
+
+void
+TestBaseDownload::testPauseQueued() {
+    QScopedPointer<FakeDownload> down(
+        new FakeDownload(_id, _path, _isConfined, _rootPath, _url,
+            _metadata, _headers));
+    down->record();
+    down->pause();
+
+    QCOMPARE(0, down->calledMethods().count());
+}
+
+void
+TestBaseDownload::testPauseNotQueued() {
+    QScopedPointer<FakeDownload> down(
+        new FakeDownload(_id, _path, _isConfined, _rootPath, _url,
+            _metadata, _headers));
+    down->record();
+    down->setAddToQueue(false);
+    down->pause();
+
+    QCOMPARE(1, down->calledMethods().count());
+    QCOMPARE(QString("pauseDownload"), down->calledMethods()[0].methodName());
+}
+
+void
+TestBaseDownload::testResumeQueued() {
+    QScopedPointer<FakeDownload> down(
+        new FakeDownload(_id, _path, _isConfined, _rootPath, _url,
+            _metadata, _headers));
+    down->record();
+    down->resume();
+
+    QCOMPARE(0, down->calledMethods().count());
+}
+
+void
+TestBaseDownload::testResumeNotQueued() {
+    QScopedPointer<FakeDownload> down(
+        new FakeDownload(_id, _path, _isConfined, _rootPath, _url,
+            _metadata, _headers));
+    down->record();
+    down->setAddToQueue(false);
+    down->resume();
+
+    QCOMPARE(1, down->calledMethods().count());
+    QCOMPARE(QString("resumeDownload"), down->calledMethods()[0].methodName());
+}
+
+void
+TestBaseDownload::testCancelQueued() {
+    QScopedPointer<FakeDownload> down(
+        new FakeDownload(_id, _path, _isConfined, _rootPath, _url,
+            _metadata, _headers));
+    down->record();
+    down->cancel();
+
+    QCOMPARE(0, down->calledMethods().count());
+}
+
+void
+TestBaseDownload::testCancelNotQueued() {
+    QScopedPointer<FakeDownload> down(
+        new FakeDownload(_id, _path, _isConfined, _rootPath, _url,
+            _metadata, _headers));
+    down->record();
+    down->setAddToQueue(false);
+    down->cancel();
+
+    QCOMPARE(1, down->calledMethods().count());
+    QCOMPARE(QString("cancelDownload"), down->calledMethods()[0].methodName());
+}

=== added file 'ubuntu-download-manager-tests/downloads/test_base_download.h'
--- ubuntu-download-manager-tests/downloads/test_base_download.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/downloads/test_base_download.h	2014-01-29 12:16:44 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef TEST_BASE_DOWNLOAD_H
+#define TEST_BASE_DOWNLOAD_H
+
+#include <QObject>
+#include <ubuntu/download_manager/tests/server/download.h>
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+
+class TestBaseDownload : public BaseTestCase {
+    Q_OBJECT
+
+ public:
+    explicit TestBaseDownload(QObject *parent = 0);
+
+ private slots:  // NOLINT(whitespace/indent)
+
+    void init() override;
+
+    void testStartQueued();
+    void testStartNotQueued();
+    void testPauseQueued();
+    void testPauseNotQueued();
+    void testResumeQueued();
+    void testResumeNotQueued();
+    void testCancelQueued();
+    void testCancelNotQueued();
+
+ private:
+    QString _id;
+    QString _path;
+    bool _isConfined;
+    QString _rootPath;
+    QUrl _url;
+    QVariantMap _metadata;
+    QMap<QString, QString> _headers;
+};
+
+DECLARE_TEST(TestBaseDownload)
+
+#endif // TEST_BASE_DOWNLOAD_H

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_factory.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_factory.cpp	2013-12-02 12:17:35 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_factory.cpp	2014-01-29 12:16:44 +0000
@@ -17,6 +17,7 @@
  */
 
 #include <downloads/file_download.h>
+#include <downloads/mms_file_download.h>
 #include <ubuntu/download_manager/system/hash_algorithm.h>
 #include <system/file_manager.h>
 #include <system/uuid_utils.h>
@@ -93,6 +94,25 @@
 }
 
 void
+TestDownloadFactory::testCreateMmsDownload() {
+    _apparmor->record();
+
+    QString hash = "my-hash";
+    QString algo = "Md5";
+    QString hostname = "http://hostname.com";
+    int port = 88;
+    QString username = "username";
+    QString password = "password";
+
+
+    // same as above but assert hash and hash algo
+    QScopedPointer<Download> download(_downFactory->createMmsDownload(
+        "", QUrl("http://example.com"), hostname, port, username, password));
+    auto mms = qobject_cast<MmsFileDownload*>(download.data());
+    QVERIFY(mms != nullptr);
+}
+
+void
 TestDownloadFactory::testCreateGroupDownload() {
     _apparmor->record();
 

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_factory.h'
--- ubuntu-download-manager-tests/downloads/test_download_factory.h	2014-01-10 16:38:56 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_factory.h	2014-01-29 12:16:44 +0000
@@ -45,6 +45,7 @@
 
     void testCreateDownload();
     void testCreateDownloadWithHash();
+    void testCreateMmsDownload();
     void testCreateGroupDownload();
     void testCreateDownloadWithValidUuid();
     void testCreateDownloadWithNullUuid();

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_queue.cpp'
--- ubuntu-download-manager-tests/downloads/test_download_queue.cpp	2014-01-20 16:54:58 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_queue.cpp	2014-01-29 12:16:44 +0000
@@ -505,3 +505,56 @@
     QCOMPARE(QString("canDownload"), calledMethods[0].methodName());
     QCOMPARE(QString("startDownload"), calledMethods[1].methodName());
 }
+
+void
+TestDownloadQueue::testNewUnmanagedIncreasesNumber() {
+    _q->add(_first);
+
+    QCOMPARE(1, _q->size());
+    _second->setAddToQueue(false);
+
+    _q->add(_second);
+    QCOMPARE(2, _q->size());
+}
+
+void
+TestDownloadQueue::testErrorUnmanagedDecreasesNumber() {
+    QSignalSpy spy(_q, SIGNAL(downloadRemoved(QString)));
+    _first->setAddToQueue(false);
+
+    _q->add(_first);
+
+    QCOMPARE(1, _q->size());
+    _first->emitError("Error");
+
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(0, _q->size());
+}
+
+void
+TestDownloadQueue::testFinishUnmanagedDecreasesNumber() {
+    QSignalSpy spy(_q, SIGNAL(downloadRemoved(QString)));
+    _first->setAddToQueue(false);
+
+    _q->add(_first);
+
+    QCOMPARE(1, _q->size());
+    _first->emitFinished("path");
+
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(0, _q->size());
+}
+
+void
+TestDownloadQueue::testCancelUnmanagedDecreasesNumber() {
+    QSignalSpy spy(_q, SIGNAL(downloadRemoved(QString)));
+    _first->setAddToQueue(false);
+
+    _q->add(_first);
+
+    QCOMPARE(1, _q->size());
+    _first->cancel();
+
+    QTRY_COMPARE(spy.count(), 1);
+    QCOMPARE(0, _q->size());
+}

=== modified file 'ubuntu-download-manager-tests/downloads/test_download_queue.h'
--- ubuntu-download-manager-tests/downloads/test_download_queue.h	2014-01-22 16:53:05 +0000
+++ ubuntu-download-manager-tests/downloads/test_download_queue.h	2014-01-29 12:16:44 +0000
@@ -57,6 +57,12 @@
     void testDownloadFinishedOtherReady();
     void testDownloadErrorWithOtherReady();
 
+    // unmanaged downloads tests
+    void testNewUnmanagedIncreasesNumber();
+    void testErrorUnmanagedDecreasesNumber();
+    void testFinishUnmanagedDecreasesNumber();
+    void testCancelUnmanagedDecreasesNumber();
+
  private:
     bool _isConfined;
     QString _rootPath;

=== added file 'ubuntu-download-manager-tests/downloads/test_mms_download.cpp'
--- ubuntu-download-manager-tests/downloads/test_mms_download.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/downloads/test_mms_download.cpp	2014-01-29 12:16:44 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "test_mms_download.h"
+
+TestMmsDownload::TestMmsDownload(QObject* parent)
+    : BaseTestCase("TestMmsDownload", parent) {
+}
+
+void
+TestMmsDownload::testNetworkAccessManager() {
+    QString id = "id of the download";
+    QString path = "my-file";
+    bool isConfined = false;
+    QString rootPath = "/root/path/to/use";
+    QUrl url("http://example.com");
+    QVariantMap metadata;
+    QMap<QString, QString> headers;
+    QString hostname = "http://example.com";
+    int port = 80;
+    QString username = "username";
+    QString password = "password";
+    QNetworkProxy proxy(QNetworkProxy::HttpProxy, hostname,
+        port, username, password);
+
+    QScopedPointer<PublicMmsFileDownload> down(
+        new PublicMmsFileDownload(id, path, isConfined, rootPath,
+            url, metadata, headers, proxy));
+    ApnRequestFactory* nam = qobject_cast<ApnRequestFactory*>(down->nam());
+    QVERIFY(nam != nullptr);
+}
+
+void
+TestMmsDownload::testAddToQueue() {
+    QString id = "id of the download";
+    QString path = "my-file";
+    bool isConfined = false;
+    QString rootPath = "/root/path/to/use";
+    QUrl url("http://example.com");
+    QVariantMap metadata;
+    QMap<QString, QString> headers;
+    QString hostname = "http://example.com";
+    int port = 80;
+    QString username = "username";
+    QString password = "password";
+    QNetworkProxy proxy(QNetworkProxy::HttpProxy, hostname,
+        port, username, password);
+
+    QScopedPointer<PublicMmsFileDownload> down(
+        new PublicMmsFileDownload(id, path, isConfined, rootPath,
+            url, metadata, headers, proxy));
+    QVERIFY(!down->addToQueue());
+}

=== added file 'ubuntu-download-manager-tests/downloads/test_mms_download.h'
--- ubuntu-download-manager-tests/downloads/test_mms_download.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/downloads/test_mms_download.h	2014-01-29 12:16:44 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef TEST_MMS_DOWNLOAD_H
+#define TEST_MMS_DOWNLOAD_H
+
+#include <QObject>
+#include <system/request_factory.h>
+#include <system/apn_request_factory.h>
+#include <downloads/mms_file_download.h>
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+
+
+using namespace Ubuntu::DownloadManager::Daemon;
+using namespace Ubuntu::DownloadManager::System;
+
+class PublicMmsFileDownload : public MmsFileDownload {
+    Q_OBJECT
+
+ public:
+    PublicMmsFileDownload(const QString& id,
+                          const QString& path,
+                          bool isConfined,
+                          const QString& rootPath,
+                          const QUrl& url,
+                          const QVariantMap& metadata,
+                          const QMap<QString, QString>& headers,
+                          const QNetworkProxy& proxy,
+                          QObject* parent = 0)
+        : MmsFileDownload(id, path, isConfined, rootPath, url, metadata,
+              headers, proxy, parent) {
+    }
+
+    RequestFactory* nam() {
+        return _requestFactory;
+    }
+};
+
+class TestMmsDownload : public BaseTestCase {
+    Q_OBJECT
+
+ public:
+    explicit TestMmsDownload(QObject *parent = 0);
+
+ private slots:  // NOLINT(whitespace/indent)
+
+    void testNetworkAccessManager();
+    void testAddToQueue();
+
+};
+
+DECLARE_TEST(TestMmsDownload)
+
+#endif // TEST_MMS_DOWNLOAD_H

=== added directory 'ubuntu-download-manager-tests/system'
=== added file 'ubuntu-download-manager-tests/system/test_apn_request_factory.cpp'
--- ubuntu-download-manager-tests/system/test_apn_request_factory.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/system/test_apn_request_factory.cpp	2014-01-29 12:16:44 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QScopedPointer>
+#include <ubuntu/download_manager/tests/server/apn_request_factory.h>
+#include "test_apn_request_factory.h"
+
+TestApnRequestFactory::TestApnRequestFactory(QObject* parent)
+    : BaseTestCase("TestApnRequestFactory", parent) {
+}
+
+void
+TestApnRequestFactory::testProxySet_data() {
+    QTest::addColumn<QString>("hostName");
+    QTest::addColumn<int>("port");
+    QTest::addColumn<QString>("username");
+    QTest::addColumn<QString>("password");
+
+    QTest::newRow("First row") << "http://proxy.com" << 88
+        << "mandel" << "Qwsxd";
+    QTest::newRow("Second row") << "http://ubuntu.com" << 99
+        << "mark" << "trusty";
+    QTest::newRow("Third row") << "http://one.ubuntu.com" << 200
+        << "one" << "drop";
+}
+
+void
+TestApnRequestFactory::testProxySet() {
+    QFETCH(QString, hostName);
+    QFETCH(int, port);
+    QFETCH(QString, username);
+    QFETCH(QString, password);
+
+    QNetworkProxy proxy(QNetworkProxy::HttpProxy, hostName, port,
+        username, password);
+    QScopedPointer<FakeApnRequestFactory> nam(new FakeApnRequestFactory(proxy));
+
+    QCOMPARE(hostName, nam->proxyHost());
+    QCOMPARE(port, nam->proxyPort());
+    QCOMPARE(username, nam->proxyUsername());
+    QCOMPARE(password, nam->proxyPassword());
+}

=== added file 'ubuntu-download-manager-tests/system/test_apn_request_factory.h'
--- ubuntu-download-manager-tests/system/test_apn_request_factory.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/system/test_apn_request_factory.h	2014-01-29 12:16:44 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef TEST_APN_REQUEST_FACTORY_H
+#define TEST_APN_REQUEST_FACTORY_H
+
+#include <QObject>
+#include <ubuntu/download_manager/tests/base_testcase.h>
+#include <ubuntu/download_manager/tests/test_runner.h>
+
+class TestApnRequestFactory : public BaseTestCase {
+    Q_OBJECT
+
+public:
+    explicit TestApnRequestFactory(QObject *parent = 0);
+
+ private slots:  // NOLINT(whitespace/indent)
+
+    void testProxySet_data();
+    void testProxySet();
+
+};
+
+DECLARE_TEST(TestApnRequestFactory)
+
+#endif // TEST_APN_REQUEST_FACTORY_H

=== modified file 'ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro'
--- ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-12-13 08:30:46 +0000
+++ ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2014-01-29 12:16:44 +0000
@@ -25,7 +25,10 @@
     downloads/state_machines/test_cancel_download_transition.cpp \
     downloads/state_machines/test_resume_download_transition.cpp \
     downloads/state_machines/test_final_state.cpp \
-    downloads/state_machines/test_file_download_sm.cpp
+    downloads/state_machines/test_file_download_sm.cpp \
+    system/test_apn_request_factory.cpp \
+    downloads/test_mms_download.cpp \
+    downloads/test_base_download.cpp
 
 HEADERS += \
     downloads/test_download.h \
@@ -42,7 +45,10 @@
     downloads/state_machines/test_cancel_download_transition.h \
     downloads/state_machines/test_resume_download_transition.h \
     downloads/state_machines/test_final_state.h \
-    downloads/state_machines/test_file_download_sm.h
+    downloads/state_machines/test_file_download_sm.h \
+    system/test_apn_request_factory.h \
+    downloads/test_mms_download.h \
+    downloads/test_base_download.h
 
 LIBS += -L$$OUT_PWD/../ubuntu-download-manager-priv/ -lubuntu-download-manager-priv