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

[Mike McCracken]

- Add CLI tool for getting the click token from a store URL using download manager, for IRL testing.

- Add CLI tool for getting the click token from a store URL using download manager, for IRL testing.

usage:

U1_DEBUG=1 $builddir/scope/tests/download_manager_tool/download_manager_tool https://public.apps.ubuntu.com/download/com.ubuntu.developer.mzanetti/fahrplan2/com.ubuntu.developer.mzanetti.fahrplan2_2.0.14.1_unknown.click

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:117
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/184/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/82
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/82/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:117
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mikemc/unity-scope-click/cxx-dlmgr-add-tool/+merge/202570/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/185/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/83
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/83/console

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

review: Needs Fixing (continuous-integration)

[Manuel de la Peña (mandel)]

A small thing, please use explicit for the single argument constructors and maybe always set the QObject* parent parameter to be optional, for example:

explicit DownloadManagerTool(QObject *parent=0);

review: Needs Fixing

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

113. By Alejandro J. Cura on 2014-01-22

A webclient that uses Qt, and the scaffolding for unit and integration tests.

Approved by Manuel de la Peña, Rodney Dawes, PS Jenkins bot.

114. By Leo Arias on 2014-01-23

Added a test to try to install without credentials. Fixes: https://bugs.launchpad.net/bugs/1271722.

Approved by Roberto Alsina, PS Jenkins bot.

115. By Mike McCracken on 2014-01-24

Add command-line tool to test getting click token from apps server

116. By Mike McCracken on 2014-01-24

constructor default arg fix according to review

117. By Mike McCracken on 2014-01-24

merge with cxx-dlmgr-more tests

[Manuel de la Peña (mandel)]

review: Approve

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

118. By Mike McCracken on 2014-01-24

merge with cxx-dlmgr-more-tests

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-01-24 17:21:03 +0000
+++ scope/tests/CMakeLists.txt	2014-01-24 17:21:03 +0000
@@ -47,3 +47,4 @@
 
 add_definitions( -DUSE_FAKE_NAM )
 add_subdirectory( integration )
+add_subdirectory(download_manager_tool)
\ No newline at end of file

=== added directory 'scope/tests/download_manager_tool'
=== added file 'scope/tests/download_manager_tool/CMakeLists.txt'
--- scope/tests/download_manager_tool/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ scope/tests/download_manager_tool/CMakeLists.txt	2014-01-24 17:21:03 +0000
@@ -0,0 +1,11 @@
+set(DOWNLOAD_MANAGER_TOOL_TARGET download_manager_tool)
+
+add_executable(${DOWNLOAD_MANAGER_TOOL_TARGET}
+  download_manager_tool.cpp download_manager_tool.h
+)
+
+target_link_libraries(${DOWNLOAD_MANAGER_TOOL_TARGET}
+  -Wl,-rpath,${CMAKE_BINARY_DIR}/src
+  -L${CMAKE_BINARY_DIR}/src
+  ${SCOPE_LIB_NAME}
+  )

=== added file 'scope/tests/download_manager_tool/download_manager_tool.cpp'
--- scope/tests/download_manager_tool/download_manager_tool.cpp	1970-01-01 00:00:00 +0000
+++ scope/tests/download_manager_tool/download_manager_tool.cpp	2014-01-24 17:21:03 +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.
+ */
+
+#include <QCoreApplication>
+#include <QDebug>
+#include <QString>
+#include <QTimer>
+#include <QTextStream>
+
+#include <download_manager_tool.h>
+
+DownloadManagerTool::DownloadManagerTool(QObject *parent):
+     QObject(parent)
+{
+    QObject::connect(&_dm, &ClickScope::DownloadManager::clickTokenFetched,
+                     this, &DownloadManagerTool::handleFetchResponse);
+    QObject::connect(&_dm, &ClickScope::DownloadManager::clickTokenFetchError,
+                     this, &DownloadManagerTool::handleFetchResponse);
+}
+
+void DownloadManagerTool::handleFetchResponse(QString response)
+{
+    QTextStream(stdout) << "DONE: response is " << response << "\n";
+    emit finished();
+}
+
+void DownloadManagerTool::fetchClickToken()
+{
+    _dm.fetchClickToken(_url);
+}
+
+int main(int argc, char *argv[])
+{
+
+    QCoreApplication a(argc, argv);
+    DownloadManagerTool tool(&a);
+
+    if (argc != 2) {
+        QTextStream(stderr) << "Usage: download_manager_tool https://public.apps.ubuntu.com/download/<<rest of click package dl url>>" 
+                            << "\n\t - when run with a valid U1 credential in the system, should print the click token to stdout.\n";
+        return 1;
+    }
+        
+
+    tool.setClickTokenURL(QString(argv[1]));
+
+    QObject::connect(&tool, SIGNAL(finished()), &a, SLOT(quit()));
+
+    QTimer::singleShot(0, &tool, SLOT(fetchClickToken()));
+
+    return a.exec();
+}
+

=== added file 'scope/tests/download_manager_tool/download_manager_tool.h'
--- scope/tests/download_manager_tool/download_manager_tool.h	1970-01-01 00:00:00 +0000
+++ scope/tests/download_manager_tool/download_manager_tool.h	2014-01-24 17:21:03 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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_TOOL_H_
+#define _DOWNLOAD_MANAGER_TOOL_H_
+
+#include <QString>
+#include <download-manager.h>
+
+class DownloadManagerTool : public QObject {
+    Q_OBJECT
+
+public:
+    explicit DownloadManagerTool(QObject *parent=0);
+                                                             
+public slots:
+    void setClickTokenURL(QString url) { _url = url;};
+    void fetchClickToken();
+
+private slots:
+    void handleFetchResponse(QString response);
+
+signals:
+    void finished();
+
+private:
+    QString _url;
+    ClickScope::DownloadManager _dm;
+};
+
+#endif /* _DOWNLOAD_MANAGER_TOOL_H_ */
+
+