on xenial help sign in
Fix MockDownloadTracker.
commit127ad931f6008264e2ad9e48d5d85dade5aa1f0e authorMichał Sawicz <michal.sawicz@canonical.com> dateMon 12 Aug 2013, 10:00 (13 years ago) parent5e385bb
4 files changed+49−32
tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt+1−1 tests/mocks/Ubuntu/DownloadDaemonListener/download_tracker.cpp → tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpp+26−15 tests/mocks/Ubuntu/DownloadDaemonListener/download_tracker.h → tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.h+20−14 tests/mocks/Ubuntu/DownloadDaemonListener/plugin.cpp+2−2
tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt+1−1
@@ -6,7 +6,7 @@ find_package(Qt5Quick REQUIRED)
66
77set(FakeUbuntuDownloadDaemonListenerQml_SOURCES
88 plugin.cpp
9− download_tracker.cpp
9+ MockDownloadTracker.cpp
1010)
1111
1212add_library(FakeUbuntuDownloadDaemonListenerQml MODULE ${FakeUbuntuDownloadDaemonListenerQml_SOURCES})
tests/mocks/Ubuntu/DownloadDaemonListener/download_tracker.cpp → tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpprenamed+26−15
@@ -19,37 +19,48 @@
1919 */
2020
2121
22−#include "download_tracker.h"
22+#include "MockDownloadTracker.h"
2323
24−DownloadTracker::DownloadTracker(QObject *parent) :
24+MockDownloadTracker::MockDownloadTracker(QObject *parent) :
2525 QObject(parent)
2626{
2727}
2828
29−bool DownloadTracker::isServiceReady()
29+bool MockDownloadTracker::isServiceReady() const
3030{
31− return active;
31+ return m_active;
3232}
3333
34−void DownloadTracker::setDbusPath(QString& path)
34+QString MockDownloadTracker::dbusPath() const
3535{
36− if(path != ""){
37− this->m_dbusPath = path;
38− this->startService();
36+ return m_dbusPath;
37+}
38+
39+void MockDownloadTracker::setDbusPath(const QString& path)
40+{
41+ if(!path.isEmpty()){
42+ m_dbusPath = path;
43+ startService();
3944 }
4045}
4146
42−void DownloadTracker::setService(QString& service)
47+QString MockDownloadTracker::service() const
48+{
49+ return m_service;
50+}
51+
52+void MockDownloadTracker::setService(const QString& service)
4353{
44− if(service != ""){
45− this->m_service = service;
46− this->startService();
54+ if(!service.isEmpty()){
55+ m_service = service;
56+ startService();
4757 }
4858}
4959
50−void DownloadTracker::startService()
60+void MockDownloadTracker::startService()
5161{
52− if(!this->m_service.isEmpty() && !this->m_dbusPath.isEmpty()) {
53− this->active = true;
62+ if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {
63+ m_active = true;
64+ Q_EMIT serviceReadyChanged(m_active);
5465 }
5566}
tests/mocks/Ubuntu/DownloadDaemonListener/download_tracker.h → tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.hrenamed+20−14
@@ -19,28 +19,34 @@
1919 */
2020
2121
22−#ifndef MYTYPE_H
23−#define MYTYPE_H
22+#ifndef MOCKDOWNLOADTRACKER_H
23+#define MOCKDOWNLOADTRACKER_H
2424
2525#include <QObject>
26−#include <QList>
2726
28−class DownloadTracker : public QObject
27+class MockDownloadTracker : public QObject
2928{
3029 Q_OBJECT
31− Q_DISABLE_COPY(DownloadTracker)
32− Q_PROPERTY(QString service WRITE setService)
33− Q_PROPERTY(QString dbusPath WRITE setDbusPath)
34− Q_PROPERTY(bool serviceReady READ isServiceReady)
30+ Q_DISABLE_COPY(MockDownloadTracker)
31+ Q_PROPERTY(QString service READ service WRITE setService NOTIFY serviceChanged)
32+ Q_PROPERTY(QString dbusPath READ dbusPath WRITE setDbusPath NOTIFY dbusPathChanged)
33+ Q_PROPERTY(bool serviceReady READ isServiceReady NOTIFY serviceReadyChanged)
3534
3635public:
37− explicit DownloadTracker(QObject *parent = 0);
36+ explicit MockDownloadTracker(QObject *parent = 0);
3837
39− void setDbusPath(QString& path);
40− void setService(QString& service);
41− bool isServiceReady();
38+ QString service() const;
39+ QString dbusPath() const;
40+ bool isServiceReady() const;
41+
42+ void setDbusPath(const QString& path);
43+ void setService(const QString& service);
4244
4345Q_SIGNALS:
46+ void serviceChanged(const QString &service);
47+ void dbusPathChanged(const QString &dbusPath);
48+ void serviceReadyChanged(const bool &serviceReady);
49+
4450 void canceled(bool success);
4551 void error(const QString &error);
4652 void finished(const QString &path);
@@ -52,9 +58,9 @@ Q_SIGNALS:
5258private:
5359 QString m_dbusPath;
5460 QString m_service;
55− bool active = false;
61+ bool m_active = false;
5662
5763 void startService();
5864};
5965
60−#endif // MYTYPE_H
66+#endif // MOCKDOWNLOADTRACKER_H
tests/mocks/Ubuntu/DownloadDaemonListener/plugin.cpp+2−2
@@ -15,7 +15,7 @@
1515 */
1616
1717#include "plugin.h"
18−#include "download_tracker.h"
18+#include "MockDownloadTracker.h"
1919
2020#include <QtQml>
2121#include <QtQml/QQmlContext>
@@ -24,5 +24,5 @@
2424
2525void FakeUbuntuDownloadDaemonListenerQmlPlugin::registerTypes(const char *uri)
2626{
27− qmlRegisterType<DownloadTracker>(uri, 0, 1, "DownloadTracker");
27+ qmlRegisterType<MockDownloadTracker>(uri, 0, 1, "DownloadTracker");
2828}