Merge lp:~mikemc/unity-scope-click/add-cxx-scope into lp:unity-scope-click

[Mike McCracken]

- Add initial c++ scope code in scope/, using CMake

- Add initial c++ scope code in scope/, using CMake

because it's cmake, the existing autotools build structure is untouched and still works as before. tests pass as before.

NOTE: the new cmake does support out of tree builds. (as far as it gets)

mkdir build && cd build
cmake .. -DCMAKE_BUILD_TYPE=debug
make

-- that ought to get you to the point of linking the test binary, which currently fails.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[dobey (dobey)]

32 +add_custom_target(check
33 + DEPENDS click-scope-tests
34 +)
35 +

271 +SET (TESTS_TARGET click-scope-tests)
281 +add_executable (${TESTS_TARGET}

This will only build the test program when 'make check' is run, but not run the resulting program. I'd suggest changing TESTS_TARGET to be 'test-click-scope' (it's generally good to start test command names with test-), and add a custom target for click-scope-tests that runs the resulting program without valgrind (see the tests in ubuntuone-credentials for exmaple).

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[dobey (dobey)]

24 +set(DATADIR share/unity/scopes) # FIXME, not correct.

This should be SCOPES_DATA_DIR or something. DATADIR is a generic name, and generic variables should get generic paths (DATADIR would just be "share" typically, and PKGDATADIR would be "share/$packagename" for example).

Also, several of the added source files are missing the copyright/license header. Please add them.

[lp:~mikemc/unity-scope-click/add-cxx-scope]

109. By Mike McCracken on 2014-01-13

rename DATADIR to be more specific

110. By Mike McCracken on 2014-01-13

Use GPL+SSL license for all new c++ files

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2013-12-10 22:20:49 +0000
+++ .bzrignore	2014-01-13 22:01:11 +0000
@@ -17,7 +17,7 @@
 ltmain.sh
 missing
 stamp-*
-*.[ch]
+src/*.[ch]
 *.desktop
 *.gir
 *.gmo

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2014-01-13 22:01:11 +0000
@@ -0,0 +1,38 @@
+project(clickscope CXX)
+cmake_minimum_required(VERSION 2.8.10)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Wextra")
+
+include(GNUInstallDirs)
+set(SCOPE_DATA_DIR share/unity/scopes) # FIXME, not correct.
+
+include(FindPkgConfig)
+pkg_check_modules(UNITY_SCOPES libunity-scopes REQUIRED)
+
+pkg_check_modules(LIBSIGNON REQUIRED libsignon-qt5 accounts-qt5)
+add_definitions(${LIBSIGNON_CFLAGS} ${LIBSIGNON_CFLAGS_OTHER})
+
+find_package (PkgConfig REQUIRED)
+pkg_check_modules(UBUNTUONE REQUIRED ubuntuoneauth-2.0)
+add_definitions(${UBUNTUONE_CFLAGS} ${UBUNTUONE_CFLAGS_OTHER})
+
+SET (SCOPE_LIB_VERSION 0.2.0)
+SET (SCOPE_LIB_SOVERSION 0)
+SET (SCOPE_LIB_API_VERSION 2.0)
+SET (SCOPE_LIB_UNVERSIONED clickscope)
+SET (SCOPE_LIB_NAME ${SCOPE_LIB_UNVERSIONED}-${SCOPE_LIB_API_VERSION})
+
+add_subdirectory(scope)
+add_subdirectory(data)
+
+add_custom_target(check
+  DEPENDS click-scope-tests
+)
+
+add_custom_target(check-valgrind
+  DEPENDS click-scope-tests-valgrind
+)
+
+add_custom_target(check-valgrind-leaks
+  DEPENDS click-scope-tests-valgrind-leaks
+)

=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt	2014-01-13 22:01:11 +0000
@@ -0,0 +1,1 @@
+INSTALL(FILES clickscope.ini DESTINATION ${SCOPE_DATA_DIR})

=== added file 'data/clickscope.ini'
--- data/clickscope.ini	1970-01-01 00:00:00 +0000
+++ data/clickscope.ini	2014-01-13 22:01:11 +0000
@@ -0,0 +1,7 @@
+[ScopeConfig]
+DisplayName = Click Applications Scope
+Description = Scope for searching the click app store
+Art = clickscope.Art
+Icon = clickscope.Icon
+SearchHint = clickscope.SearchHint
+HotKey = clickscope.HotKey

=== added directory 'scope'
=== added file 'scope/CMakeLists.txt'
--- scope/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ scope/CMakeLists.txt	2014-01-13 22:01:11 +0000
@@ -0,0 +1,19 @@
+SET (CMAKE_INCLUDE_CURRENT_DIR ON)
+SET (CMAKE_AUTOMOC ON)
+find_package (Qt5Core REQUIRED)
+
+file (GLOB SCOPE_SOURCES *.cpp)
+file (GLOB SCOPE_HEADERS *.h)
+
+add_library (${SCOPE_LIB_NAME} SHARED ${SCOPE_SOURCES} )
+
+qt5_use_modules (${SCOPE_LIB_NAME} Network)
+
+target_link_libraries (${SCOPE_LIB_NAME}
+  ${UNITY_SCOPES_LDFLAGS}
+  ${UBUNTUONE_LDFLAGS})
+
+set_property (TARGET ${SCOPE_LIB_NAME} PROPERTY COMPILE_FLAGS ${UNITY_SCOPES_CFLAGS})
+
+
+add_subdirectory (tests)

=== added file 'scope/clickquery.cpp'
--- scope/clickquery.cpp	1970-01-01 00:00:00 +0000
+++ scope/clickquery.cpp	2014-01-13 22:01:11 +0000
@@ -0,0 +1,67 @@
+/*
+ * 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 "clickquery.h"
+#include <scopes/Annotation.h>
+#include <scopes/CategoryRenderer.h>
+#include <scopes/CategorisedResult.h>
+#include <scopes/Query.h>
+#include <scopes/Reply.h>
+
+
+ClickQuery::ClickQuery(string const& query) :
+    query_(query)
+{
+}
+
+ClickQuery::~ClickQuery()
+{
+}
+
+void ClickQuery::cancelled()
+{
+}
+
+void ClickQuery::run(ReplyProxy const& reply)
+{
+    CategoryRenderer rdr;
+    auto cat = reply->register_category("cat1", "Category 1", "", rdr);
+    CategorisedResult res(cat);
+    res.set_uri("uri");
+    res.set_title("scope-A: result 1 for query \"" + query_ + "\"");
+    res.set_art("icon");
+    res.set_dnd_uri("dnd_uri");
+    reply->push(res);
+
+    Query q("scope-A", query_, "");
+    Annotation annotation(Annotation::Type::Link);
+    annotation.add_link("More...", q);
+    reply->push(annotation);
+
+}

=== added file 'scope/clickquery.h'
--- scope/clickquery.h	1970-01-01 00:00:00 +0000
+++ scope/clickquery.h	2014-01-13 22:01:11 +0000
@@ -0,0 +1,46 @@
+/*
+ * 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 <scopes/QueryBase.h>
+
+using namespace std;
+using namespace unity::api::scopes;
+
+class ClickQuery : public QueryBase
+{
+public:
+    ClickQuery(std::string const& query);
+    ~ClickQuery();
+    virtual void cancelled() override;
+
+    virtual void run(ReplyProxy const& reply) override;
+
+private:
+    std::string query_;
+};

=== added file 'scope/clickscope.cpp'
--- scope/clickscope.cpp	1970-01-01 00:00:00 +0000
+++ scope/clickscope.cpp	2014-01-13 22:01:11 +0000
@@ -0,0 +1,48 @@
+/*
+ * 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 "clickscope.h"
+#include "clickquery.h"
+
+
+int ClickScope::start(std::string const&, unity::api::scopes::RegistryProxy const&)
+{
+    return VERSION;
+}
+
+void ClickScope::stop()
+{
+}
+
+unity::api::scopes::QueryBase::UPtr create_query(std::string const& q,
+                                                 unity::api::scopes::VariantMap const&)
+{
+    unity::api::scopes::QueryBase::UPtr query(new ClickQuery(q));
+    return query;
+}

=== added file 'scope/clickscope.h'
--- scope/clickscope.h	1970-01-01 00:00:00 +0000
+++ scope/clickscope.h	2014-01-13 22:01:11 +0000
@@ -0,0 +1,47 @@
+/*
+ * 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 CLICKSCOPE_H
+#define CLICKSCOPE_H
+
+#include <scopes/ScopeBase.h>
+#include <scopes/QueryBase.h>
+
+class ClickScope : public unity::api::scopes::ScopeBase
+{
+public:
+    virtual int start(std::string const&, unity::api::scopes::RegistryProxy const&) override;
+
+    virtual void stop() override;
+
+    virtual unity::api::scopes::QueryBase::UPtr create_query(std::string const& q,
+            unity::api::scopes::VariantMap const&) override;
+};
+
+#endif

=== added file 'scope/download-manager.cpp'
--- scope/download-manager.cpp	1970-01-01 00:00:00 +0000
+++ scope/download-manager.cpp	2014-01-13 22:01:11 +0000
@@ -0,0 +1,107 @@
+/*
+ * 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 <QDebug>
+#include <QObject>
+#include <QString>
+#include <QTimer> 
+
+#include "ssoservice.h"
+#include "token.h"
+
+#include "download-manager.h"
+
+namespace ClickScope {
+
+
+DownloadManager::DownloadManager(QObject *parent) :
+    QObject(parent)
+{
+    QObject::connect(&service, SIGNAL(credentialsFound(const Token&)),
+                     this, SLOT(handleCredentialsFound(Token)));
+    QObject::connect(&service, SIGNAL(credentialsNotFound()),
+                     this, SLOT(handleCredentialsNotFound()));
+    QObject::connect(&nam, SIGNAL(finished(QNetworkReply*)),
+                     this, SLOT(handleNetworkFinished(QNetworkReply*)));
+
+}
+
+DownloadManager::~DownloadManager(){
+}
+
+void DownloadManager::fetchClickToken(QString downloadUrl)
+{
+    service.getCredentials();
+    _downloadUrl = downloadUrl;
+}
+
+void DownloadManager::handleCredentialsFound(UbuntuOne::Token token)
+{
+    qDebug() << "Credentials found, signing url " << _downloadUrl;
+
+    QString authHeader = token.signUrl(_downloadUrl, QStringLiteral("HEAD"));
+
+    qDebug() << "URL Signed, authHeader is:" << authHeader; // TODO: remove this log
+
+    QNetworkRequest req;
+    req.setRawHeader(QStringLiteral("Authorization").toUtf8(),
+                     authHeader.toUtf8());
+    req.setUrl(_downloadUrl);
+    nam.get(req);
+}
+ 
+void DownloadManager::handleCredentialsNotFound()
+{
+    qDebug() << "No credentials were found.";
+    emit clickTokenFetchError(QString("No creds found"));
+}
+
+void DownloadManager::handleNetworkFinished(QNetworkReply *reply)
+{
+    // TODO: actually get the header
+    QString clickTokenHeader;
+    QVariant statusAttr = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute);
+    if(!statusAttr.isValid()) {
+        qDebug() << "Invalid HTTP response.";
+        return;
+    }
+
+    int status = statusAttr.toInt();
+    qDebug() << "HTTP Status " << status;
+
+    if (status != 200){
+        qDebug() << reply->rawHeaderPairs();
+    }
+
+    qDebug() << reply->readAll();
+        
+    emit clickTokenFetched(clickTokenHeader);
+}
+
+} // namespace ClickScope

=== added file 'scope/download-manager.h'
--- scope/download-manager.h	1970-01-01 00:00:00 +0000
+++ scope/download-manager.h	2014-01-13 22:01:11 +0000
@@ -0,0 +1,79 @@
+/*
+ * 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 _DOWNLOAD_MANAGER_H_
+#define _DOWNLOAD_MANAGER_H_
+
+#include <QDebug>
+#include <QNetworkReply>
+#include <QObject>
+#include <QString>
+
+#include "ssoservice.h"
+#include "token.h"
+#include "requests.h"
+#include "errormessages.h"
+
+namespace ClickScope {
+
+class DownloadManager : public QObject
+{
+    Q_OBJECT
+
+public:
+
+    explicit DownloadManager(QObject *parent = 0);
+    ~DownloadManager();
+
+public slots:
+
+    void fetchClickToken(QString downloadUrl);
+
+signals:
+
+    void clickTokenFetched(QString clickToken);
+    void clickTokenFetchError(QString errorMessage);
+
+private slots:
+
+    void handleCredentialsFound(UbuntuOne::Token token);
+    void handleCredentialsNotFound();
+    void handleNetworkFinished(QNetworkReply *reply);
+
+private:
+
+    UbuntuOne::SSOService service;
+    QNetworkAccessManager nam;
+    QString _downloadUrl;
+
+};
+
+} // namespace ClickScope
+
+#endif /* _DOWNLOAD_MANAGER_H_ */

=== added directory 'scope/tests'
=== added file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ scope/tests/CMakeLists.txt	2014-01-13 22:01:11 +0000
@@ -0,0 +1,42 @@
+SET (TESTS_TARGET test-click-scope)
+
+# Qt5 bits
+SET (CMAKE_INCLUDE_CURRENT_DIR ON)
+SET (CMAKE_AUTOMOC ON)
+find_package(Qt5Core REQUIRED)
+
+FILE (GLOB TEST_SOURCES *.cpp)
+FILE (GLOB TEST_HEADERS *.h)
+
+add_executable (${TESTS_TARGET}
+  ${TEST_SOURCES}
+  ${TEST_HEADERS}
+)
+
+qt5_use_modules (${TESTS_TARGET} Core DBus Network Test)
+
+target_include_directories ( ${TESTS_TARGET} PUBLIC ${CMAKE_SOURCE_DIR}/scope )
+target_link_libraries ( ${TESTS_TARGET}
+  ${UNITY_SCOPES_LDFLAGS}
+  ${UBUNTUONE_LDFLAGS}
+  )
+target_link_libraries ( ${TESTS_TARGET}
+  -Wl,-rpath,${CMAKE_BINARY_DIR}/src
+  -L${CMAKE_BINARY_DIR}/src
+  ${SCOPE_LIB_NAME}
+  )
+
+add_custom_target(click-scope-tests
+  COMMAND ${TESTS_TARGET}
+  DEPENDS ${TESTS_TARGET}
+)
+
+add_custom_target(click-scope-tests-valgrind
+  COMMAND "valgrind --tool=memcheck ${CMAKE_CURRENT_BINARY_DIR}/${TESTS_TARGET}"
+  DEPENDS ${TESTS_TARGET}
+)
+
+add_custom_target(click-scope-tests-valgrind-leaks
+  COMMAND "valgrind --tool=memcheck --track-origins=yes --num-callers=40 --leak-resolution=high --leak-check=full ${CMAKE_CURRENT_BINARY_DIR}/${TESTS_TARGET}"
+  DEPENDS ${TESTS_TARGET}
+)

=== added file 'scope/tests/main.cpp'
--- scope/tests/main.cpp	1970-01-01 00:00:00 +0000
+++ scope/tests/main.cpp	2014-01-13 22:01:11 +0000
@@ -0,0 +1,36 @@
+/*
+ * 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/test_download_manager.cpp'
--- scope/tests/test_download_manager.cpp	1970-01-01 00:00:00 +0000
+++ scope/tests/test_download_manager.cpp	2014-01-13 22:01:11 +0000
@@ -0,0 +1,40 @@
+/*
+ * 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 "test_download_manager.h"
+
+using namespace ClickScope;
+
+void TestDownloadManager::testFetchClickTokenCredentialsFound()
+{
+    DownloadManager dm;
+    QSignalSpy spy(&dm, SIGNAL(clickTokenFetchError()));
+    dm.fetchClickToken(QString(""));
+    QTRY_COMPARE(spy.count(), 1);
+}

=== added file 'scope/tests/test_download_manager.h'
--- scope/tests/test_download_manager.h	1970-01-01 00:00:00 +0000
+++ scope/tests/test_download_manager.h	2014-01-13 22:01:11 +0000
@@ -0,0 +1,55 @@
+/*
+ * 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 <QObject>
+#include <QDebug>
+#include <QString>
+#include <QTest>
+#include <QSignalSpy>
+
+#include "test_runner.h"
+#include "download-manager.h"
+
+using namespace ClickScope;
+
+class TestDownloadManager : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testFetchClickTokenCredentialsFound();
+//    void testFetchClickTokenCredentialsNotFound();
+};
+
+DECLARE_TEST(TestDownloadManager)
+
+#endif /* _TEST_DOWNLOAD_MANAGER_H_ */

=== added file 'scope/tests/test_runner.h'
--- scope/tests/test_runner.h	1970-01-01 00:00:00 +0000
+++ scope/tests/test_runner.h	2014-01-13 22:01:11 +0000
@@ -0,0 +1,98 @@
+/*
+ * 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_RUNNER_H
+#define TEST_RUNNER_H
+
+#include <QDir>
+#include <QList>
+#include <QTest>
+#include <QSharedPointer>
+#include <iostream>
+
+class TestRunner {
+ public:
+
+    static TestRunner& Instance() {
+        static TestRunner instance;
+        return instance;
+    }
+
+    template <typename T>
+    char RegisterTest(char* name) {
+        if(!_tests.contains(name)) {
+            QSharedPointer<QObject> test(new T());
+            _tests.insert(name, QSharedPointer<QObject>(test));
+        }
+        return char(1);
+    }
+
+    int RunAll(int argc, char *argv[]) {
+        // provide command line to run a single test case
+        QCoreApplication* app = QCoreApplication::instance();
+        QStringList args = app->arguments();
+
+        if (args.contains("-testcase")) {
+            int index = args.indexOf("-testcase");
+            if (args.count() > index + 1) {
+                QString testcase = args[index + 1];
+                if (_tests.contains(testcase)) {
+                    args.removeAt(index + 1);
+                    args.removeAt(index);
+                    return QTest::qExec(_tests[testcase].data(), args);
+                } else {
+                    return -1;
+                }
+            } else {
+                return -1;
+            }
+        } else {
+            int errorCode = 0;
+            foreach (QString const &testName, _tests.keys()) {
+                errorCode |= QTest::qExec(_tests[testName].data(), argc, argv);
+                std::cout << std::endl;
+            }
+        return errorCode;
+        }
+    }
+
+ private:
+    QMap<QString, QSharedPointer<QObject> > _tests;
+};
+
+
+// Use this macro after your test declaration
+#define DECLARE_TEST(className)\
+    static char test_##className = TestRunner::Instance().RegisterTest<className>(const_cast<char *>(#className));
+
+// Use this macro to execute all tests
+#define RUN_ALL_QTESTS(argc, argv)\
+    TestRunner::Instance().RunAll(argc, argv);
+
+#endif  // TEST_RUNNER_H