git.iko.soy/unity8
on xenial help sign in
also adjust mocks
8036529Michael Zanetti
tests/mocks/AccountsService/AccountsService.cpp+3−3
compare with xenial
unifiedsplit
@@ -24,7 +24,7 @@ AccountsService::AccountsService(QObject* parent)
24{
24{
25}
25}
26
26
27−QString AccountsService::getUser()
27+QString AccountsService::user() const
28{
28{
29 return "testuser";
29 return "testuser";
30}
30}
@@ -34,7 +34,7 @@ void AccountsService::setUser(const QString &user)
34 Q_UNUSED(user)
34 Q_UNUSED(user)
35}
35}
36
36
37−bool AccountsService::getDemoEdges()
37+bool AccountsService::demoEdges() const
38{
38{
39 return false;
39 return false;
40}
40}
@@ -44,7 +44,7 @@ void AccountsService::setDemoEdges(bool demoEdges)
44 Q_UNUSED(demoEdges)
44 Q_UNUSED(demoEdges)
45}
45}
46
46
47−QString AccountsService::getBackgroundFile()
47+QString AccountsService::backgroundFile() const
48{
48{
49 return m_backgroundFile;
49 return m_backgroundFile;
50}
50}
tests/mocks/AccountsService/AccountsService.h+6−6
@@ -28,26 +28,26 @@ class AccountsService: public QObject
28{
28{
29 Q_OBJECT
29 Q_OBJECT
30 Q_PROPERTY (QString user
30 Q_PROPERTY (QString user
31− READ getUser
31+ READ user
32 WRITE setUser
32 WRITE setUser
33 NOTIFY userChanged)
33 NOTIFY userChanged)
34 Q_PROPERTY (bool demoEdges
34 Q_PROPERTY (bool demoEdges
35− READ getDemoEdges
35+ READ demoEdges
36 WRITE setDemoEdges
36 WRITE setDemoEdges
37 NOTIFY demoEdgesChanged)
37 NOTIFY demoEdgesChanged)
38 Q_PROPERTY (QString backgroundFile
38 Q_PROPERTY (QString backgroundFile
39− READ getBackgroundFile
39+ READ backgroundFile
40 WRITE setBackgroundFile // only available in mock
40 WRITE setBackgroundFile // only available in mock
41 NOTIFY backgroundFileChanged)
41 NOTIFY backgroundFileChanged)
42
42
43public:
43public:
44 explicit AccountsService(QObject *parent = 0);
44 explicit AccountsService(QObject *parent = 0);
45
45
46− QString getUser();
46+ QString user() const;
47 void setUser(const QString &user);
47 void setUser(const QString &user);
48− bool getDemoEdges();
48+ bool demoEdges() const;
49 void setDemoEdges(bool demoEdges);
49 void setDemoEdges(bool demoEdges);
50− QString getBackgroundFile();
50+ QString backgroundFile() const;
51 void setBackgroundFile(const QString &backgroundFile);
51 void setBackgroundFile(const QString &backgroundFile);
52
52
53Q_SIGNALS:
53Q_SIGNALS: