Merge lp:~mikemc/unity-scope-click/dlmgr-tests-again-again into lp:unity-scope-click

[Mike McCracken]

- rewrite tests for download manager interface to use Google test and mock.

- rewrite download manager tests to use Google test and mock.
- includes a wrapper interface for SSOService to allow us to mock it.
- adds to existing mock NAM
- reenable building of download_manager_tool

Only adds one test for download manager. Proposing at this point in the interest of shorter diffs.

Run with 'make test'.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:133
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/219/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/117
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/117

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/219/rebuild

review: Approve (continuous-integration)

[Manuel de la Peña (mandel)]

explicit is onyl useful when we have a constructor that has an argument that can be castted, there is no need to use it here:

217 + explicit CredentialsService();

The following is probably a matter of conventions and personal stlye, but are we not using some kind of convention to indicate that we are using instance members, for example:

231 +private:
232 + QScopedPointer<UbuntuOne::SSOService> ssoService;

I would expect that to me m_ssoSrvice or _ssoService. It just gives context in the methods when working with the vars.

In the following connections:

69 + QMetaObject::Connection c = connect(impl->credentialsService.data(), &click::CredentialsService::credentialsFound,
70 this, &DownloadManager::handleCredentialsFound);
71 if(!c){
72 qDebug() << "failed to connect to credentialsFound";
73 }

Since we are using the new connection style that is checked at compile time.. do we really need to do that if?? If not I'd remove it, less code less bugs.

review: Needs Fixing

[Thomas Voß (thomas-voss)]

On first glance, one thing sticks out to me: Why do you need the custom test_main.cpp if the fixtures all have an internal QCoreApplication instance?

review: Needs Information

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:134
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/220/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/118
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/118

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/220/rebuild

review: Approve (continuous-integration)

[lp:~mikemc/unity-scope-click/dlmgr-tests-again-again]

135. By Mike McCracken on 2014-02-05

remove unnecessary custom main

[Mike McCracken (mikemc)]

@thomas-voss : thanks for pointing that out, indeed the custom main is not needed.
It isn't used in the build, and should have been deleted already.

[Mike McCracken (mikemc)]

@mandel - I've removed the 'explicit'.

I'll make a note of the convention for using _ . I haven't changed it yet though, need to see if we're going to follow a particular convention everywhere.

As for the connection checks, let's leave them in until we know for sure that the new-style connections work on ARM.
As you probably remember, in an earlier version of this code, we had an issue where the connections compiled fine on both ARM and x86 and worked fine on x86, but failed to execute correctly on ARM. That was the initial reason for adding those checks and we haven't ironed that out yet.

[lp:~mikemc/unity-scope-click/dlmgr-tests-again-again]

136. By Mike McCracken on 2014-02-05

remove unneeded use of explicit

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:136
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/221/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/119
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/119

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/221/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

> @mandel - I've removed the 'explicit'.
>
> I'll make a note of the convention for using _ . I haven't changed it yet
> though, need to see if we're going to follow a particular convention
> everywhere.

As proposed by tvoss elsewhere, let's adhere to the style guidelines of the Scopes API and the Unity API teams:
http://bazaar.launchpad.net/~rocket-scientists/canonical-client-development-guidelines/trunk/view/head:/c%2B%2B/cppguide.xml#L2276
(please bookmark that).

According to the above, the trailing _ is not needed for classes with few member variables. And the leading m_ is only suggested for code that need to fit a framework where it's used (like Qt).

My guess is that's no decoration is needed in this case.

> As for the connection checks, let's leave them in until we know for sure that
> the new-style connections work on ARM.

Perhaps we can make it an assert then? That would be easier to catch in the arm jenkins.

[Manuel de la Peña (mandel)]

> > @mandel - I've removed the 'explicit'.
> >
> > I'll make a note of the convention for using _ . I haven't changed it yet
> > though, need to see if we're going to follow a particular convention
> > everywhere.
>
> As proposed by tvoss elsewhere, let's adhere to the style guidelines of the
> Scopes API and the Unity API teams:
> http://bazaar.launchpad.net/~rocket-scientists/canonical-client-development-
> guidelines/trunk/view/head:/c%2B%2B/cppguide.xml#L2276
> (please bookmark that).
>
> According to the above, the trailing _ is not needed for classes with few
> member variables. And the leading m_ is only suggested for code that need to
> fit a framework where it's used (like Qt).
>
> My guess is that's no decoration is needed in this case.

Ok, I mentioned because there is a _dm one being used in a diff class and would be nice to be consistent.

>
> > As for the connection checks, let's leave them in until we know for sure
> that
> > the new-style connections work on ARM.
>
> Perhaps we can make it an assert then? That would be easier to catch in the
> arm jenkins.

Sounds reasonable, certainly not something that should block the merge.

review: Approve

[Mike McCracken (mikemc)]

ping @thomas-voss - I addressed your needs-info, would you mind taking a look again?
Thanks!

[lp:~mikemc/unity-scope-click/dlmgr-tests-again-again]

137. By Mike McCracken on 2014-02-06

merge with trunk, fix minor conflict in cmakelists' adding test source files.

[Mike McCracken (mikemc)]

@thomas-voss, also please note that the actual test case added in this branch is completely reworked in the following branch: ~mikemc/unity-scope-click/dlmgr-network-error-tests

In particular, a bunch of code cleanup you did on the test case on Tuesday is incorporated there.
At the time I thought this branch was about to land, so I didn't include those changes here.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:137
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/227/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/125

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/227/rebuild

review: Approve (continuous-integration)

[Thomas Voß (thomas-voss)]

Thanks for addressing my question/comment. With that: LGTM.

review: Approve

=== modified file 'scope/click/CMakeLists.txt'
--- scope/click/CMakeLists.txt	2014-02-04 23:53:28 +0000
+++ scope/click/CMakeLists.txt	2014-02-06 18:36:09 +0000
@@ -5,6 +5,7 @@
 add_library(${SCOPE_LIB_NAME} SHARED
   query.cpp
   scope.cpp
+  ubuntuone_credentials.cpp
   download-manager.cpp
   network_access_manager.cpp
   index.cpp
@@ -13,7 +14,7 @@
 
 configure_file(config.h.in config.h)
 
-include_directories (${CMAKE_CURRENT_BINARY_DIR})
+include_directories (${CMAKE_BINARY_DIR}/scope)
 
 qt5_use_modules (${SCOPE_LIB_NAME} Network)
 

=== modified file 'scope/click/download-manager.cpp'
--- scope/click/download-manager.cpp	2014-01-28 10:11:21 +0000
+++ scope/click/download-manager.cpp	2014-02-06 18:36:09 +0000
@@ -34,44 +34,45 @@
 #include <QString>
 #include <QTimer> 
 
-#include <ssoservice.h>
+#include <ubuntuone_credentials.h>
+
 #include <token.h>
-#include <requests.h>
-#include <errormessages.h>
 
 namespace u1 = UbuntuOne;
 
 struct click::DownloadManager::Private
 {
-    Private(const QSharedPointer<click::network::AccessManager>& networkAccessManager)
-        : nam(networkAccessManager)
+    Private(const QSharedPointer<click::network::AccessManager>& networkAccessManager,
+            const QSharedPointer<click::CredentialsService>& credentialsService)
+        : nam(networkAccessManager), credentialsService(credentialsService)
     {
     }
 
     void updateCredentialsFromService()
     {
-        service.getCredentials();
+        credentialsService->getCredentials();
     }
 
-    u1::SSOService service;
     QSharedPointer<click::network::AccessManager> nam;
+    QSharedPointer<click::CredentialsService> credentialsService;
     QSharedPointer<click::network::Reply> reply;
     QString downloadUrl;
 };
 
 click::DownloadManager::DownloadManager(const QSharedPointer<click::network::AccessManager>& networkAccessManager,
+                                        const QSharedPointer<click::CredentialsService>& credentialsService,
                                         QObject *parent)
     : QObject(parent),
-      impl(new Private(networkAccessManager))
+      impl(new Private(networkAccessManager, credentialsService))
 {
-    QMetaObject::Connection c = connect(&impl->service, &u1::SSOService::credentialsFound,
+    QMetaObject::Connection c = connect(impl->credentialsService.data(), &click::CredentialsService::credentialsFound,
                                         this, &DownloadManager::handleCredentialsFound);
     if(!c){
         qDebug() << "failed to connect to credentialsFound";
     }
 
-    c = connect(&impl->service, &u1::SSOService::credentialsNotFound,
-                         this, &DownloadManager::handleCredentialsNotFound);
+    c = connect(impl->credentialsService.data(), &click::CredentialsService::credentialsNotFound,
+                this, &DownloadManager::handleCredentialsNotFound);
     if(!c){
         qDebug() << "failed to connect to credentialsNotFound";
     }

=== modified file 'scope/click/download-manager.h'
--- scope/click/download-manager.h	2014-02-04 22:45:20 +0000
+++ scope/click/download-manager.h	2014-02-06 18:36:09 +0000
@@ -30,9 +30,10 @@
 #ifndef CLICK_DOWNLOAD_MANAGER_H
 #define CLICK_DOWNLOAD_MANAGER_H
 
-#include "config.h"
+#include <click/config.h>
 
 #include "network_access_manager.h"
+#include "ubuntuone_credentials.h"
 
 #include <QDebug>
 #include <QNetworkReply>
@@ -54,6 +55,7 @@
 
 public:
     DownloadManager(const QSharedPointer<click::network::AccessManager>& networkAccessManager,
+                    const QSharedPointer<click::CredentialsService>& ssoService,
                     QObject *parent = 0);
     virtual ~DownloadManager();
 

=== added file 'scope/click/ubuntuone_credentials.cpp'
--- scope/click/ubuntuone_credentials.cpp	1970-01-01 00:00:00 +0000
+++ scope/click/ubuntuone_credentials.cpp	2014-02-06 18:36:09 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include "ubuntuone_credentials.h"
+
+namespace u1 = UbuntuOne;
+
+click::CredentialsService::CredentialsService()
+{
+    ssoService.reset(new u1::SSOService());
+    // Forward signals directly:
+    connect(ssoService.data(), &u1::SSOService::credentialsFound,
+            this, &click::CredentialsService::credentialsFound);
+    connect(ssoService.data(), &u1::SSOService::credentialsNotFound,
+            this, &click::CredentialsService::credentialsNotFound);
+    connect(ssoService.data(), &u1::SSOService::credentialsDeleted,
+            this, &click::CredentialsService::credentialsDeleted);
+}
+
+click::CredentialsService::~CredentialsService()
+{
+}
+
+void click::CredentialsService::getCredentials()
+{
+    ssoService->getCredentials();
+}
+
+void click::CredentialsService::invalidateCredentials()
+{
+    ssoService->invalidateCredentials();
+}

=== added file 'scope/click/ubuntuone_credentials.h'
--- scope/click/ubuntuone_credentials.h	1970-01-01 00:00:00 +0000
+++ scope/click/ubuntuone_credentials.h	2014-02-06 18:36:09 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#ifndef _UBUNTUONE_CREDENTIALS_H_
+#define _UBUNTUONE_CREDENTIALS_H_
+
+#include <ssoservice.h>
+#include <token.h>
+
+namespace click
+{
+
+class CredentialsService : public UbuntuOne::SSOService
+{
+    Q_OBJECT
+
+public:
+    CredentialsService();
+    CredentialsService(const CredentialsService&) = delete;
+    virtual ~CredentialsService();
+    
+    CredentialsService& operator=(const CredentialsService&) = delete;
+
+    virtual void getCredentials();
+    virtual void invalidateCredentials();
+
+signals:
+    void credentialsDeleted();
+    void credentialsFound(const UbuntuOne::Token& token);
+    void credentialsNotFound();
+
+private:
+    QScopedPointer<UbuntuOne::SSOService> ssoService;
+
+}; // CredentialsService
+
+
+} // namespace click
+#endif /* _UBUNTUONE_CREDENTIALS_H_ */

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-02-04 23:53:28 +0000
+++ scope/tests/CMakeLists.txt	2014-02-06 18:36:09 +0000
@@ -16,12 +16,14 @@
 
 include_directories (
   ${CMAKE_SOURCE_DIR}/scope
+  ${CMAKE_BINARY_DIR}/scope
   ${GTEST_INCLUDE_DIR}
   ${GMOCK_INCLUDE_DIR}
 )
 
 add_executable (${CLICKSCOPE_TESTS_TARGET}
   mock_network_access_manager.h
+  test_download_manager.cpp
   test_index.cpp
   test_webclient.cpp
 )
@@ -46,4 +48,4 @@
 )
 
 add_subdirectory(integration)
-#add_subdirectory(download_manager_tool)
+add_subdirectory(download_manager_tool)

=== modified file 'scope/tests/download_manager_tool/download_manager_tool.cpp'
--- scope/tests/download_manager_tool/download_manager_tool.cpp	2014-01-27 18:20:27 +0000
+++ scope/tests/download_manager_tool/download_manager_tool.cpp	2014-02-06 18:36:09 +0000
@@ -38,9 +38,11 @@
 DownloadManagerTool::DownloadManagerTool(QObject *parent):
      QObject(parent)
 {
-    QObject::connect(&_dm, &click::DownloadManager::clickTokenFetched,
+    _dm = new click::DownloadManager(QSharedPointer<click::network::AccessManager>(new click::network::AccessManager()),
+                                     QSharedPointer<click::CredentialsService>(new click::CredentialsService()));
+    QObject::connect(_dm, &click::DownloadManager::clickTokenFetched,
                      this, &DownloadManagerTool::handleFetchResponse);
-    QObject::connect(&_dm, &click::DownloadManager::clickTokenFetchError,
+    QObject::connect(_dm, &click::DownloadManager::clickTokenFetchError,
                      this, &DownloadManagerTool::handleFetchResponse);
 }
 
@@ -52,14 +54,14 @@
 
 void DownloadManagerTool::fetchClickToken()
 {
-    _dm.fetchClickToken(_url);
+    _dm->fetchClickToken(_url);
 }
 
 int main(int argc, char *argv[])
 {
 
     QCoreApplication a(argc, argv);
-    DownloadManagerTool tool(&a);
+    DownloadManagerTool tool;
 
     if (argc != 2) {
         QTextStream(stderr) << "Usage: download_manager_tool https://public.apps.ubuntu.com/download/<<rest of click package dl url>>" 
@@ -73,7 +75,7 @@
     QObject::connect(&tool, SIGNAL(finished()), &a, SLOT(quit()));
 
     QTimer::singleShot(0, &tool, SLOT(fetchClickToken()));
-
+    qInstallMessageHandler(0);
     return a.exec();
 }
 

=== modified file 'scope/tests/download_manager_tool/download_manager_tool.h'
--- scope/tests/download_manager_tool/download_manager_tool.h	2014-01-27 18:20:27 +0000
+++ scope/tests/download_manager_tool/download_manager_tool.h	2014-02-06 18:36:09 +0000
@@ -31,7 +31,7 @@
 #define _DOWNLOAD_MANAGER_TOOL_H_
 
 #include <QString>
-#include <download-manager.h>
+#include <click/download-manager.h>
 
 class DownloadManagerTool : public QObject {
     Q_OBJECT
@@ -51,7 +51,8 @@
 
 private:
     QString _url;
-    click::DownloadManager _dm;
+    click::DownloadManager *_dm;
+
 };
 
 #endif /* _DOWNLOAD_MANAGER_TOOL_H_ */

=== removed file 'scope/tests/main.cpp'
--- scope/tests/main.cpp	2014-01-13 22:00:30 +0000
+++ scope/tests/main.cpp	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#include <QCoreApplication>
-#include "./test_runner.h"
-
-int main(int argc, char *argv[]) {
-    QCoreApplication a(argc, argv);
-    return RUN_ALL_QTESTS(argc, argv);
-}

=== added file 'scope/tests/mock_ubuntuone_credentials.h'
--- scope/tests/mock_ubuntuone_credentials.h	1970-01-01 00:00:00 +0000
+++ scope/tests/mock_ubuntuone_credentials.h	2014-02-06 18:36:09 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+
+class MockCredentialsService : public click::CredentialsService {
+ public:
+  MOCK_METHOD0(getCredentials,
+      void());
+  MOCK_METHOD0(invalidateCredentials,
+      void());
+};
+

=== modified file 'scope/tests/test_download_manager.cpp'
--- scope/tests/test_download_manager.cpp	2014-01-27 18:20:27 +0000
+++ scope/tests/test_download_manager.cpp	2014-02-06 18:36:09 +0000
@@ -27,51 +27,138 @@
  * files in the program, then also delete it here.
  */
 
-#include "test_download_manager.h"
-
-#define SCOPE_TEST_TIMEOUT_MSEC 5000
-
-static const QString TEST_URL("http://test.local/");
-
-void TestableDownloadManager::setShouldSignalCredsFound(bool shouldSignalCredsFound)
-{
-    _shouldSignalCredsFound = shouldSignalCredsFound;
-}
-
-void TestableDownloadManager::getCredentials()
-{
-    if (_shouldSignalCredsFound) {
-        emit service.credentialsFound(_token);
-    }else{
-        emit service.credentialsNotFound();
-    }
+#include <QCoreApplication>
+#include <QDebug>
+#include <QString>
+#include <QThread>
+#include <QTimer>
+
+#include <gmock/gmock.h>
+#include <gtest/gtest.h>
+
+#include <click/download-manager.h>
+
+#include "mock_network_access_manager.h"
+#include "mock_ubuntuone_credentials.h"
+
+
+namespace
+{
+const QString TEST_URL("http://test.local/");
+
+struct DownloadManagerTest : public ::testing::Test
+{
+    DownloadManagerTest() : app(argc, argv)
+    {
+
+        QSharedPointer<click::network::AccessManager> namPtr(&mockNam,
+                                                             [](click::network::AccessManager*) {});
+
+        QSharedPointer<click::CredentialsService> csPtr(&mockCredentialsService,
+                                                        [](click::CredentialsService*) {});
+
+        dm.reset(new click::DownloadManager(namPtr, csPtr));
+
+        QObject::connect(
+                    &testTimeout, &QTimer::timeout,
+                    [this]() { app.quit(); FAIL() << "Operation timed out."; } );
+    }
+
+    void SetUp()
+    {
+        const int oneSecondInMsec = 1000;
+        testTimeout.start(2 * oneSecondInMsec);
+    }
+
+    void Quit()
+    {
+        app.quit();
+    }
+
+    int argc = 0;
+    char** argv = nullptr;
+    QCoreApplication app;
+    QTimer testTimeout;
+    QScopedPointer<click::DownloadManager> dm;
+    MockNetworkAccessManager mockNam;
+    MockCredentialsService mockCredentialsService;
+};
+
+
+struct DownloadManagerMockClient {
+    MOCK_METHOD1(onFetchClickErrorEmitted, void(QString errorMessage));
+};
+
+} // anon namespace
+
+
+TEST_F(DownloadManagerTest, testFetchClickTokenCredentialsNotFound)
+{
+    using namespace ::testing;
+
+    // Mock the credentials service, to signal that creds are not found:
+    EXPECT_CALL(mockCredentialsService, getCredentials())
+        .Times(1).WillOnce(
+            InvokeWithoutArgs(&mockCredentialsService, 
+                              &MockCredentialsService::credentialsNotFound));
+
+    // We should not hit the NAM without creds:
+    EXPECT_CALL(mockNam, head(_)).Times(0);
+
+    // Connect the mock client to downloadManager's error signal,
+    // to check that it sends appropriate signals:
+
+    DownloadManagerMockClient mockDownloadManagerClient;
+    QObject::connect(dm.data(), &click::DownloadManager::clickTokenFetchError,
+                     [&mockDownloadManagerClient](const QString& error)
+                     {
+                         mockDownloadManagerClient.onFetchClickErrorEmitted(error);
+                     });
+
+    // The error signal should be sent once, and we clean up the
+    // test's QCoreApplication in its handler:
+    EXPECT_CALL(mockDownloadManagerClient, onFetchClickErrorEmitted(_))
+            .Times(1)
+            .WillOnce(
+                InvokeWithoutArgs(
+                    this,
+                    &DownloadManagerTest::Quit));
+
+    // Now start the function we're testing, after a delay. This is
+    // awkwardly verbose because QTimer::singleShot doesn't accept
+    // arguments or lambdas.
+
+    // We need to delay the call until after the app.exec() call so
+    // that when we call app.quit() on success, there is a running app
+    // to quit.
+    QScopedPointer<QTimer> timer(new QTimer());
+    timer->setSingleShot(true);
+    QObject::connect(timer.data(), &QTimer::timeout, [&]() {
+            dm->fetchClickToken(TEST_URL);
+        } );
+    timer->start(0);
+    
+    // now exec the app so events can proceed:
+    app.exec();
+
 }
 
 // Test Cases:
 
-void TestDownloadManager::testFetchClickTokenCredentialsNotFound()
-{
-    _tdm.setShouldSignalCredsFound(false);
-    FakeNam::shouldSignalNetworkError = false;
-    QSignalSpy spy(&_tdm, SIGNAL(clickTokenFetchError(QString)));
-    _tdm.fetchClickToken(TEST_URL);
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, SCOPE_TEST_TIMEOUT_MSEC);
-}
-
-void TestDownloadManager::testFetchClickTokenCredsFoundButNetworkError()
-{
-    _tdm.setShouldSignalCredsFound(true);
-    FakeNam::shouldSignalNetworkError = true;
-    QSignalSpy spy(&_tdm, SIGNAL(clickTokenFetchError(QString)));
-    _tdm.fetchClickToken(TEST_URL);
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, SCOPE_TEST_TIMEOUT_MSEC);
-}
-
-void TestDownloadManager::testFetchClickTokenSuccess()
-{
-    _tdm.setShouldSignalCredsFound(true);
-    FakeNam::shouldSignalNetworkError = false;
-    QSignalSpy spy(&_tdm, SIGNAL(clickTokenFetched(QString)));
-    _tdm.fetchClickToken(TEST_URL);
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, SCOPE_TEST_TIMEOUT_MSEC);
-}
+// void TestDownloadManager::testFetchClickTokenCredsFoundButNetworkError()
+// {
+//     _tdm.setShouldSignalCredsFound(true);
+//     FakeNam::shouldSignalNetworkError = true;
+//     QSignalSpy spy(&_tdm, SIGNAL(clickTokenFetchError(QString)));
+//     _tdm.fetchClickToken(TEST_URL);
+//     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, SCOPE_TEST_TIMEOUT_MSEC);
+// }
+
+// void TestDownloadManager::testFetchClickTokenSuccess()
+// {
+//     _tdm.setShouldSignalCredsFound(true);
+//     FakeNam::shouldSignalNetworkError = false;
+//     QSignalSpy spy(&_tdm, SIGNAL(clickTokenFetched(QString)));
+//     _tdm.fetchClickToken(TEST_URL);
+//     QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, SCOPE_TEST_TIMEOUT_MSEC);
+// }

=== removed file 'scope/tests/test_download_manager.h'
--- scope/tests/test_download_manager.h	2014-01-27 18:20:27 +0000
+++ scope/tests/test_download_manager.h	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, 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 warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#ifndef TEST_DOWNLOAD_MANAGER_H
-#define TEST_DOWNLOAD_MANAGER_H
-
-#include <fake_nam.h>
-
-#include <QObject>
-#include <QDebug>
-#include <QString>
-#include <QTest>
-#include <QTimer>
-#include <QSignalSpy>
-
-#include <ssoservice.h>
-
-#include <test_runner.h>
-#include <download-manager.h>
-
-class TestableDownloadManager : public click::DownloadManager {
-    Q_OBJECT
-
-public:
-
-    void setShouldSignalCredsFound(bool shouldSignalCredsFound);
-    void setShouldSignalNetworkError(bool shouldSignalNetworkError);
-    
-    void getCredentials() override; 
-
-private:
-    bool _shouldSignalCredsFound = true;
-    bool _shouldSignalNetworkError = false;
-    UbuntuOne::Token _token;
-};
-
-
-class TestDownloadManager : public QObject
-{
-    Q_OBJECT
-
-private slots:
-    void testFetchClickTokenCredentialsNotFound();
-    void testFetchClickTokenCredsFoundButNetworkError();
-    void testFetchClickTokenSuccess();
-private:
-    TestableDownloadManager _tdm;
-};
-
-DECLARE_TEST(TestDownloadManager)
-
-#endif // TEST_DOWNLOAD_MANAGER_H