127ad93 · unity8 · git.iko.soy

tests/mocks/Ubuntu/DownloadDaemonListener/CMakeLists.txt+1−1

compare with xenial

unifiedsplit

@@ -6,7 +6,7 @@ find_package(Qt5Quick REQUIRED)

6

7set(FakeUbuntuDownloadDaemonListenerQml_SOURCES

8 plugin.cpp

9− download_tracker.cpp

9+ MockDownloadTracker.cpp

10)

11

12add_library(FakeUbuntuDownloadDaemonListenerQml MODULE ${FakeUbuntuDownloadDaemonListenerQml_SOURCES})

tests/mocks/Ubuntu/DownloadDaemonListener/download_tracker.cpp → tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.cpprenamed+26−15

@@ -19,37 +19,48 @@

19 */

20

21

22−#include "download_tracker.h"

22+#include "MockDownloadTracker.h"

23

24−DownloadTracker::DownloadTracker(QObject *parent) :

24+MockDownloadTracker::MockDownloadTracker(QObject *parent) :

25 QObject(parent)

26{

27}

28

29−bool DownloadTracker::isServiceReady()

29+bool MockDownloadTracker::isServiceReady() const

30{

31− return active;

31+ return m_active;

32}

33

34−void DownloadTracker::setDbusPath(QString& path)

34+QString MockDownloadTracker::dbusPath() const

35{

36+ return m_dbusPath;

37+}

38+

39+void MockDownloadTracker::setDbusPath(const QString& path)

40+{

36− if(path != ""){

41+ if(!path.isEmpty()){

37− this->m_dbusPath = path;

42+ m_dbusPath = path;

38− this->startService();

43+ startService();

39 }

44 }

40}

45}

41

46

47+QString MockDownloadTracker::service() const

48+{

49+ return m_service;

50+}

51+

42−void DownloadTracker::setService(QString& service)

52+void MockDownloadTracker::setService(const QString& service)

43{

53{

44− if(service != ""){

54+ if(!service.isEmpty()){

45− this->m_service = service;

55+ m_service = service;

46− this->startService();

56+ startService();

47 }

57 }

48}

58}

49

59

50−void DownloadTracker::startService()

60+void MockDownloadTracker::startService()

51{

61{

52− if(!this->m_service.isEmpty() && !this->m_dbusPath.isEmpty()) {

62+ if(!m_service.isEmpty() && !m_dbusPath.isEmpty()) {

53− this->active = true;

63+ m_active = true;

64+ Q_EMIT serviceReadyChanged(m_active);

54 }

65 }

55}

66}

tests/mocks/Ubuntu/DownloadDaemonListener/download_tracker.h → tests/mocks/Ubuntu/DownloadDaemonListener/MockDownloadTracker.hrenamed+20−14

@@ -19,28 +19,34 @@

19 */

20

21

22−#ifndef MYTYPE_H

22+#ifndef MOCKDOWNLOADTRACKER_H

23−#define MYTYPE_H

23+#define MOCKDOWNLOADTRACKER_H

24

25#include <QObject>

26−#include <QList>

27

26

28−class DownloadTracker : public QObject

27+class MockDownloadTracker : public QObject

29{

28{

30 Q_OBJECT

29 Q_OBJECT

31− Q_DISABLE_COPY(DownloadTracker)

30+ Q_DISABLE_COPY(MockDownloadTracker)

32− Q_PROPERTY(QString service WRITE setService)

31+ Q_PROPERTY(QString service READ service WRITE setService NOTIFY serviceChanged)

33− Q_PROPERTY(QString dbusPath WRITE setDbusPath)

32+ Q_PROPERTY(QString dbusPath READ dbusPath WRITE setDbusPath NOTIFY dbusPathChanged)

34− Q_PROPERTY(bool serviceReady READ isServiceReady)

33+ Q_PROPERTY(bool serviceReady READ isServiceReady NOTIFY serviceReadyChanged)

35

34

36public:

35public:

37− explicit DownloadTracker(QObject *parent = 0);

36+ explicit MockDownloadTracker(QObject *parent = 0);

38

37

38+ QString service() const;

39+ QString dbusPath() const;

40+ bool isServiceReady() const;

41+

39− void setDbusPath(QString& path);

42+ void setDbusPath(const QString& path);

40− void setService(QString& service);

43+ void setService(const QString& service);

41− bool isServiceReady();

42

44

43Q_SIGNALS:

45Q_SIGNALS:

46+ void serviceChanged(const QString &service);

47+ void dbusPathChanged(const QString &dbusPath);

48+ void serviceReadyChanged(const bool &serviceReady);

49+

44 void canceled(bool success);

50 void canceled(bool success);

45 void error(const QString &error);

51 void error(const QString &error);

46 void finished(const QString &path);

52 void finished(const QString &path);

@@ -52,9 +58,9 @@ Q_SIGNALS:

52private:

58private:

53 QString m_dbusPath;

59 QString m_dbusPath;

54 QString m_service;

60 QString m_service;

55− bool active = false;

61+ bool m_active = false;

56

62

57 void startService();

63 void startService();

58};

64};

59

65

60−#endif // MYTYPE_H

66+#endif // MOCKDOWNLOADTRACKER_H

tests/mocks/Ubuntu/DownloadDaemonListener/plugin.cpp+2−2

@@ -15,7 +15,7 @@

15 */

16

17#include "plugin.h"

18−#include "download_tracker.h"

18+#include "MockDownloadTracker.h"

19

20#include <QtQml>

21#include <QtQml/QQmlContext>

@@ -24,5 +24,5 @@

24

25void FakeUbuntuDownloadDaemonListenerQmlPlugin::registerTypes(const char *uri)

26{

27− qmlRegisterType<DownloadTracker>(uri, 0, 1, "DownloadTracker");

27+ qmlRegisterType<MockDownloadTracker>(uri, 0, 1, "DownloadTracker");

28}