Merge lp:~mandel/ubuntu-download-manager/remove-tests-qdebug into lp:ubuntu-download-manager

[Manuel de la Peña]

Add BaseTestCase that removes the qDebug output so that we have a cleaner tests results output.

Add BaseTestCase that removes the qDebug output so that we have a cleaner tests results output. To test the branch just run the tests and enjoy the nicer output.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:128
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/76/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/67

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/remove-tests-qdebug]

129. By Manuel de la Peña on 2013-09-25

Merged valid-hash-method into remove-tests-qdebug.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:129
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/81/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/72

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

review: Approve (continuous-integration)

[lp:~mandel/ubuntu-download-manager/remove-tests-qdebug]

130. By Manuel de la Peña on 2013-09-25

Merged valid-hash-method into remove-tests-qdebug.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:130
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/85/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/76

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

review: Approve (continuous-integration)

[dobey (dobey)]

review: Approve

[Mike McCracken (mikemc)]

LGTM

review: Approve

=== added file 'ubuntu-download-manager-tests/base_testcase.cpp'
--- ubuntu-download-manager-tests/base_testcase.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/base_testcase.cpp	2013-09-25 16:08:34 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2013 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 <QtGlobal>
+#include "./base_testcase.h"
+
+void
+noMessageOutput(QtMsgType type,
+                const QMessageLogContext& context,
+                const QString &message) {
+    Q_UNUSED(type);
+    Q_UNUSED(context);
+    Q_UNUSED(message);
+    // do nothing
+}
+
+BaseTestCase::BaseTestCase(QObject *parent)
+    : QObject(parent) {
+}
+
+void
+BaseTestCase::init() {
+    qInstallMessageHandler(noMessageOutput);
+}

=== added file 'ubuntu-download-manager-tests/base_testcase.h'
--- ubuntu-download-manager-tests/base_testcase.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/base_testcase.h	2013-09-25 16:08:34 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013 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 BASE_TESTCASE_H
+#define BASE_TESTCASE_H
+
+#include <QObject>
+
+class BaseTestCase : public QObject
+{
+    Q_OBJECT
+ public:
+    explicit BaseTestCase(QObject *parent = 0);
+    
+ protected slots:  // NOLINT(whitespace/indent)
+
+    virtual void init();
+
+};
+
+#endif // BASE_TESTCASE_H

=== modified file 'ubuntu-download-manager-tests/test_download.cpp'
--- ubuntu-download-manager-tests/test_download.cpp	2013-09-25 16:08:34 +0000
+++ ubuntu-download-manager-tests/test_download.cpp	2013-09-25 16:08:34 +0000
@@ -27,7 +27,7 @@
 #include "./test_download.h"
 
 TestDownload::TestDownload(QObject* parent)
-    : QObject(parent) {
+    : BaseTestCase(parent) {
 }
 
 bool
@@ -57,6 +57,7 @@
 
 void
 TestDownload::init() {
+    BaseTestCase::init();
     // set the xdg path so that we have control over it
     _testDir = QDir("./tests");
     _testDir.makeAbsolute();

=== modified file 'ubuntu-download-manager-tests/test_download.h'
--- ubuntu-download-manager-tests/test_download.h	2013-09-25 16:08:34 +0000
+++ ubuntu-download-manager-tests/test_download.h	2013-09-25 16:08:34 +0000
@@ -26,9 +26,10 @@
 #include "./fake_system_network_info.h"
 #include "./fake_request_factory.h"
 #include "./fake_process_factory.h"
+#include "./base_testcase.h"
 #include "./test_runner.h"
 
-class TestDownload: public QObject {
+class TestDownload: public BaseTestCase {
     Q_OBJECT
 
  public:
@@ -36,7 +37,7 @@
 
  private slots:  // NOLINT(whitespace/indent)
 
-    void init();
+    void init() override;
     void cleanup();
 
     // constructors tests

=== modified file 'ubuntu-download-manager-tests/test_download_daemon.cpp'
--- ubuntu-download-manager-tests/test_download_daemon.cpp	2013-09-20 15:54:50 +0000
+++ ubuntu-download-manager-tests/test_download_daemon.cpp	2013-09-25 16:08:34 +0000
@@ -19,11 +19,12 @@
 #include "./test_download_daemon.h"
 
 TestDownloadDaemon::TestDownloadDaemon(QObject *parent)
-    : QObject(parent) {
+    : BaseTestCase(parent) {
 }
 
 void
 TestDownloadDaemon::init() {
+    BaseTestCase::init();
     _timer = new FakeTimer();
     _app = new FakeApplication();
     _appPointer = QSharedPointer<Application>(_app);

=== modified file 'ubuntu-download-manager-tests/test_download_daemon.h'
--- ubuntu-download-manager-tests/test_download_daemon.h	2013-09-20 15:54:50 +0000
+++ ubuntu-download-manager-tests/test_download_daemon.h	2013-09-25 16:08:34 +0000
@@ -25,9 +25,10 @@
 #include "./fake_dbus_connection.h"
 #include "./fake_download_manager.h"
 #include "./fake_timer.h"
+#include "./base_testcase.h"
 #include "./test_runner.h"
 
-class TestDownloadDaemon : public QObject {
+class TestDownloadDaemon : public BaseTestCase {
     Q_OBJECT
 
  public:
@@ -35,7 +36,7 @@
 
  private slots:  // NOLINT(whitespace/indent)
 
-    void init();
+    void init() override;
     void cleanup();
     void testStart();
     void testStartFailServiceRegister();

=== modified file 'ubuntu-download-manager-tests/test_download_factory.cpp'
--- ubuntu-download-manager-tests/test_download_factory.cpp	2013-09-25 16:08:34 +0000
+++ ubuntu-download-manager-tests/test_download_factory.cpp	2013-09-25 16:08:34 +0000
@@ -21,11 +21,12 @@
 #include "./test_download_factory.h"
 
 TestDownloadFactory::TestDownloadFactory(QObject *parent)
-    : QObject(parent) {
+    : BaseTestCase(parent) {
 }
 
 void
 TestDownloadFactory::init() {
+    BaseTestCase::init();
     _uuidFactory = QSharedPointer<UuidFactory>(new FakeUuidFactory());
     _apparmor = new FakeAppArmor(_uuidFactory);
     _networkInfo = QSharedPointer<SystemNetworkInfo>(

=== modified file 'ubuntu-download-manager-tests/test_download_factory.h'
--- ubuntu-download-manager-tests/test_download_factory.h	2013-09-16 15:57:06 +0000
+++ ubuntu-download-manager-tests/test_download_factory.h	2013-09-25 16:08:34 +0000
@@ -26,9 +26,10 @@
 #include "./fake_request_factory.h"
 #include "./fake_process_factory.h"
 #include "./fake_uuid_factory.h"
+#include "./base_testcase.h"
 #include "./test_runner.h"
 
-class TestDownloadFactory : public QObject {
+class TestDownloadFactory : public BaseTestCase {
     Q_OBJECT
 
  public:
@@ -36,7 +37,7 @@
 
  private slots:  // NOLINT(whitespace/indent)
 
-    void init();
+    void init() override;
     void cleanup();
 
     void testCreateDownload();

=== modified file 'ubuntu-download-manager-tests/test_download_manager.cpp'
--- ubuntu-download-manager-tests/test_download_manager.cpp	2013-09-20 15:54:50 +0000
+++ ubuntu-download-manager-tests/test_download_manager.cpp	2013-09-25 16:08:34 +0000
@@ -24,11 +24,12 @@
 #include "./test_download_manager.h"
 
 TestDownloadManager::TestDownloadManager(QObject *parent)
-    : QObject(parent) {
+    : BaseTestCase(parent) {
 }
 
 void
 TestDownloadManager::init() {
+    BaseTestCase::init();
     _app = new FakeApplication();
     _appPointer = QSharedPointer<Application>(_app);
     _conn = QSharedPointer<FakeDBusConnection>(new FakeDBusConnection());

=== modified file 'ubuntu-download-manager-tests/test_download_manager.h'
--- ubuntu-download-manager-tests/test_download_manager.h	2013-09-20 15:54:50 +0000
+++ ubuntu-download-manager-tests/test_download_manager.h	2013-09-25 16:08:34 +0000
@@ -32,8 +32,9 @@
 #include "./fake_request_factory.h"
 #include "./fake_uuid_factory.h"
 #include "./fake_system_network_info.h"
+#include "./base_testcase.h"
 
-class TestDownloadManager : public QObject {
+class TestDownloadManager : public BaseTestCase {
     Q_OBJECT
 
  public:
@@ -41,7 +42,7 @@
 
  private slots:  // NOLINT(whitespace/indent)
 
-    void init();
+    void init() override;
     void cleanup();
 
     // data functions

=== modified file 'ubuntu-download-manager-tests/test_download_queue.cpp'
--- ubuntu-download-manager-tests/test_download_queue.cpp	2013-09-16 15:57:06 +0000
+++ ubuntu-download-manager-tests/test_download_queue.cpp	2013-09-25 16:08:34 +0000
@@ -21,11 +21,12 @@
 #include "./test_download_queue.h"
 
 TestDownloadQueue::TestDownloadQueue(QObject *parent)
-    : QObject(parent) {
+    : BaseTestCase(parent) {
 }
 
 void
 TestDownloadQueue::init() {
+    BaseTestCase::init();
     _isConfined = true;
     _rootPath = "/random/root/path";
     _networkInfo = new FakeSystemNetworkInfo();

=== modified file 'ubuntu-download-manager-tests/test_download_queue.h'
--- ubuntu-download-manager-tests/test_download_queue.h	2013-09-16 15:57:06 +0000
+++ ubuntu-download-manager-tests/test_download_queue.h	2013-09-25 16:08:34 +0000
@@ -27,8 +27,9 @@
 #include "./fake_request_factory.h"
 #include "./fake_process_factory.h"
 #include "./fake_system_network_info.h"
+#include "./base_testcase.h"
 
-class TestDownloadQueue : public QObject {
+class TestDownloadQueue : public BaseTestCase {
     Q_OBJECT
 
  public:
@@ -36,7 +37,7 @@
 
  private slots:  // NOLINT(whitespace/indent)
 
-    void init();
+    void init() override;
     void cleanup();
 
     void testAddDownload();

=== modified file 'ubuntu-download-manager-tests/test_downloads_db.cpp'
--- ubuntu-download-manager-tests/test_downloads_db.cpp	2013-09-25 16:08:34 +0000
+++ ubuntu-download-manager-tests/test_downloads_db.cpp	2013-09-25 16:08:34 +0000
@@ -38,7 +38,7 @@
     "FROM SingleDownload WHERE uuid=:uuid;"
 
 TestDownloadsDb::TestDownloadsDb(QObject *parent)
-    : QObject(parent) {
+    : BaseTestCase(parent) {
 }
 
 bool
@@ -69,6 +69,7 @@
 
 void
 TestDownloadsDb::init() {
+    BaseTestCase::init();
     _testDir = QDir("./tests");
     _testDir.makeAbsolute();
 

=== modified file 'ubuntu-download-manager-tests/test_downloads_db.h'
--- ubuntu-download-manager-tests/test_downloads_db.h	2013-09-04 10:32:18 +0000
+++ ubuntu-download-manager-tests/test_downloads_db.h	2013-09-25 16:08:34 +0000
@@ -22,16 +22,17 @@
 #include <QObject>
 #include <QSqlDatabase>
 #include <downloads_db.h>
+#include "./base_testcase.h"
 #include "./test_runner.h"
 
-class TestDownloadsDb : public QObject {
+class TestDownloadsDb : public BaseTestCase {
     Q_OBJECT
  public:
     explicit TestDownloadsDb(QObject *parent = 0);
 
  private slots:  // NOLINT(whitespace/indent)
 
-    void init();
+    void init() override;
     void cleanup();
 
     void testTableCreations_data();

=== modified file 'ubuntu-download-manager-tests/test_group_download.cpp'
--- ubuntu-download-manager-tests/test_group_download.cpp	2013-09-25 16:08:34 +0000
+++ ubuntu-download-manager-tests/test_group_download.cpp	2013-09-25 16:08:34 +0000
@@ -22,11 +22,12 @@
 #include "./test_group_download.h"
 
 TestGroupDownload::TestGroupDownload(QObject *parent)
-    : QObject(parent) {
+    : BaseTestCase(parent) {
 }
 
 void
 TestGroupDownload::init() {
+    BaseTestCase::init();
     _id = QUuid::createUuid();
     _path = "/group/dbus/path";
     _isConfined = true;

=== modified file 'ubuntu-download-manager-tests/test_group_download.h'
--- ubuntu-download-manager-tests/test_group_download.h	2013-09-25 16:08:34 +0000
+++ ubuntu-download-manager-tests/test_group_download.h	2013-09-25 16:08:34 +0000
@@ -28,9 +28,10 @@
 #include "./fake_request_factory.h"
 #include "./fake_process_factory.h"
 #include "./fake_download_factory.h"
+#include "./base_testcase.h"
 #include "./test_runner.h"
 
-class TestGroupDownload : public QObject {
+class TestGroupDownload : public BaseTestCase {
     Q_OBJECT
 
  public:
@@ -38,7 +39,7 @@
 
  private slots:  // NOLINT(whitespace/indent)
 
-    void init();
+    void init() override;
     void cleanup();
 
     void testCancelNoDownloads();

=== modified file 'ubuntu-download-manager-tests/test_network_reply.cpp'
--- ubuntu-download-manager-tests/test_network_reply.cpp	2013-07-24 14:36:49 +0000
+++ ubuntu-download-manager-tests/test_network_reply.cpp	2013-09-25 16:08:34 +0000
@@ -22,11 +22,12 @@
 #include "./fake_qnetwork_reply.h"
 
 TestNetworkReply::TestNetworkReply(QObject *parent)
-    : QObject(parent) {
+    : BaseTestCase(parent) {
 }
 
 void
 TestNetworkReply::init() {
+    BaseTestCase::init();
     _qReply = new FakeQNetworkReply();
     _reply = new NetworkReply(_qReply);
 }

=== modified file 'ubuntu-download-manager-tests/test_network_reply.h'
--- ubuntu-download-manager-tests/test_network_reply.h	2013-07-24 14:37:36 +0000
+++ ubuntu-download-manager-tests/test_network_reply.h	2013-09-25 16:08:34 +0000
@@ -21,9 +21,10 @@
 
 #include <QObject>
 #include <network_reply.h>
+#include "./base_testcase.h"
 #include "./test_runner.h"
 
-class TestNetworkReply : public QObject {
+class TestNetworkReply : public BaseTestCase {
     Q_OBJECT
 
   public:
@@ -31,7 +32,7 @@
 
  private slots:  // NOLINT(whitespace/indent)
 
-    void init();
+    void init() override;
     void cleanup();
 
     // data functions used in the tests

=== modified file 'ubuntu-download-manager-tests/test_xdg_basedir.cpp'
--- ubuntu-download-manager-tests/test_xdg_basedir.cpp	2013-07-24 15:30:54 +0000
+++ ubuntu-download-manager-tests/test_xdg_basedir.cpp	2013-09-25 16:08:34 +0000
@@ -24,11 +24,12 @@
 
 
 TestXDGBasedir::TestXDGBasedir(QObject *parent)
-    : QObject(parent) {
+    : BaseTestCase(parent) {
 }
 
 void
 TestXDGBasedir::init() {
+    BaseTestCase::init();
     QList<QString> envVars;
     envVars << "XDG_CACHE_HOME" << "XDG_CONFIG_HOME" << "XDG_DATA_HOME"
         << "XDG_CONFIG_DIRS" << "XDG_DATA_DIRS";

=== modified file 'ubuntu-download-manager-tests/test_xdg_basedir.h'
--- ubuntu-download-manager-tests/test_xdg_basedir.h	2013-07-24 15:48:37 +0000
+++ ubuntu-download-manager-tests/test_xdg_basedir.h	2013-09-25 16:08:34 +0000
@@ -22,10 +22,11 @@
 #include <functional>
 #include <QHash>
 #include <QObject>
+#include "./base_testcase.h"
 #include "./xdg_basedir.h"
 #include "./test_runner.h"
 
-class TestXDGBasedir : public QObject {
+class TestXDGBasedir : public BaseTestCase {
     Q_OBJECT
 
  public:

=== modified file 'ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro'
--- ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-09-10 12:18:34 +0000
+++ ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-09-25 16:08:34 +0000
@@ -40,7 +40,8 @@
     fake_file_manager.cpp \
     test_downloads_db.cpp \
     test_download_factory.cpp \
-    fake_apparmor.cpp
+    fake_apparmor.cpp \
+    base_testcase.cpp
 
 HEADERS += \
     fake.h \
@@ -69,7 +70,8 @@
     fake_file_manager.h \
     test_downloads_db.h \
     test_download_factory.h \
-    fake_apparmor.h
+    fake_apparmor.h \
+    base_testcase.h
 
 LIBS += -L$$OUT_PWD/../libubuntudownloadmanager/ -lubuntudownloadmanager