1
=== modified file '.bzrignore'
2
--- .bzrignore	2015-04-22 13:44:53 +0000
3
+++ .bzrignore	2015-05-11 13:17:00 +0000
4
@@ -33,6 +33,7 @@
5
33
indicator/*.desktop
33
indicator/*.desktop
6
34
indicator/*.service
34
indicator/*.service
7
35
indicator/NotificationsInterface.*
35
indicator/NotificationsInterface.*
8
36
indicator/indicatoradaptor.*
9
36
37
10
37
Testing
38
Testing
11
38
Ubuntu/Telephony/qmldir
39
Ubuntu/Telephony/qmldir
12
39
40
13
=== modified file 'cmake/modules/GenerateTest.cmake'
14
--- cmake/modules/GenerateTest.cmake	2015-04-22 13:20:02 +0000
15
+++ cmake/modules/GenerateTest.cmake	2015-05-11 13:17:00 +0000
16
@@ -113,7 +113,6 @@
17
113
              --task dconf -p write -p /org/gnome/empathy/use-conn -p false --task-name dconf-write --wait-for ca.desrt.dconf --ignore-return
113
              --task dconf -p write -p /org/gnome/empathy/use-conn -p false --task-name dconf-write --wait-for ca.desrt.dconf --ignore-return
18
114
              --task /usr/lib/telepathy/mission-control-5 --task-name mission-control --wait-for ca.desrt.dconf --ignore-return
114
              --task /usr/lib/telepathy/mission-control-5 --task-name mission-control --wait-for ca.desrt.dconf --ignore-return
19
115
              --task ${CMAKE_BINARY_DIR}/tests/common/mock/telepathy-mock --task-name telepathy-mock --wait-for org.freedesktop.Telepathy.MissionControl5 --ignore-return
115
              --task ${CMAKE_BINARY_DIR}/tests/common/mock/telepathy-mock --task-name telepathy-mock --wait-for org.freedesktop.Telepathy.MissionControl5 --ignore-return
20
116
              --task dbus-monitor --task-name dbus-monitor --ignore-return
21
117
              # FIXME: maybe it would be better to decide whether to run the handler in a per-test basis?
116
              # FIXME: maybe it would be better to decide whether to run the handler in a per-test basis?
22
118
              --task ${CMAKE_BINARY_DIR}/handler/telephony-service-handler --task-name telephony-service-handler --wait-for org.freedesktop.Telepathy.ConnectionManager.mock --ignore-return
117
              --task ${CMAKE_BINARY_DIR}/handler/telephony-service-handler --task-name telephony-service-handler --wait-for org.freedesktop.Telepathy.ConnectionManager.mock --ignore-return
23
119
              ${ARG_TASKS})
118
              ${ARG_TASKS})
24
120
119
25
=== modified file 'libtelephonyservice/accountentry.cpp'
26
--- libtelephonyservice/accountentry.cpp	2015-04-16 16:45:59 +0000
27
+++ libtelephonyservice/accountentry.cpp	2015-05-11 13:17:00 +0000
28
@@ -22,14 +22,18 @@
29
22
#include <TelepathyQt/PendingOperation>
22
#include <TelepathyQt/PendingOperation>
30
23
#include <QTimer>
23
#include <QTimer>
31
24
#include "accountentry.h"
24
#include "accountentry.h"
32
25
#include "telepathyhelper.h"
33
26
25
34
27
AccountEntry::AccountEntry(const Tp::AccountPtr &account, QObject *parent) :
26
AccountEntry::AccountEntry(const Tp::AccountPtr &account, QObject *parent) :
36
28
    QObject(parent), mAccount(account)
27
    QObject(parent), mAccount(account), mReady(false)
37
29
{
28
{
38
30
    initialize();
29
    initialize();
39
31
}
30
}
40
32
31
41
32
bool AccountEntry::ready() const
42
33
{
43
34
    return mReady;
44
35
}
45
36
46
33
QString AccountEntry::accountId() const
37
QString AccountEntry::accountId() const
47
34
{
38
{
48
35
    if (mAccount.isNull()) {
39
    if (mAccount.isNull()) {
49
@@ -184,6 +188,7 @@
50
184
        onConnectionChanged();
188
        onConnectionChanged();
51
185
    }
189
    }
52
186
190
53
191
    mReady = true;
54
187
    Q_EMIT accountReady();
192
    Q_EMIT accountReady();
55
188
}
193
}
56
189
194
57
190
195
58
=== modified file 'libtelephonyservice/accountentry.h'
59
--- libtelephonyservice/accountentry.h	2015-04-14 17:25:36 +0000
60
+++ libtelephonyservice/accountentry.h	2015-05-11 13:17:00 +0000
61
@@ -51,6 +51,7 @@
62
51
        GenericAccount
51
        GenericAccount
63
52
    };
52
    };
64
53
53
65
54
    bool ready() const;
66
54
    QString accountId() const;
55
    QString accountId() const;
67
55
    bool active() const;
56
    bool active() const;
68
56
    QString displayName() const;
57
    QString displayName() const;
69
@@ -90,6 +91,7 @@
70
90
91
71
91
    Tp::AccountPtr mAccount;
92
    Tp::AccountPtr mAccount;
72
92
    ConnectionInfo mConnectionInfo;
93
    ConnectionInfo mConnectionInfo;
73
94
    bool mReady;
74
93
};
95
};
75
94
96
76
95
#endif // ACCOUNTENTRY_H
97
#endif // ACCOUNTENTRY_H
77
96
98
78
=== modified file 'libtelephonyservice/callentry.cpp'
79
--- libtelephonyservice/callentry.cpp	2015-02-06 20:44:14 +0000
80
+++ libtelephonyservice/callentry.cpp	2015-05-11 13:17:00 +0000
81
@@ -79,7 +79,7 @@
82
79
79
83
80
    // in case the account is an ofono account, we can check the voicemail number
80
    // in case the account is an ofono account, we can check the voicemail number
84
81
    OfonoAccountEntry *ofonoAccount = qobject_cast<OfonoAccountEntry*>(mAccount);
81
    OfonoAccountEntry *ofonoAccount = qobject_cast<OfonoAccountEntry*>(mAccount);
86
82
    if (ofonoAccount && ofonoAccount->voicemailNumber().isEmpty()) {
82
    if (ofonoAccount && !ofonoAccount->voicemailNumber().isEmpty()) {
87
83
        setVoicemail(phoneNumber() == ofonoAccount->voicemailNumber());
83
        setVoicemail(phoneNumber() == ofonoAccount->voicemailNumber());
88
84
    }
84
    }
89
85
85
90
86
86
91
=== modified file 'libtelephonyservice/ofonoaccountentry.cpp'
92
--- libtelephonyservice/ofonoaccountentry.cpp	2015-04-16 22:26:23 +0000
93
+++ libtelephonyservice/ofonoaccountentry.cpp	2015-05-11 13:17:00 +0000
94
@@ -20,8 +20,8 @@
95
20
 */
20
 */
96
21
21
97
22
#include "ofonoaccountentry.h"
22
#include "ofonoaccountentry.h"
98
23
#include "phoneutils.h"
99
23
#include "telepathyhelper.h"
24
#include "telepathyhelper.h"
100
24
#include "phoneutils.h"
101
25
25
102
26
OfonoAccountEntry::OfonoAccountEntry(const Tp::AccountPtr &account, QObject *parent) :
26
OfonoAccountEntry::OfonoAccountEntry(const Tp::AccountPtr &account, QObject *parent) :
103
27
    AccountEntry(account, parent), mVoicemailCount(0), mVoicemailIndicator(false)
27
    AccountEntry(account, parent), mVoicemailCount(0), mVoicemailIndicator(false)
104
@@ -181,6 +181,8 @@
105
181
        if (replyNumber.isValid()) {
181
        if (replyNumber.isValid()) {
106
182
            mVoicemailNumber = replyNumber.value();
182
            mVoicemailNumber = replyNumber.value();
107
183
            Q_EMIT voicemailNumberChanged();
183
            Q_EMIT voicemailNumberChanged();
108
184
        } else {
109
185
            qWarning() << "Could not get voicemail number!";
110
184
        }
186
        }
111
185
187
112
186
        // connect the voicemail count changed signal
188
        // connect the voicemail count changed signal
113
187
189
114
=== modified file 'libtelephonyservice/telepathyhelper.cpp'
115
--- libtelephonyservice/telepathyhelper.cpp	2015-04-17 20:09:25 +0000
116
+++ libtelephonyservice/telepathyhelper.cpp	2015-05-11 13:17:00 +0000
117
@@ -451,6 +451,7 @@
118
451
    Q_EMIT activeAccountsChanged();
451
    Q_EMIT activeAccountsChanged();
119
452
    onSettingsChanged("defaultSimForMessages");
452
    onSettingsChanged("defaultSimForMessages");
120
453
    onSettingsChanged("defaultSimForCalls");
453
    onSettingsChanged("defaultSimForCalls");
121
454
    Q_EMIT accountAdded(accountEntry);
122
454
}
455
}
123
455
456
124
456
void TelepathyHelper::onAccountManagerReady(Tp::PendingOperation *op)
457
void TelepathyHelper::onAccountManagerReady(Tp::PendingOperation *op)
125
457
458
126
=== modified file 'libtelephonyservice/telepathyhelper.h'
127
--- libtelephonyservice/telepathyhelper.h	2015-04-17 20:09:25 +0000
128
+++ libtelephonyservice/telepathyhelper.h	2015-05-11 13:17:00 +0000
129
@@ -110,6 +110,7 @@
130
110
    void connectedChanged();
110
    void connectedChanged();
131
111
    void accountIdsChanged();
111
    void accountIdsChanged();
132
112
    void accountsChanged();
112
    void accountsChanged();
133
113
    void accountAdded(AccountEntry *account);
134
113
    void phoneAccountsChanged();
114
    void phoneAccountsChanged();
135
114
    void activeAccountsChanged();
115
    void activeAccountsChanged();
136
115
    void setupReady();
116
    void setupReady();
137
116
117
138
=== modified file 'tests/common/mock/connection.cpp'
139
--- tests/common/mock/connection.cpp	2015-04-17 19:52:20 +0000
140
+++ tests/common/mock/connection.cpp	2015-05-11 13:17:00 +0000
141
@@ -77,7 +77,7 @@
142
77
77
143
78
    // init presence interface
78
    // init presence interface
144
79
    simplePresenceIface = Tp::BaseConnectionSimplePresenceInterface::create();
79
    simplePresenceIface = Tp::BaseConnectionSimplePresenceInterface::create();
146
80
    simplePresenceIface->setSetPresenceCallback(Tp::memFun(this,&MockConnection::setPresence));
80
    simplePresenceIface->setSetPresenceCallback(Tp::memFun(this,&MockConnection::setPresenceFail));
147
81
    simplePresenceIface->setMaxmimumStatusMessageLength(255);
81
    simplePresenceIface->setMaxmimumStatusMessageLength(255);
148
82
    plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(simplePresenceIface));
82
    plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(simplePresenceIface));
149
83
83
150
@@ -137,7 +137,7 @@
151
137
    plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(voicemailIface));
137
    plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(voicemailIface));
152
138
    voicemailIface->setVoicemailCount(mVoicemailCount);
138
    voicemailIface->setVoicemailCount(mVoicemailCount);
153
139
    voicemailIface->setVoicemailIndicator(mVoicemailIndicator);
139
    voicemailIface->setVoicemailIndicator(mVoicemailIndicator);
155
140
    mVoicemailNumber = "555";
140
    mVoicemailNumber = "*555";
156
141
141
157
142
    supplementaryServicesIface = BaseConnectionUSSDInterface::create();
142
    supplementaryServicesIface = BaseConnectionUSSDInterface::create();
158
143
    supplementaryServicesIface->setInitiateCallback(Tp::memFun(this,&MockConnection::USSDInitiate));
143
    supplementaryServicesIface->setInitiateCallback(Tp::memFun(this,&MockConnection::USSDInitiate));
159
@@ -151,6 +151,8 @@
160
151
    plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(supplementaryServicesIface));
151
    plugInterface(Tp::AbstractConnectionInterfacePtr::dynamicCast(supplementaryServicesIface));
161
152
152
162
153
    mDBus = new MockConnectionDBus(this);
153
    mDBus = new MockConnectionDBus(this);
163
154
164
155
    setOnline(true);
165
154
}
156
}
166
155
157
167
156
MockConnection::~MockConnection()
158
MockConnection::~MockConnection()
168
@@ -232,6 +234,12 @@
169
232
    return selfHandle();
234
    return selfHandle();
170
233
}
235
}
171
234
236
172
237
uint MockConnection::setPresenceFail(const QString &status, const QString &statusMessage, Tp::DBusError *error)
173
238
{
174
239
    error->set(TP_QT_ERROR_NOT_AVAILABLE, "Can't change online status: Operation not supported");
175
240
    return selfHandle();
176
241
}
177
242
178
235
Tp::ContactAttributesMap MockConnection::getContactAttributes(const Tp::UIntList &handles, const QStringList &ifaces, Tp::DBusError *error)
243
Tp::ContactAttributesMap MockConnection::getContactAttributes(const Tp::UIntList &handles, const QStringList &ifaces, Tp::DBusError *error)
179
236
{
244
{
180
237
    qDebug() << "getContactAttributes" << handles << ifaces;
245
    qDebug() << "getContactAttributes" << handles << ifaces;
181
238
246
182
=== modified file 'tests/common/mock/connection.h'
183
--- tests/common/mock/connection.h	2015-04-17 19:52:20 +0000
184
+++ tests/common/mock/connection.h	2015-05-11 13:17:00 +0000
185
@@ -59,6 +59,7 @@
186
59
                                     uint targetHandle, const QVariantMap& hints, Tp::DBusError *error);
59
                                     uint targetHandle, const QVariantMap& hints, Tp::DBusError *error);
187
60
    Tp::ContactAttributesMap getContactAttributes(const Tp::UIntList &handles, const QStringList &ifaces, Tp::DBusError *error);
60
    Tp::ContactAttributesMap getContactAttributes(const Tp::UIntList &handles, const QStringList &ifaces, Tp::DBusError *error);
188
61
    uint setPresence(const QString& status, const QString& statusMessage, Tp::DBusError *error);
61
    uint setPresence(const QString& status, const QString& statusMessage, Tp::DBusError *error);
189
62
    uint setPresenceFail(const QString& status, const QString& statusMessage, Tp::DBusError *error);
190
62
    void connect(Tp::DBusError *error);
63
    void connect(Tp::DBusError *error);
191
63
    void setOnline(bool online);
64
    void setOnline(bool online);
192
64
65
193
65
66
194
=== modified file 'tests/common/mock/mockconnectiondbus.cpp'
195
--- tests/common/mock/mockconnectiondbus.cpp	2015-04-17 19:52:20 +0000
196
+++ tests/common/mock/mockconnectiondbus.cpp	2015-05-11 13:17:00 +0000
197
@@ -93,121 +93,145 @@
198
93
93
199
94
void MockConnectionDBus::PlaceIncomingMessage(const QString &message, const QVariantMap &properties)
94
void MockConnectionDBus::PlaceIncomingMessage(const QString &message, const QVariantMap &properties)
200
95
{
95
{
201
96
    qDebug() << __PRETTY_FUNCTION__ << message << properties;
202
96
    mConnection->placeIncomingMessage(message, properties);
97
    mConnection->placeIncomingMessage(message, properties);
203
97
}
98
}
204
98
99
205
99
QString MockConnectionDBus::PlaceCall(const QVariantMap &properties)
100
QString MockConnectionDBus::PlaceCall(const QVariantMap &properties)
206
100
{
101
{
207
102
    qDebug() << __PRETTY_FUNCTION__ << properties;
208
101
    return mConnection->placeCall(properties);
103
    return mConnection->placeCall(properties);
209
102
}
104
}
210
103
105
211
104
void MockConnectionDBus::HangupCall(const QString &callerId)
106
void MockConnectionDBus::HangupCall(const QString &callerId)
212
105
{
107
{
213
108
    qDebug() << __PRETTY_FUNCTION__ << callerId;
214
106
    mConnection->hangupCall(callerId);
109
    mConnection->hangupCall(callerId);
215
107
}
110
}
216
108
111
217
109
void MockConnectionDBus::SetCallState(const QString &phoneNumber, const QString &state)
112
void MockConnectionDBus::SetCallState(const QString &phoneNumber, const QString &state)
218
110
{
113
{
219
114
    qDebug() << __PRETTY_FUNCTION__ << phoneNumber << state;
220
111
    mConnection->setCallState(phoneNumber, state);
115
    mConnection->setCallState(phoneNumber, state);
221
112
}
116
}
222
113
117
223
114
void MockConnectionDBus::SetOnline(bool online)
118
void MockConnectionDBus::SetOnline(bool online)
224
115
{
119
{
225
120
    qDebug() << __PRETTY_FUNCTION__ << online;
226
116
    mConnection->setOnline(online);
121
    mConnection->setOnline(online);
227
117
}
122
}
228
118
123
229
119
void MockConnectionDBus::SetPresence(const QString &status, const QString &statusMessage)
124
void MockConnectionDBus::SetPresence(const QString &status, const QString &statusMessage)
230
120
{
125
{
231
126
    qDebug() << __PRETTY_FUNCTION__ << status << statusMessage;
232
121
    Tp::DBusError error;
127
    Tp::DBusError error;
233
122
    mConnection->setPresence(status, statusMessage, &error);
128
    mConnection->setPresence(status, statusMessage, &error);
234
123
}
129
}
235
124
130
236
125
void MockConnectionDBus::SetVoicemailIndicator(bool active)
131
void MockConnectionDBus::SetVoicemailIndicator(bool active)
237
126
{
132
{
238
133
    qDebug() << __PRETTY_FUNCTION__ << active;
239
127
    mConnection->setVoicemailIndicator(active);
134
    mConnection->setVoicemailIndicator(active);
240
128
}
135
}
241
129
136
242
130
void MockConnectionDBus::SetVoicemailNumber(const QString &number)
137
void MockConnectionDBus::SetVoicemailNumber(const QString &number)
243
131
{
138
{
244
139
    qDebug() << __PRETTY_FUNCTION__ << number;
245
132
    mConnection->setVoicemailNumber(number);
140
    mConnection->setVoicemailNumber(number);
246
133
}
141
}
247
134
142
248
135
void MockConnectionDBus::SetVoicemailCount(int count)
143
void MockConnectionDBus::SetVoicemailCount(int count)
249
136
{
144
{
250
145
    qDebug() << __PRETTY_FUNCTION__ << count;
251
137
    mConnection->setVoicemailCount(count);
146
    mConnection->setVoicemailCount(count);
252
138
}
147
}
253
139
148
254
140
void MockConnectionDBus::SetEmergencyNumbers(const QStringList &numbers)
149
void MockConnectionDBus::SetEmergencyNumbers(const QStringList &numbers)
255
141
{
150
{
256
151
    qDebug() << __PRETTY_FUNCTION__ << numbers;
257
142
    mConnection->setEmergencyNumbers(numbers);
152
    mConnection->setEmergencyNumbers(numbers);
258
143
}
153
}
259
144
154
260
145
QString MockConnectionDBus::Serial()
155
QString MockConnectionDBus::Serial()
261
146
{
156
{
262
157
    qDebug() << __PRETTY_FUNCTION__ << mConnection->serial();
263
147
    return mConnection->serial();
158
    return mConnection->serial();
264
148
}
159
}
265
149
160
266
150
void MockConnectionDBus::TriggerUSSDNotificationReceived(const QString &message)
161
void MockConnectionDBus::TriggerUSSDNotificationReceived(const QString &message)
267
151
{
162
{
268
163
    qDebug() << __PRETTY_FUNCTION__ << message;
269
152
    mConnection->supplementaryServicesIface->NotificationReceived(message);
164
    mConnection->supplementaryServicesIface->NotificationReceived(message);
270
153
}
165
}
271
154
166
272
155
void MockConnectionDBus::TriggerUSSDRequestReceived(const QString &message)
167
void MockConnectionDBus::TriggerUSSDRequestReceived(const QString &message)
273
156
{
168
{
274
169
    qDebug() << __PRETTY_FUNCTION__ << message;
275
157
    mConnection->supplementaryServicesIface->RequestReceived(message);
170
    mConnection->supplementaryServicesIface->RequestReceived(message);
276
158
}
171
}
277
159
172
278
160
void MockConnectionDBus::TriggerUSSDInitiateUSSDComplete(const QString &ussdResp)
173
void MockConnectionDBus::TriggerUSSDInitiateUSSDComplete(const QString &ussdResp)
279
161
{
174
{
280
175
    qDebug() << __PRETTY_FUNCTION__ << ussdResp;
281
162
    mConnection->supplementaryServicesIface->InitiateUSSDComplete(ussdResp);
176
    mConnection->supplementaryServicesIface->InitiateUSSDComplete(ussdResp);
282
163
}
177
}
283
164
178
284
165
void MockConnectionDBus::TriggerUSSDRespondComplete(bool success, const QString &ussdResp)
179
void MockConnectionDBus::TriggerUSSDRespondComplete(bool success, const QString &ussdResp)
285
166
{
180
{
286
181
    qDebug() << __PRETTY_FUNCTION__ << ussdResp;
287
167
    mConnection->supplementaryServicesIface->RespondComplete(success, ussdResp);
182
    mConnection->supplementaryServicesIface->RespondComplete(success, ussdResp);
288
168
}
183
}
289
169
184
290
170
void MockConnectionDBus::TriggerUSSDBarringComplete(const QString &ssOp, const QString &cbService, const QVariantMap &cbMap)
185
void MockConnectionDBus::TriggerUSSDBarringComplete(const QString &ssOp, const QString &cbService, const QVariantMap &cbMap)
291
171
{
186
{
292
187
    qDebug() << __PRETTY_FUNCTION__ << ssOp << cbService << cbMap;
293
172
    mConnection->supplementaryServicesIface->BarringComplete(ssOp, cbService, cbMap);
188
    mConnection->supplementaryServicesIface->BarringComplete(ssOp, cbService, cbMap);
294
173
}
189
}
295
174
190
296
175
void MockConnectionDBus::TriggerUSSDForwardingComplete(const QString &ssOp, const QString &cfService, const QVariantMap &cfMap)
191
void MockConnectionDBus::TriggerUSSDForwardingComplete(const QString &ssOp, const QString &cfService, const QVariantMap &cfMap)
297
176
{
192
{
298
193
    qDebug() << __PRETTY_FUNCTION__ << ssOp << cfService << cfMap;
299
177
    mConnection->supplementaryServicesIface->ForwardingComplete(ssOp, cfService, cfMap);
194
    mConnection->supplementaryServicesIface->ForwardingComplete(ssOp, cfService, cfMap);
300
178
}
195
}
301
179
196
302
180
void MockConnectionDBus::TriggerUSSDWaitingComplete(const QString &ssOp, const QVariantMap &cwMap)
197
void MockConnectionDBus::TriggerUSSDWaitingComplete(const QString &ssOp, const QVariantMap &cwMap)
303
181
{
198
{
304
199
    qDebug() << __PRETTY_FUNCTION__ << ssOp << cwMap;
305
182
    mConnection->supplementaryServicesIface->WaitingComplete(ssOp, cwMap);
200
    mConnection->supplementaryServicesIface->WaitingComplete(ssOp, cwMap);
306
183
}
201
}
307
184
202
308
185
void MockConnectionDBus::TriggerUSSDCallingLinePresentationComplete(const QString &ssOp, const QString &status)
203
void MockConnectionDBus::TriggerUSSDCallingLinePresentationComplete(const QString &ssOp, const QString &status)
309
186
{
204
{
310
205
    qDebug() << __PRETTY_FUNCTION__ << ssOp << status;
311
187
    mConnection->supplementaryServicesIface->CallingLinePresentationComplete(ssOp, status);
206
    mConnection->supplementaryServicesIface->CallingLinePresentationComplete(ssOp, status);
312
188
}
207
}
313
189
208
314
190
void MockConnectionDBus::TriggerUSSDConnectedLinePresentationComplete(const QString &ssOp, const QString &status)
209
void MockConnectionDBus::TriggerUSSDConnectedLinePresentationComplete(const QString &ssOp, const QString &status)
315
191
{
210
{
316
211
    qDebug() << __PRETTY_FUNCTION__ << ssOp << status;
317
192
    mConnection->supplementaryServicesIface->ConnectedLinePresentationComplete(ssOp, status);
212
    mConnection->supplementaryServicesIface->ConnectedLinePresentationComplete(ssOp, status);
318
193
}
213
}
319
194
214
320
195
void MockConnectionDBus::TriggerUSSDCallingLineRestrictionComplete(const QString &ssOp, const QString &status)
215
void MockConnectionDBus::TriggerUSSDCallingLineRestrictionComplete(const QString &ssOp, const QString &status)
321
196
{
216
{
322
217
    qDebug() << __PRETTY_FUNCTION__ << ssOp << status;
323
197
    mConnection->supplementaryServicesIface->CallingLineRestrictionComplete(ssOp, status);
218
    mConnection->supplementaryServicesIface->CallingLineRestrictionComplete(ssOp, status);
324
198
}
219
}
325
199
220
326
200
void MockConnectionDBus::TriggerUSSDConnectedLineRestrictionComplete(const QString &ssOp, const QString &status)
221
void MockConnectionDBus::TriggerUSSDConnectedLineRestrictionComplete(const QString &ssOp, const QString &status)
327
201
{
222
{
328
223
    qDebug() << __PRETTY_FUNCTION__ << ssOp << status;
329
202
    mConnection->supplementaryServicesIface->ConnectedLineRestrictionComplete(ssOp, status);
224
    mConnection->supplementaryServicesIface->ConnectedLineRestrictionComplete(ssOp, status);
330
203
}
225
}
331
204
226
332
205
void MockConnectionDBus::TriggerUSSDInitiateFailed()
227
void MockConnectionDBus::TriggerUSSDInitiateFailed()
333
206
{
228
{
334
229
    qDebug() << __PRETTY_FUNCTION__;
335
207
    mConnection->supplementaryServicesIface->InitiateFailed();
230
    mConnection->supplementaryServicesIface->InitiateFailed();
336
208
}
231
}
337
209
232
338
210
void MockConnectionDBus::TriggerUSSDStateChanged(const QString &state)
233
void MockConnectionDBus::TriggerUSSDStateChanged(const QString &state)
339
211
{
234
{
340
235
    qDebug() << __PRETTY_FUNCTION__ << state;
341
212
    mConnection->supplementaryServicesIface->StateChanged(state);
236
    mConnection->supplementaryServicesIface->StateChanged(state);
342
213
}
237
}
343
214
238
344
=== modified file 'tests/common/telepathytest.cpp'
345
--- tests/common/telepathytest.cpp	2015-03-27 02:47:52 +0000
346
+++ tests/common/telepathytest.cpp	2015-05-11 13:17:00 +0000
347
@@ -17,7 +17,6 @@
348
17
 */
17
 */
349
18
18
350
19
#include <QtCore/QObject>
19
#include <QtCore/QObject>
351
20
#include <QtTest/QtTest>
352
21
#include <TelepathyQt/PendingAccount>
20
#include <TelepathyQt/PendingAccount>
353
22
#include <TelepathyQt/PendingOperation>
21
#include <TelepathyQt/PendingOperation>
354
23
#include <TelepathyQt/Account>
22
#include <TelepathyQt/Account>
355
@@ -29,15 +28,6 @@
356
29
{
28
{
357
30
    Tp::registerTypes();
29
    Tp::registerTypes();
358
31
30
359
32
    QSignalSpy spy(TelepathyHelper::instance(), SIGNAL(setupReady()));
360
33
    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, DEFAULT_TIMEOUT);
361
34
362
35
    // just in case, remove any existing account that might be a leftover from
363
36
    // previous test runs
364
37
    Q_FOREACH(const AccountEntry *account, TelepathyHelper::instance()->accounts()) {
365
38
        QVERIFY(removeAccount(account->account()));
366
39
    }
367
40
368
41
    // create an account manager instance to help testing
31
    // create an account manager instance to help testing
369
42
    Tp::Features accountFeatures;
32
    Tp::Features accountFeatures;
370
43
    accountFeatures << Tp::Account::FeatureCore
33
    accountFeatures << Tp::Account::FeatureCore
371
@@ -65,13 +55,15 @@
372
65
    mReady = false;
55
    mReady = false;
373
66
    connect(mAccountManager->becomeReady(Tp::AccountManager::FeatureCore),
56
    connect(mAccountManager->becomeReady(Tp::AccountManager::FeatureCore),
374
67
            &Tp::PendingOperation::finished, [=]{
57
            &Tp::PendingOperation::finished, [=]{
375
58
        Q_FOREACH(const Tp::AccountPtr &account, mAccountManager->allAccounts()) {
376
59
            Tp::PendingOperation *op = account->remove();
377
60
            WAIT_FOR(op->isFinished());
378
61
        }
379
62
380
68
        mReady = true;
63
        mReady = true;
381
69
    });
64
    });
382
70
65
387
71
    QTRY_VERIFY(mReady);
66
    TRY_VERIFY(mReady);
384
72
385
73
    // give some time for telepathy stuff to settle
386
74
    QTest::qWait(1000);
388
75
}
67
}
389
76
68
390
77
void TelepathyTest::doCleanup()
69
void TelepathyTest::doCleanup()
391
@@ -101,9 +93,11 @@
392
101
        finished = true;
93
        finished = true;
393
102
    });
94
    });
394
103
95
398
104
    while (!finished) {
96
    WAIT_FOR(finished);
399
105
        QTest::qWait(100);
97
    WAIT_FOR(!account->connection().isNull());
400
106
    }
98
    WAIT_FOR(account->connectionStatus() == Tp::ConnectionStatusConnected);
401
99
    WAIT_FOR(account->connection()->selfContact()->presence().type() == Tp::ConnectionPresenceTypeAvailable);
402
100
403
107
    mAccounts << account;
101
    mAccounts << account;
404
108
    return account;
102
    return account;
405
109
}
103
}
406
@@ -119,9 +113,8 @@
407
119
        finished = true;
113
        finished = true;
408
120
    });
114
    });
409
121
115
413
122
    while (!finished) {
116
    WAIT_FOR(finished);
414
123
        QTest::qWait(100);
117
412
124
    }
415
125
    if (success) {
118
    if (success) {
416
126
        mAccounts.removeAll(account);
119
        mAccounts.removeAll(account);
417
127
    }
120
    }
418
128
121
419
=== modified file 'tests/common/telepathytest.h'
420
--- tests/common/telepathytest.h	2015-03-30 18:48:38 +0000
421
+++ tests/common/telepathytest.h	2015-05-11 13:17:00 +0000
422
@@ -20,11 +20,17 @@
423
20
#define TELEPATHYTEST_H
20
#define TELEPATHYTEST_H
424
21
21
425
22
#include <QtCore/QObject>
22
#include <QtCore/QObject>
426
23
#include <QtTest/QtTest>
427
23
#include <TelepathyQt/Account>
24
#include <TelepathyQt/Account>
429
24
#include "telepathyhelper.h"
25
#include <TelepathyQt/AccountManager>
430
25
26
431
26
#define DEFAULT_TIMEOUT 15000
27
#define DEFAULT_TIMEOUT 15000
432
27
28
433
29
#define TRY_VERIFY(x) QTRY_VERIFY_WITH_TIMEOUT((x), DEFAULT_TIMEOUT)
434
30
#define TRY_COMPARE(x, y) QTRY_COMPARE_WITH_TIMEOUT((x), (y), DEFAULT_TIMEOUT)
435
31
436
32
#define WAIT_FOR(x) while (!(x)) { qDebug() << "Waiting for:" << #x ; QTest::qWait(100); }
437
33
438
28
class TelepathyTest : public QObject
34
class TelepathyTest : public QObject
439
29
{
35
{
440
30
    Q_OBJECT
36
    Q_OBJECT
441
31
37
442
=== modified file 'tests/handler/HandlerTest.cpp'
443
--- tests/handler/HandlerTest.cpp	2015-04-17 21:26:25 +0000
444
+++ tests/handler/HandlerTest.cpp	2015-05-11 13:17:00 +0000
445
@@ -53,22 +53,19 @@
446
53
{
53
{
447
54
    initialize();
54
    initialize();
448
55
55
449
56
    QSignalSpy setupReadySpy(TelepathyHelper::instance(), SIGNAL(setupReady()));
450
57
    TRY_COMPARE(setupReadySpy.count(), 1);
451
58
452
56
    // register the approver
59
    // register the approver
453
57
    mApprover = new Approver(this);
60
    mApprover = new Approver(this);
454
58
    TelepathyHelper::instance()->registerClient(mApprover, "TelephonyTestApprover");
61
    TelepathyHelper::instance()->registerClient(mApprover, "TelephonyTestApprover");
455
59
    // Tp-qt does not set registered status to approvers
62
    // Tp-qt does not set registered status to approvers
457
60
    QTRY_VERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(TELEPHONY_SERVICE_APPROVER));
63
    TRY_VERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(TELEPHONY_SERVICE_APPROVER));
458
61
}
64
}
459
62
65
460
63
void HandlerTest::init()
66
void HandlerTest::init()
461
64
{
67
{
462
65
    mTpAccount = addAccount("mock", "mock", "the account");
68
    mTpAccount = addAccount("mock", "mock", "the account");
463
66
    QVERIFY(!mTpAccount.isNull());
464
67
    QTRY_VERIFY(mTpAccount->isReady(Tp::Account::FeatureCore));
465
68
466
69
    // make sure the connection is available
467
70
    QTRY_VERIFY(!mTpAccount->connection().isNull());
468
71
    QTRY_COMPARE(mTpAccount->connection()->selfContact()->presence().type(), Tp::ConnectionPresenceTypeAvailable);
469
72
69
470
73
    // and create the mock controller
70
    // and create the mock controller
471
74
    mMockController = new MockController("mock", this);
71
    mMockController = new MockController("mock", this);
472
@@ -86,7 +83,7 @@
473
86
    QSignalSpy callReceivedSpy(mMockController, SIGNAL(CallReceived(QString)));
83
    QSignalSpy callReceivedSpy(mMockController, SIGNAL(CallReceived(QString)));
474
87
    // FIXME: add support for multiple accounts
84
    // FIXME: add support for multiple accounts
475
88
    HandlerController::instance()->startCall(callerId, mTpAccount->uniqueIdentifier());
85
    HandlerController::instance()->startCall(callerId, mTpAccount->uniqueIdentifier());
477
89
    QTRY_COMPARE(callReceivedSpy.count(), 1);
86
    TRY_COMPARE(callReceivedSpy.count(), 1);
478
90
    QCOMPARE(callReceivedSpy.first().first().toString(), callerId);
87
    QCOMPARE(callReceivedSpy.first().first().toString(), callerId);
479
91
88
480
92
    mMockController->HangupCall(callerId);
89
    mMockController->HangupCall(callerId);
481
@@ -105,7 +102,7 @@
482
105
    QVERIFY(!objectPath.isEmpty());
102
    QVERIFY(!objectPath.isEmpty());
483
106
103
484
107
    // wait for the channel to hit the approver
104
    // wait for the channel to hit the approver
486
108
    QTRY_COMPARE(approverCallSpy.count(), 1);
105
    TRY_COMPARE(approverCallSpy.count(), 1);
487
109
    mApprover->acceptCall();
106
    mApprover->acceptCall();
488
110
107
489
111
    waitForCallActive(callerId);
108
    waitForCallActive(callerId);
490
@@ -113,7 +110,7 @@
491
113
    // and finally request the hangup
110
    // and finally request the hangup
492
114
    QSignalSpy callEndedSpy(mMockController, SIGNAL(CallEnded(QString)));
111
    QSignalSpy callEndedSpy(mMockController, SIGNAL(CallEnded(QString)));
493
115
    HandlerController::instance()->hangUpCall(objectPath);
112
    HandlerController::instance()->hangUpCall(objectPath);
495
116
    QTRY_COMPARE(callEndedSpy.count(), 1);
113
    TRY_COMPARE(callEndedSpy.count(), 1);
496
117
}
114
}
497
118
115
498
119
void HandlerTest::testCallHold()
116
void HandlerTest::testCallHold()
499
@@ -129,7 +126,7 @@
500
129
    QVERIFY(!objectPath.isEmpty());
126
    QVERIFY(!objectPath.isEmpty());
501
130
127
502
131
    // wait for the channel to hit the approver
128
    // wait for the channel to hit the approver
504
132
    QTRY_COMPARE(approverCallSpy.count(), 1);
129
    TRY_COMPARE(approverCallSpy.count(), 1);
505
133
    mApprover->acceptCall();
130
    mApprover->acceptCall();
506
134
131
507
135
    waitForCallActive(callerId);
132
    waitForCallActive(callerId);
508
@@ -138,13 +135,13 @@
509
138
135
510
139
    // set the call on hold
136
    // set the call on hold
511
140
    HandlerController::instance()->setHold(objectPath, true);
137
    HandlerController::instance()->setHold(objectPath, true);
513
141
    QTRY_COMPARE(callStateSpy.count(), 1);
138
    TRY_COMPARE(callStateSpy.count(), 1);
514
142
    QCOMPARE(callStateSpy.first()[2].toString(), QString("held"));
139
    QCOMPARE(callStateSpy.first()[2].toString(), QString("held"));
515
143
140
516
144
    // and now set it as unheld again
141
    // and now set it as unheld again
517
145
    callStateSpy.clear();
142
    callStateSpy.clear();
518
146
    HandlerController::instance()->setHold(objectPath, false);
143
    HandlerController::instance()->setHold(objectPath, false);
520
147
    QTRY_COMPARE(callStateSpy.count(), 1);
144
    TRY_COMPARE(callStateSpy.count(), 1);
521
148
    QCOMPARE(callStateSpy.first()[2].toString(), QString("active"));
145
    QCOMPARE(callStateSpy.first()[2].toString(), QString("active"));
522
149
146
523
150
    mMockController->HangupCall(callerId);
147
    mMockController->HangupCall(callerId);
524
@@ -163,11 +160,11 @@
525
163
    mMockController->placeCall(properties);
160
    mMockController->placeCall(properties);
526
164
161
527
165
    // wait for the channel to hit the approver
162
    // wait for the channel to hit the approver
529
166
    QTRY_COMPARE(approverCallSpy.count(), 1);
163
    TRY_COMPARE(approverCallSpy.count(), 1);
530
167
    mApprover->acceptCall();
164
    mApprover->acceptCall();
531
168
165
532
169
    // wait until the call properties are changed
166
    // wait until the call properties are changed
534
170
    QTRY_VERIFY(handlerCallPropertiesSpy.count() > 0);
167
    TRY_VERIFY(handlerCallPropertiesSpy.count() > 0);
535
171
    QString objectPath = handlerCallPropertiesSpy.last()[0].toString();
168
    QString objectPath = handlerCallPropertiesSpy.last()[0].toString();
536
172
    QVariantMap propsFromSignal = handlerCallPropertiesSpy.last()[1].toMap();
169
    QVariantMap propsFromSignal = handlerCallPropertiesSpy.last()[1].toMap();
537
173
    QVERIFY(!propsFromSignal.isEmpty());
170
    QVERIFY(!propsFromSignal.isEmpty());
538
@@ -194,7 +191,7 @@
539
194
    for (int i = 0; i < dtmfString.length(); ++i) {
191
    for (int i = 0; i < dtmfString.length(); ++i) {
540
195
        HandlerController::instance()->sendDTMF(objectPath, QString(dtmfString[i]));
192
        HandlerController::instance()->sendDTMF(objectPath, QString(dtmfString[i]));
541
196
    }
193
    }
543
197
    QTRY_COMPARE(handlerCallPropertiesSpy.count(), dtmfString.length());
194
    TRY_COMPARE(handlerCallPropertiesSpy.count(), dtmfString.length());
544
198
    propsFromSignal = handlerCallPropertiesSpy.last()[1].toMap();
195
    propsFromSignal = handlerCallPropertiesSpy.last()[1].toMap();
545
199
    propsFromMethod = HandlerController::instance()->getCallProperties(objectPath);
196
    propsFromMethod = HandlerController::instance()->getCallProperties(objectPath);
546
200
    QString dtmfStringFromSignal = propsFromSignal["dtmfString"].toString();
197
    QString dtmfStringFromSignal = propsFromSignal["dtmfString"].toString();
547
@@ -220,7 +217,7 @@
548
220
    QString call1 = mMockController->placeCall(properties);
217
    QString call1 = mMockController->placeCall(properties);
549
221
218
550
222
    // wait for the channel to hit the approver
219
    // wait for the channel to hit the approver
552
223
    QTRY_COMPARE(approverCallSpy.count(), 1);
220
    TRY_COMPARE(approverCallSpy.count(), 1);
553
224
    mApprover->acceptCall();
221
    mApprover->acceptCall();
554
225
    approverCallSpy.clear();
222
    approverCallSpy.clear();
555
226
    waitForCallActive(callerId1);
223
    waitForCallActive(callerId1);
556
@@ -229,7 +226,7 @@
557
229
    properties["Caller"] = callerId2;
226
    properties["Caller"] = callerId2;
558
230
    QString call2 = mMockController->placeCall(properties);
227
    QString call2 = mMockController->placeCall(properties);
559
231
    // wait for the channel to hit the approver
228
    // wait for the channel to hit the approver
561
232
    QTRY_COMPARE(approverCallSpy.count(), 1);
229
    TRY_COMPARE(approverCallSpy.count(), 1);
562
233
    mApprover->acceptCall();
230
    mApprover->acceptCall();
563
234
    approverCallSpy.clear();
231
    approverCallSpy.clear();
564
235
    waitForCallActive(callerId2);
232
    waitForCallActive(callerId2);
565
@@ -237,13 +234,13 @@
566
237
    // now create the conf call
234
    // now create the conf call
567
238
    QSignalSpy conferenceCreatedSpy(mMockController, SIGNAL(ConferenceCreated(QString)));
235
    QSignalSpy conferenceCreatedSpy(mMockController, SIGNAL(ConferenceCreated(QString)));
568
239
    HandlerController::instance()->createConferenceCall(QStringList() << call1 << call2);
236
    HandlerController::instance()->createConferenceCall(QStringList() << call1 << call2);
570
240
    QTRY_COMPARE(conferenceCreatedSpy.count(), 1);
237
    TRY_COMPARE(conferenceCreatedSpy.count(), 1);
571
241
    QString conferenceObjectPath = conferenceCreatedSpy.first().first().toString();
238
    QString conferenceObjectPath = conferenceCreatedSpy.first().first().toString();
572
242
239
573
243
    // now place a third call and try to merge it
240
    // now place a third call and try to merge it
574
244
    properties["Caller"] = callerId3;
241
    properties["Caller"] = callerId3;
575
245
    QString call3 = mMockController->placeCall(properties);
242
    QString call3 = mMockController->placeCall(properties);
577
246
    QTRY_COMPARE(approverCallSpy.count(), 1);
243
    TRY_COMPARE(approverCallSpy.count(), 1);
578
247
    mApprover->acceptCall();
244
    mApprover->acceptCall();
579
248
    approverCallSpy.clear();
245
    approverCallSpy.clear();
580
249
    waitForCallActive(callerId3);
246
    waitForCallActive(callerId3);
581
@@ -251,13 +248,13 @@
582
251
    // merge that call on the conference
248
    // merge that call on the conference
583
252
    QSignalSpy channelMergedSpy(mMockController, SIGNAL(ChannelMerged(QString)));
249
    QSignalSpy channelMergedSpy(mMockController, SIGNAL(ChannelMerged(QString)));
584
253
    HandlerController::instance()->mergeCall(conferenceObjectPath, call3);
250
    HandlerController::instance()->mergeCall(conferenceObjectPath, call3);
586
254
    QTRY_COMPARE(channelMergedSpy.count(), 1);
251
    TRY_COMPARE(channelMergedSpy.count(), 1);
587
255
    QCOMPARE(channelMergedSpy.first().first().toString(), call3);
252
    QCOMPARE(channelMergedSpy.first().first().toString(), call3);
588
256
253
589
257
    // now try to split one of the channels
254
    // now try to split one of the channels
590
258
    QSignalSpy channelSplittedSpy(mMockController, SIGNAL(ChannelSplitted(QString)));
255
    QSignalSpy channelSplittedSpy(mMockController, SIGNAL(ChannelSplitted(QString)));
591
259
    HandlerController::instance()->splitCall(call2);
256
    HandlerController::instance()->splitCall(call2);
593
260
    QTRY_COMPARE(channelSplittedSpy.count(), 1);
257
    TRY_COMPARE(channelSplittedSpy.count(), 1);
594
261
    QCOMPARE(channelSplittedSpy.first().first().toString(), call2);
258
    QCOMPARE(channelSplittedSpy.first().first().toString(), call2);
595
262
259
596
263
    // now hangup the conference and the individual channels
260
    // now hangup the conference and the individual channels
597
@@ -277,7 +274,7 @@
598
277
    QSignalSpy messageSentSpy(mMockController, SIGNAL(MessageSent(QString,QVariantMap)));
274
    QSignalSpy messageSentSpy(mMockController, SIGNAL(MessageSent(QString,QVariantMap)));
599
278
    // FIXME: add support for multiple accounts
275
    // FIXME: add support for multiple accounts
600
279
    HandlerController::instance()->sendMessage(recipient, message, mTpAccount->uniqueIdentifier());
276
    HandlerController::instance()->sendMessage(recipient, message, mTpAccount->uniqueIdentifier());
602
280
    QTRY_COMPARE(messageSentSpy.count(), 1);
277
    TRY_COMPARE(messageSentSpy.count(), 1);
603
281
    QString sentMessage = messageSentSpy.first().first().toString();
278
    QString sentMessage = messageSentSpy.first().first().toString();
604
282
    QVariantMap messageProperties = messageSentSpy.first().last().value<QVariantMap>();
279
    QVariantMap messageProperties = messageSentSpy.first().last().value<QVariantMap>();
605
283
    QCOMPARE(sentMessage, message);
280
    QCOMPARE(sentMessage, message);
606
@@ -293,14 +290,14 @@
607
293
290
608
294
    // set the property to true
291
    // set the property to true
609
295
    HandlerController::instance()->setCallIndicatorVisible(true);
292
    HandlerController::instance()->setCallIndicatorVisible(true);
611
296
    QTRY_COMPARE(spy.count(), 1);
293
    TRY_COMPARE(spy.count(), 1);
612
297
    QVERIFY(spy.first().first().toBool());
294
    QVERIFY(spy.first().first().toBool());
613
298
    QVERIFY(HandlerController::instance()->callIndicatorVisible());
295
    QVERIFY(HandlerController::instance()->callIndicatorVisible());
614
299
296
615
300
    // and back to false
297
    // and back to false
616
301
    spy.clear();
298
    spy.clear();
617
302
    HandlerController::instance()->setCallIndicatorVisible(false);
299
    HandlerController::instance()->setCallIndicatorVisible(false);
619
303
    QTRY_COMPARE(spy.count(), 1);
300
    TRY_COMPARE(spy.count(), 1);
620
304
    QVERIFY(!spy.first().first().toBool());
301
    QVERIFY(!spy.first().first().toBool());
621
305
    QVERIFY(!HandlerController::instance()->callIndicatorVisible());
302
    QVERIFY(!HandlerController::instance()->callIndicatorVisible());
622
306
}
303
}
623
@@ -314,7 +311,7 @@
624
314
    QString caller;
311
    QString caller;
625
315
    int tries = 0;
312
    int tries = 0;
626
316
    while (state != "active" && caller != callerId && tries < 5) {
313
    while (state != "active" && caller != callerId && tries < 5) {
628
317
        QTRY_COMPARE(callStateSpy.count(), 1);
314
        TRY_COMPARE(callStateSpy.count(), 1);
629
318
        caller = callStateSpy.first()[0].toString();
315
        caller = callStateSpy.first()[0].toString();
630
319
        objectPath = callStateSpy.first()[1].toString();
316
        objectPath = callStateSpy.first()[1].toString();
631
320
        state = callStateSpy.first()[2].toString();
317
        state = callStateSpy.first()[2].toString();
632
321
318
633
=== modified file 'tests/libtelephonyservice/AccountEntryTest.cpp'
634
--- tests/libtelephonyservice/AccountEntryTest.cpp	2015-04-21 17:04:29 +0000
635
+++ tests/libtelephonyservice/AccountEntryTest.cpp	2015-05-11 13:17:00 +0000
636
@@ -21,7 +21,6 @@
637
21
#include "telepathytest.h"
21
#include "telepathytest.h"
638
22
#include "accountentry.h"
22
#include "accountentry.h"
639
23
#include "accountentryfactory.h"
23
#include "accountentryfactory.h"
640
24
#include "telepathyhelper.h"
641
25
#include "mockcontroller.h"
24
#include "mockcontroller.h"
642
26
25
643
27
class AccountEntryTest : public TelepathyTest
26
class AccountEntryTest : public TelepathyTest
644
@@ -61,21 +60,19 @@
645
61
{
60
{
646
62
    mTpAccount = addAccount("mock", "mock", "the account");
61
    mTpAccount = addAccount("mock", "mock", "the account");
647
63
    QVERIFY(!mTpAccount.isNull());
62
    QVERIFY(!mTpAccount.isNull());
648
64
    QTRY_VERIFY(mTpAccount->isReady(Tp::Account::FeatureCore));
649
65
63
650
66
    mAccount = AccountEntryFactory::createEntry(mTpAccount, this);
64
    mAccount = AccountEntryFactory::createEntry(mTpAccount, this);
651
67
    QVERIFY(mAccount);
65
    QVERIFY(mAccount);
652
66
    TRY_VERIFY(mAccount->ready());
653
68
67
654
69
    // make sure the connection is available
68
    // make sure the connection is available
658
70
    QTRY_VERIFY(!mTpAccount->connection().isNull());
69
    TRY_VERIFY(mAccount->connected());
659
71
    QTRY_COMPARE(mTpAccount->connection()->selfContact()->presence().type(), Tp::ConnectionPresenceTypeAvailable);
70
660
72
    QTRY_VERIFY(mAccount->connected());
71
    // and make sure the status and status message are the ones we expect
661
72
    TRY_COMPARE(mAccount->status(), QString("available"));
662
73
73
663
74
    // and create the mock controller
74
    // and create the mock controller
664
75
    mMockController = new MockController("mock", this);
75
    mMockController = new MockController("mock", this);
665
76
666
77
    // just in case, wait some time
667
78
    QTest::qWait(1000);
668
79
}
76
}
669
80
77
670
81
void AccountEntryTest::cleanup()
78
void AccountEntryTest::cleanup()
671
@@ -94,21 +91,23 @@
672
94
91
673
95
void AccountEntryTest::testActive()
92
void AccountEntryTest::testActive()
674
96
{
93
{
675
94
    // the mock account is enabled/connected by default, so make sure it is like that
676
95
    QVERIFY(mAccount->active());
677
96
    // FIXME: setting the account as offline, triggers an automatic reconnection and the
678
97
    // test fails. In the future we might want to re-enable this and test some other way.
679
97
    QSignalSpy activeChangedSpy(mAccount, SIGNAL(activeChanged()));
98
    QSignalSpy activeChangedSpy(mAccount, SIGNAL(activeChanged()));
680
98
99
685
99
    // the mock account is enabled/connected by default, so make sure it is like that
100
    // now set the account away and see if the active flag changes correctly
682
100
    QVERIFY(mAccount->active());
683
101
684
102
    // now set the account offline and see if the active flag changes correctly
686
103
    mMockController->SetOnline(false);
101
    mMockController->SetOnline(false);
689
104
    QTRY_VERIFY(!mAccount->active());
102
    TRY_VERIFY(!mAccount->active());
690
105
    QCOMPARE(activeChangedSpy.count(), 1);
103
    TRY_VERIFY(activeChangedSpy.count() > 0);
691
104
692
106
105
693
107
    // now re-enable the account and check that the entry is updated
106
    // now re-enable the account and check that the entry is updated
694
108
    activeChangedSpy.clear();
107
    activeChangedSpy.clear();
695
109
    mMockController->SetOnline(true);
108
    mMockController->SetOnline(true);
698
110
    QTRY_VERIFY(mAccount->active());
109
    TRY_VERIFY(activeChangedSpy.count() > 0);
699
111
    QCOMPARE(activeChangedSpy.count(), 1);
110
    QVERIFY(mAccount->active());
700
112
111
701
113
    // check that for a null account active is false
112
    // check that for a null account active is false
702
114
    QVERIFY(!mNullAccount->active());
113
    QVERIFY(!mNullAccount->active());
703
@@ -124,14 +123,14 @@
704
124
    // now try to set the display in the telepathy account directly and see that the entry gets updated
123
    // now try to set the display in the telepathy account directly and see that the entry gets updated
705
125
    QString newDisplayName = "some other display name";
124
    QString newDisplayName = "some other display name";
706
126
    mTpAccount->setDisplayName(newDisplayName);
125
    mTpAccount->setDisplayName(newDisplayName);
708
127
    QTRY_COMPARE(mAccount->displayName(), newDisplayName);
126
    TRY_COMPARE(mAccount->displayName(), newDisplayName);
709
128
    QCOMPARE(displayNameChangedSpy.count(), 1);
127
    QCOMPARE(displayNameChangedSpy.count(), 1);
710
129
128
711
130
    // and try setting the display name in the entry itself
129
    // and try setting the display name in the entry itself
712
131
    displayNameChangedSpy.clear();
130
    displayNameChangedSpy.clear();
713
132
    newDisplayName = "changing again";
131
    newDisplayName = "changing again";
714
133
    mAccount->setDisplayName(newDisplayName);
132
    mAccount->setDisplayName(newDisplayName);
716
134
    QTRY_COMPARE(mAccount->displayName(), newDisplayName);
133
    TRY_COMPARE(mAccount->displayName(), newDisplayName);
717
135
    QCOMPARE(displayNameChangedSpy.count(), 1);
134
    QCOMPARE(displayNameChangedSpy.count(), 1);
718
136
    QCOMPARE(mTpAccount->displayName(), newDisplayName);
135
    QCOMPARE(mTpAccount->displayName(), newDisplayName);
719
137
136
720
@@ -147,11 +146,10 @@
721
147
    QCOMPARE(mAccount->status(), mTpAccount->connection()->selfContact()->presence().status());
146
    QCOMPARE(mAccount->status(), mTpAccount->connection()->selfContact()->presence().status());
722
148
147
723
149
    // and now set a new value
148
    // and now set a new value
726
150
    Tp::Presence presence(Tp::ConnectionPresenceTypeAway, "away", "away");
149
    mMockController->SetPresence("away", "away");
725
151
    mTpAccount->setRequestedPresence(presence);
727
152
150
730
153
    QTRY_COMPARE(mAccount->status(), QString("away"));
151
    TRY_COMPARE(statusChangedSpy.count(), 1);
731
154
    QTRY_COMPARE(statusChangedSpy.count(), 1);
152
    QCOMPARE(mAccount->status(), QString("away"));
732
155
153
733
156
    // check that for a null account the status is null
154
    // check that for a null account the status is null
734
157
    QVERIFY(mNullAccount->status().isNull());
155
    QVERIFY(mNullAccount->status().isNull());
735
@@ -162,14 +160,14 @@
736
162
    QSignalSpy statusMessageChangedSpy(mAccount, SIGNAL(statusMessageChanged()));
160
    QSignalSpy statusMessageChangedSpy(mAccount, SIGNAL(statusMessageChanged()));
737
163
161
738
164
    // check that the value is correct already
162
    // check that the value is correct already
740
165
    QTRY_COMPARE(mAccount->statusMessage(), mTpAccount->connection()->selfContact()->presence().statusMessage());
163
    TRY_COMPARE(mAccount->statusMessage(), mTpAccount->connection()->selfContact()->presence().statusMessage());
741
166
164
742
167
    // and now set a new value
165
    // and now set a new value
743
168
    QString statusMessage("I am online");
166
    QString statusMessage("I am online");
744
169
    mMockController->SetPresence("available", statusMessage);
167
    mMockController->SetPresence("available", statusMessage);
745
170
168
748
171
    QTRY_COMPARE(mAccount->statusMessage(), statusMessage);
169
    TRY_COMPARE(statusMessageChangedSpy.count(), 1);
749
172
    QTRY_COMPARE(statusMessageChangedSpy.count(), 1);
170
    QCOMPARE(mAccount->statusMessage(), statusMessage);
750
173
171
751
174
    // check that for a null account the displayName is null
172
    // check that for a null account the displayName is null
752
175
    QVERIFY(mNullAccount->statusMessage().isNull());
173
    QVERIFY(mNullAccount->statusMessage().isNull());
753
@@ -183,18 +181,16 @@
754
183
    QVERIFY(mAccount->connected());
181
    QVERIFY(mAccount->connected());
755
184
182
756
185
    // now set the account offline and see if the active flag changes correctly
183
    // now set the account offline and see if the active flag changes correctly
763
186
    mMockController->SetOnline(false);
184
    mMockController->SetPresence("away", "away");
764
187
    QTRY_VERIFY(!mAccount->connected());
185
    TRY_VERIFY(connectedChangedSpy.count() > 0);
765
188
    QTRY_COMPARE(connectedChangedSpy.count(), 1);
186
    TRY_VERIFY(!mAccount->connected());
760
189
761
190
    // it shouldn't be necessary, but in any case
762
191
    QTest::qWait(500);
766
192
187
767
193
    // now re-enable the account and check that the entry is updated
188
    // now re-enable the account and check that the entry is updated
768
194
    connectedChangedSpy.clear();
189
    connectedChangedSpy.clear();
772
195
    mMockController->SetOnline(true);
190
    mMockController->SetPresence("available", "online");
773
196
    QTRY_VERIFY(mAccount->connected());
191
    // because of the way the mock was implemented, sometimes this can return two connectedChanged() signals.
774
197
    QTRY_COMPARE(connectedChangedSpy.count(), 1);
192
    TRY_VERIFY(connectedChangedSpy.count() > 0);
775
193
    TRY_VERIFY(mAccount->connected());
776
198
194
777
199
    // check that for a null account the displayName is null
195
    // check that for a null account the displayName is null
778
200
    QVERIFY(!mNullAccount->connected());
196
    QVERIFY(!mNullAccount->connected());
779
201
197
780
=== modified file 'tests/libtelephonyservice/CMakeLists.txt'
781
--- tests/libtelephonyservice/CMakeLists.txt	2015-04-22 13:44:53 +0000
782
+++ tests/libtelephonyservice/CMakeLists.txt	2015-05-11 13:17:00 +0000
783
@@ -34,6 +34,7 @@
784
34
34
785
35
generate_telepathy_test(AccountEntryFactoryTest SOURCES AccountEntryFactoryTest.cpp)
35
generate_telepathy_test(AccountEntryFactoryTest SOURCES AccountEntryFactoryTest.cpp)
786
36
generate_telepathy_test(AccountEntryTest SOURCES AccountEntryTest.cpp)
36
generate_telepathy_test(AccountEntryTest SOURCES AccountEntryTest.cpp)
787
37
generate_telepathy_test(CallEntryTest SOURCES CallEntryTest.cpp)
788
37
generate_telepathy_test(ChatManagerTest SOURCES ChatManagerTest.cpp)
38
generate_telepathy_test(ChatManagerTest SOURCES ChatManagerTest.cpp)
789
38
generate_telepathy_test(OfonoAccountEntryTest SOURCES OfonoAccountEntryTest.cpp)
39
generate_telepathy_test(OfonoAccountEntryTest SOURCES OfonoAccountEntryTest.cpp)
790
39
generate_telepathy_test(TelepathyHelperTest SOURCES TelepathyHelperTest.cpp)
40
generate_telepathy_test(TelepathyHelperTest SOURCES TelepathyHelperTest.cpp)
791
40
41
792
=== added file 'tests/libtelephonyservice/CallEntryTest.cpp'
793
--- tests/libtelephonyservice/CallEntryTest.cpp	1970-01-01 00:00:00 +0000
794
+++ tests/libtelephonyservice/CallEntryTest.cpp	2015-05-11 13:17:00 +0000
795
@@ -0,0 +1,129 @@
796
1
/*
797
2
 * Copyright (C) 2015 Canonical, Ltd.
798
3
 *
799
4
 * This file is part of telephony-service.
800
5
 *
801
6
 * telephony-service is free software; you can redistribute it and/or modify
802
7
 * it under the terms of the GNU General Public License as published by
803
8
 * the Free Software Foundation; version 3.
804
9
 *
805
10
 * telephony-service is distributed in the hope that it will be useful,
806
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
807
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
808
13
 * GNU General Public License for more details.
809
14
 *
810
15
 * You should have received a copy of the GNU General Public License
811
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
812
17
 */
813
18
814
19
#include <QtCore/QObject>
815
20
#include <QtTest/QtTest>
816
21
#include "telepathytest.h"
817
22
#include "callentry.h"
818
23
#include "callmanager.h"
819
24
#include "telepathyhelper.h"
820
25
#include "mockcontroller.h"
821
26
#include "ofonoaccountentry.h"
822
27
#include "accountentryfactory.h"
823
28
824
29
Q_DECLARE_METATYPE(AccountEntry*)
825
30
826
31
class CallEntryTest : public TelepathyTest
827
32
{
828
33
    Q_OBJECT
829
34
830
35
private Q_SLOTS:
831
36
    void initTestCase();
832
37
    void init();
833
38
    void cleanup();
834
39
    void testIsVoicemail_data();
835
40
    void testIsVoicemail();
836
41
837
42
protected Q_SLOTS:
838
43
    void onCallChannelAvailable(const Tp::CallChannelPtr &channel);
839
44
840
45
private:
841
46
    Tp::AccountPtr mTpAccount;
842
47
    OfonoAccountEntry *mAccount;
843
48
    Tp::CallChannelPtr mCallChannel;
844
49
    MockController *mMockController;
845
50
};
846
51
847
52
void CallEntryTest::initTestCase()
848
53
{
849
54
    qRegisterMetaType<AccountEntry*>();
850
55
    initialize();
851
56
    TelepathyHelper::instance()->registerChannelObserver();
852
57
    connect(TelepathyHelper::instance()->channelObserver(),
853
58
            SIGNAL(callChannelAvailable(Tp::CallChannelPtr)),
854
59
            SLOT(onCallChannelAvailable(Tp::CallChannelPtr)));
855
60
}
856
61
857
62
void CallEntryTest::init()
858
63
{
859
64
    QSignalSpy accountSpy(TelepathyHelper::instance(), SIGNAL(accountAdded(AccountEntry*)));
860
65
    mTpAccount = addAccount("mock", "ofono", "the account");
861
66
    QVERIFY(!mTpAccount.isNull());
862
67
    TRY_COMPARE(accountSpy.count(), 1);
863
68
    mAccount = qobject_cast<OfonoAccountEntry*>(accountSpy.first().first().value<AccountEntry*>());
864
69
    QVERIFY(mAccount);
865
70
    TRY_VERIFY(mAccount->ready());
866
71
    TRY_COMPARE(mAccount->status(), QString("available"));
867
72
868
73
    // and create the mock controller
869
74
    mMockController = new MockController("ofono", this);
870
75
}
871
76
872
77
void CallEntryTest::cleanup()
873
78
{
874
79
    doCleanup();
875
80
876
81
    mMockController->deleteLater();
877
82
    mAccount->deleteLater();
878
83
    mCallChannel = Tp::CallChannelPtr();
879
84
880
85
    // wait until all the calls are gone before the next test
881
86
    TRY_VERIFY(!CallManager::instance()->hasCalls());
882
87
}
883
88
884
89
void CallEntryTest::testIsVoicemail_data()
885
90
{
886
91
    QTest::addColumn<QString>("voicemailNumber");
887
92
    QTest::addColumn<QString>("callNumber");
888
93
    QTest::addColumn<bool>("isVoicemail");
889
94
890
95
    QTest::newRow("calling voicemail") << "*1234" << "*1234" << true;
891
96
    QTest::newRow("calling other number") << "*1234" << "5555555" << false;
892
97
}
893
98
894
99
void CallEntryTest::testIsVoicemail()
895
100
{
896
101
    QFETCH(QString, voicemailNumber);
897
102
    QFETCH(QString, callNumber);
898
103
    QFETCH(bool, isVoicemail);
899
104
900
105
    mMockController->SetVoicemailNumber(voicemailNumber);
901
106
    TRY_COMPARE(mAccount->voicemailNumber(), voicemailNumber);
902
107
903
108
    // now place a call to a number that is not the voicemail number
904
109
    QVariantMap properties;
905
110
    properties["Caller"] = callNumber;
906
111
    properties["State"] = "incoming";
907
112
    mMockController->placeCall(properties);
908
113
    TRY_VERIFY(!mCallChannel.isNull());
909
114
    QCOMPARE(mCallChannel->targetContact()->id(), callNumber);
910
115
911
116
    CallEntry *callEntry = new CallEntry(mCallChannel);
912
117
    QCOMPARE(callEntry->isVoicemail(), isVoicemail);
913
118
914
119
    callEntry->endCall();
915
120
    callEntry->deleteLater();
916
121
}
917
122
918
123
void CallEntryTest::onCallChannelAvailable(const Tp::CallChannelPtr &channel)
919
124
{
920
125
    mCallChannel = channel;
921
126
}
922
127
923
128
QTEST_MAIN(CallEntryTest)
924
129
#include "CallEntryTest.moc"
925
0
130
926
=== modified file 'tests/libtelephonyservice/ChatManagerTest.cpp'
927
--- tests/libtelephonyservice/ChatManagerTest.cpp	2015-04-17 21:26:25 +0000
928
+++ tests/libtelephonyservice/ChatManagerTest.cpp	2015-05-11 13:17:00 +0000
929
@@ -47,21 +47,16 @@
930
47
void ChatManagerTest::initTestCase()
47
void ChatManagerTest::initTestCase()
931
48
{
48
{
932
49
    initialize();
49
    initialize();
933
50
934
51
    TelepathyHelper::instance()->registerChannelObserver();
50
    TelepathyHelper::instance()->registerChannelObserver();
935
52
936
53
    // just give telepathy some time to register the observer
937
54
    QTest::qWait(1000);
938
55
}
51
}
939
56
52
940
57
void ChatManagerTest::init()
53
void ChatManagerTest::init()
941
58
{
54
{
942
59
    // add two accounts
55
    // add two accounts
943
60
    mGenericTpAccount = addAccount("mock", "mock", "the generic account");
56
    mGenericTpAccount = addAccount("mock", "mock", "the generic account");
946
61
    QTRY_VERIFY(!mGenericTpAccount->connection().isNull());
57
    QVERIFY(!mGenericTpAccount.isNull());
945
62
947
63
    mPhoneTpAccount = addAccount("mock", "ofono", "the phone account");
58
    mPhoneTpAccount = addAccount("mock", "ofono", "the phone account");
949
64
    QTRY_VERIFY(!mPhoneTpAccount->connection().isNull());
59
    QVERIFY(!mPhoneTpAccount.isNull());
950
65
60
951
66
    // and create the mock controller
61
    // and create the mock controller
952
67
    mGenericMockController = new MockController("mock", this);
62
    mGenericMockController = new MockController("mock", this);
953
@@ -103,7 +98,7 @@
954
103
98
955
104
    ChatManager::instance()->sendMessage(recipients, message, accountId);
99
    ChatManager::instance()->sendMessage(recipients, message, accountId);
956
105
100
958
106
    QTRY_COMPARE(controllerMessageSentSpy.count(), 1);
101
    TRY_COMPARE(controllerMessageSentSpy.count(), 1);
959
107
    QString messageText = controllerMessageSentSpy.first()[0].toString();
102
    QString messageText = controllerMessageSentSpy.first()[0].toString();
960
108
    QVariantMap messageProperties = controllerMessageSentSpy.first()[1].toMap();
103
    QVariantMap messageProperties = controllerMessageSentSpy.first()[1].toMap();
961
109
    QStringList messageRecipients = messageProperties["Recipients"].toStringList();
104
    QStringList messageRecipients = messageProperties["Recipients"].toStringList();
962
@@ -111,7 +106,7 @@
963
111
    QCOMPARE(messageText, message);
106
    QCOMPARE(messageText, message);
964
112
    QCOMPARE(messageRecipients, recipients);
107
    QCOMPARE(messageRecipients, recipients);
965
113
108
967
114
    QTRY_COMPARE(messageSentSpy.count(), 1);
109
    TRY_COMPARE(messageSentSpy.count(), 1);
968
115
    messageRecipients = messageSentSpy.first()[0].toStringList();
110
    messageRecipients = messageSentSpy.first()[0].toStringList();
969
116
    qSort(messageRecipients);
111
    qSort(messageRecipients);
970
117
    messageText = messageSentSpy.first()[1].toString();
112
    messageText = messageSentSpy.first()[1].toString();
971
@@ -129,7 +124,7 @@
972
129
    QString message("Hi there");
124
    QString message("Hi there");
973
130
    mGenericMockController->PlaceIncomingMessage(message, properties);
125
    mGenericMockController->PlaceIncomingMessage(message, properties);
974
131
126
976
132
    QTRY_COMPARE(messageReceivedSpy.count(), 1);
127
    TRY_COMPARE(messageReceivedSpy.count(), 1);
977
133
    QString sender = messageReceivedSpy.first()[0].toString();
128
    QString sender = messageReceivedSpy.first()[0].toString();
978
134
    QString receivedMessage = messageReceivedSpy.first()[1].toString();
129
    QString receivedMessage = messageReceivedSpy.first()[1].toString();
979
135
    QCOMPARE(sender, properties["Sender"].toString());
130
    QCOMPARE(sender, properties["Sender"].toString());
980
@@ -147,9 +142,10 @@
981
147
    messages << "Hi there" << "How are you" << "Always look on the bright side of life";
142
    messages << "Hi there" << "How are you" << "Always look on the bright side of life";
982
148
    Q_FOREACH(const QString &message, messages) {
143
    Q_FOREACH(const QString &message, messages) {
983
149
        mGenericMockController->PlaceIncomingMessage(message, properties);
144
        mGenericMockController->PlaceIncomingMessage(message, properties);
985
150
        QTest::qWait(100);
145
        // the wait shouldn't be needed, but just in case
986
146
        QTest::qWait(50);
987
151
    }
147
    }
989
152
    QTRY_COMPARE(messageReceivedSpy.count(), messages.count());
148
    TRY_COMPARE(messageReceivedSpy.count(), messages.count());
990
153
149
991
154
    QStringList messageIds;
150
    QStringList messageIds;
992
155
    for (int i = 0; i < messages.count(); ++i) {
151
    for (int i = 0; i < messages.count(); ++i) {
993
@@ -162,7 +158,7 @@
994
162
        ChatManager::instance()->acknowledgeMessage(properties["Recipients"].toStringList(), messageId, "mock/mock/account0");
158
        ChatManager::instance()->acknowledgeMessage(properties["Recipients"].toStringList(), messageId, "mock/mock/account0");
995
163
    }
159
    }
996
164
160
998
165
    QTRY_COMPARE(messageReadSpy.count(), messageIds.count());
161
    TRY_COMPARE(messageReadSpy.count(), messageIds.count());
999
166
    QStringList receivedIds;
162
    QStringList receivedIds;
1000
167
    for (int i = 0; i < messageReadSpy.count(); ++i) {
163
    for (int i = 0; i < messageReadSpy.count(); ++i) {
1001
168
        receivedIds << messageReadSpy[i][0].toString();
164
        receivedIds << messageReadSpy[i][0].toString();
1002
169
165
1003
=== modified file 'tests/libtelephonyservice/OfonoAccountEntryTest.cpp'
1004
--- tests/libtelephonyservice/OfonoAccountEntryTest.cpp	2015-04-22 14:26:41 +0000
1005
+++ tests/libtelephonyservice/OfonoAccountEntryTest.cpp	2015-05-11 13:17:00 +0000
1006
@@ -61,21 +61,18 @@
1007
61
{
61
{
1008
62
    mTpAccount = addAccount("mock", "ofono", "phone account");
62
    mTpAccount = addAccount("mock", "ofono", "phone account");
1009
63
    QVERIFY(!mTpAccount.isNull());
63
    QVERIFY(!mTpAccount.isNull());
1010
64
    QTRY_VERIFY(mTpAccount->isReady(Tp::Account::FeatureCore));
1011
65
1012
66
    mAccount = qobject_cast<OfonoAccountEntry*>(AccountEntryFactory::createEntry(mTpAccount, this));
64
    mAccount = qobject_cast<OfonoAccountEntry*>(AccountEntryFactory::createEntry(mTpAccount, this));
1013
67
    QVERIFY(mAccount);
65
    QVERIFY(mAccount);
1014
66
    TRY_VERIFY(mAccount->ready());
1015
68
67
1016
69
    // make sure the connection is available
68
    // make sure the connection is available
1020
70
    QTRY_VERIFY(!mTpAccount->connection().isNull());
69
    TRY_VERIFY(mAccount->connected());
1021
71
    QTRY_COMPARE(mTpAccount->connection()->selfContact()->presence().type(), Tp::ConnectionPresenceTypeAvailable);
70
1022
72
    QTRY_VERIFY(mAccount->connected());
71
    // and make sure the status and status message are the ones we expect
1023
72
    TRY_COMPARE(mAccount->status(), QString("available"));
1024
73
73
1025
74
    // create the mock controller
74
    // create the mock controller
1026
75
    mMockController = new MockController("ofono", this);
75
    mMockController = new MockController("ofono", this);
1027
76
1028
77
    // just in case, wait some time
1029
78
    QTest::qWait(1000);
1030
79
}
76
}
1031
80
77
1032
81
void OfonoAccountEntryTest::cleanup()
78
void OfonoAccountEntryTest::cleanup()
1033
@@ -93,22 +90,23 @@
1034
93
void OfonoAccountEntryTest::testConnected()
90
void OfonoAccountEntryTest::testConnected()
1035
94
{
91
{
1036
95
    // the mock account is enabled/connected by default, so make sure it is like that
92
    // the mock account is enabled/connected by default, so make sure it is like that
1038
96
    QTRY_VERIFY(mAccount->connected());
93
    TRY_VERIFY(mAccount->connected());
1039
97
94
1040
98
    // right now the ofono account connection status behave exactly like the generic class,
95
    // right now the ofono account connection status behave exactly like the generic class,
1041
99
    // but as the code path is different, test it again
96
    // but as the code path is different, test it again
1042
100
    QSignalSpy connectedChangedSpy(mAccount, SIGNAL(connectedChanged()));
97
    QSignalSpy connectedChangedSpy(mAccount, SIGNAL(connectedChanged()));
1043
101
98
1044
102
    // now set the account offline and see if the active flag changes correctly
99
    // now set the account offline and see if the active flag changes correctly
1048
103
    mMockController->SetOnline(false);
100
    mMockController->SetPresence("away", "away");
1049
104
    QTRY_VERIFY(!mAccount->connected());
101
    TRY_VERIFY(connectedChangedSpy.count() > 0);
1050
105
    QTRY_COMPARE(connectedChangedSpy.count(), 1);
102
    TRY_VERIFY(!mAccount->connected());
1051
106
103
1052
107
    // now re-enable the account and check that the entry is updated
104
    // now re-enable the account and check that the entry is updated
1053
108
    connectedChangedSpy.clear();
105
    connectedChangedSpy.clear();
1057
109
    mMockController->SetOnline(true);
106
    mMockController->SetPresence("available", "online");
1058
110
    QTRY_VERIFY(mAccount->connected());
107
    // because of the way the mock was implemented, sometimes this can return two connectedChanged() signals.
1059
111
    QTRY_COMPARE(connectedChangedSpy.count(), 1);
108
    TRY_VERIFY(connectedChangedSpy.count() > 0);
1060
109
    TRY_VERIFY(mAccount->connected());
1061
112
}
110
}
1062
113
111
1063
114
void OfonoAccountEntryTest::testCompareIds_data()
112
void OfonoAccountEntryTest::testCompareIds_data()
1064
@@ -142,7 +140,7 @@
1065
142
    numbers << "111" << "190" << "911";
140
    numbers << "111" << "190" << "911";
1066
143
    qSort(numbers);
141
    qSort(numbers);
1067
144
    mMockController->SetEmergencyNumbers(numbers);
142
    mMockController->SetEmergencyNumbers(numbers);
1069
145
    QTRY_COMPARE(emergencyNumbersChangedSpy.count(), 1);
143
    TRY_COMPARE(emergencyNumbersChangedSpy.count(), 1);
1070
146
144
1071
147
    QStringList emergencyNumbers = mAccount->emergencyNumbers();
145
    QStringList emergencyNumbers = mAccount->emergencyNumbers();
1072
148
    qSort(emergencyNumbers);
146
    qSort(emergencyNumbers);
1073
@@ -152,7 +150,7 @@
1074
152
150
1075
153
void OfonoAccountEntryTest::testSerial()
151
void OfonoAccountEntryTest::testSerial()
1076
154
{
152
{
1078
155
    QTRY_COMPARE(mAccount->serial(), mMockController->serial());
153
    TRY_COMPARE(mAccount->serial(), mMockController->serial());
1079
156
}
154
}
1080
157
155
1081
158
void OfonoAccountEntryTest::testVoicemailIndicator()
156
void OfonoAccountEntryTest::testVoicemailIndicator()
1082
@@ -164,27 +162,27 @@
1083
164
162
1084
165
    // set to true
163
    // set to true
1085
166
    mMockController->SetVoicemailIndicator(true);
164
    mMockController->SetVoicemailIndicator(true);
1088
167
    QTRY_COMPARE(voiceMailIndicatorSpy.count(), 1);
165
    TRY_COMPARE(voiceMailIndicatorSpy.count(), 1);
1089
168
    QTRY_VERIFY(mAccount->voicemailIndicator());
166
    QVERIFY(mAccount->voicemailIndicator());
1090
169
167
1091
170
    // and set back to false
168
    // and set back to false
1092
171
    voiceMailIndicatorSpy.clear();
169
    voiceMailIndicatorSpy.clear();
1093
172
    mMockController->SetVoicemailIndicator(false);
170
    mMockController->SetVoicemailIndicator(false);
1096
173
    QTRY_COMPARE(voiceMailIndicatorSpy.count(), 1);
171
    TRY_COMPARE(voiceMailIndicatorSpy.count(), 1);
1097
174
    QTRY_VERIFY(!mAccount->voicemailIndicator());
172
    QVERIFY(!mAccount->voicemailIndicator());
1098
175
}
173
}
1099
176
174
1100
177
void OfonoAccountEntryTest::testVoicemailNumber()
175
void OfonoAccountEntryTest::testVoicemailNumber()
1101
178
{
176
{
1102
177
    // check that the number is not empty at startup
1103
178
    TRY_VERIFY(!mAccount->voicemailNumber().isEmpty());
1104
179
1105
179
    QSignalSpy voicemailNumberSpy(mAccount, SIGNAL(voicemailNumberChanged()));
180
    QSignalSpy voicemailNumberSpy(mAccount, SIGNAL(voicemailNumberChanged()));
1106
180
181
1107
181
    // check that the number is not empty at startup
1108
182
    QTRY_VERIFY(!mAccount->voicemailNumber().isEmpty());
1109
183
1110
184
    // try changing the number
182
    // try changing the number
1111
185
    QString number("12345");
183
    QString number("12345");
1112
186
    mMockController->SetVoicemailNumber(number);
184
    mMockController->SetVoicemailNumber(number);
1114
187
    QTRY_COMPARE(voicemailNumberSpy.count(), 1);
185
    TRY_COMPARE(voicemailNumberSpy.count(), 1);
1115
188
    QCOMPARE(mAccount->voicemailNumber(), number);
186
    QCOMPARE(mAccount->voicemailNumber(), number);
1116
189
}
187
}
1117
190
188
1118
@@ -198,13 +196,13 @@
1119
198
    // set it to a bigger value
196
    // set it to a bigger value
1120
199
    int count = 10;
197
    int count = 10;
1121
200
    mMockController->SetVoicemailCount(count);
198
    mMockController->SetVoicemailCount(count);
1123
201
    QTRY_COMPARE(voicemailCountSpy.count(), 1);
199
    TRY_COMPARE(voicemailCountSpy.count(), 1);
1124
202
    QCOMPARE((int)mAccount->voicemailCount(), count);
200
    QCOMPARE((int)mAccount->voicemailCount(), count);
1125
203
201
1126
204
    // and back to zero
202
    // and back to zero
1127
205
    voicemailCountSpy.clear();
203
    voicemailCountSpy.clear();
1128
206
    mMockController->SetVoicemailCount(0);
204
    mMockController->SetVoicemailCount(0);
1130
207
    QTRY_COMPARE(voicemailCountSpy.count(), 1);
205
    TRY_COMPARE(voicemailCountSpy.count(), 1);
1131
208
    QCOMPARE((int)mAccount->voicemailCount(), 0);
206
    QCOMPARE((int)mAccount->voicemailCount(), 0);
1132
209
}
207
}
1133
210
208
1134
@@ -217,7 +215,7 @@
1135
217
215
1136
218
    // now try to set the status to simlocked
216
    // now try to set the status to simlocked
1137
219
    mMockController->SetPresence("simlocked", "simlocked");
217
    mMockController->SetPresence("simlocked", "simlocked");
1139
220
    QTRY_COMPARE(simLockedSpy.count(), 1);
218
    TRY_COMPARE(simLockedSpy.count(), 1);
1140
221
    QVERIFY(mAccount->simLocked());
219
    QVERIFY(mAccount->simLocked());
1141
222
}
220
}
1142
223
221
1143
@@ -246,7 +244,7 @@
1144
246
    QFETCH(bool, available);
244
    QFETCH(bool, available);
1145
247
245
1146
248
    mMockController->SetPresence(status, "");
246
    mMockController->SetPresence(status, "");
1148
249
    QTRY_COMPARE(mAccount->status(), status);
247
    TRY_COMPARE(mAccount->status(), status);
1149
250
    QCOMPARE(mAccount->emergencyCallsAvailable(), available);
248
    QCOMPARE(mAccount->emergencyCallsAvailable(), available);
1150
251
}
249
}
1151
252
250
1152
@@ -258,8 +256,8 @@
1153
258
    QString statusMessage("SomeNetwork");
256
    QString statusMessage("SomeNetwork");
1154
259
    mMockController->SetPresence("available", statusMessage);
257
    mMockController->SetPresence("available", statusMessage);
1155
260
258
1158
261
    QTRY_COMPARE(mAccount->networkName(), statusMessage);
259
    TRY_COMPARE(networkNameChangedSpy.count(), 1);
1159
262
    QTRY_COMPARE(networkNameChangedSpy.count(), 1);
260
    QCOMPARE(mAccount->networkName(), statusMessage);
1160
263
}
261
}
1161
264
262
1162
265
void OfonoAccountEntryTest::testAddressableVCardFields()
263
void OfonoAccountEntryTest::testAddressableVCardFields()
1163
266
264
1164
=== modified file 'tests/libtelephonyservice/TelepathyHelperTest.cpp'
1165
--- tests/libtelephonyservice/TelepathyHelperTest.cpp	2015-04-21 16:47:31 +0000
1166
+++ tests/libtelephonyservice/TelepathyHelperTest.cpp	2015-05-11 13:17:00 +0000
1167
@@ -27,6 +27,8 @@
1168
27
#include "telepathyhelper.h"
27
#include "telepathyhelper.h"
1169
28
#include "mockcontroller.h"
28
#include "mockcontroller.h"
1170
29
29
1171
30
Q_DECLARE_METATYPE(AccountEntry*)
1172
31
1173
30
class TelepathyHelperTest : public TelepathyTest
32
class TelepathyHelperTest : public TelepathyTest
1174
31
{
33
{
1175
32
    Q_OBJECT
34
    Q_OBJECT
1176
@@ -45,6 +47,11 @@
1177
45
    void testAccountForConnection();
47
    void testAccountForConnection();
1178
46
    void testEmergencyCallsAvailable();
48
    void testEmergencyCallsAvailable();
1179
47
49
1180
50
protected:
1181
51
    Tp::AccountPtr addAccountAndWait(const QString &manager,
1182
52
                                     const QString &protocol,
1183
53
                                     const QString &displayName,
1184
54
                                     const QVariantMap &parameters = QVariantMap());
1185
48
private:
55
private:
1186
49
    Tp::AccountPtr mGenericTpAccount;
56
    Tp::AccountPtr mGenericTpAccount;
1187
50
    Tp::AccountPtr mPhoneTpAccount;
57
    Tp::AccountPtr mPhoneTpAccount;
1188
@@ -54,24 +61,24 @@
1189
54
61
1190
55
void TelepathyHelperTest::initTestCase()
62
void TelepathyHelperTest::initTestCase()
1191
56
{
63
{
1192
64
    qRegisterMetaType<AccountEntry*>();
1193
57
    initialize();
65
    initialize();
1194
66
    QSignalSpy setupReadySpy(TelepathyHelper::instance(), SIGNAL(setupReady()));
1195
67
    TRY_COMPARE(setupReadySpy.count(), 1);
1196
58
}
68
}
1197
59
69
1198
60
void TelepathyHelperTest::init()
70
void TelepathyHelperTest::init()
1199
61
{
71
{
1200
62
    // add two accounts
72
    // add two accounts
1203
63
    mGenericTpAccount = addAccount("mock", "mock", "the generic account");
73
    mGenericTpAccount = addAccountAndWait("mock", "mock", "the generic account");
1204
64
    QTRY_VERIFY(!mGenericTpAccount->connection().isNull());
74
    QVERIFY(!mGenericTpAccount.isNull());
1205
65
75
1208
66
    mPhoneTpAccount = addAccount("mock", "ofono", "the phone account");
76
    mPhoneTpAccount = addAccountAndWait("mock", "ofono", "the phone account");
1209
67
    QTRY_VERIFY(!mPhoneTpAccount->connection().isNull());
77
    QVERIFY(!mPhoneTpAccount.isNull());
1210
68
78
1211
69
    // and create the mock controller
79
    // and create the mock controller
1212
70
    mGenericController = new MockController("mock", this);
80
    mGenericController = new MockController("mock", this);
1213
71
    mPhoneController = new MockController("ofono", this);
81
    mPhoneController = new MockController("ofono", this);
1214
72
1215
73
    // just in case, wait some time
1216
74
    QTest::qWait(1000);
1217
75
}
82
}
1218
76
83
1219
77
void TelepathyHelperTest::cleanup()
84
void TelepathyHelperTest::cleanup()
1220
@@ -98,13 +105,13 @@
1221
98
105
1222
99
    // and set the other account as offline too. This time connected needs to change to false
106
    // and set the other account as offline too. This time connected needs to change to false
1223
100
    mPhoneController->SetOnline(false);
107
    mPhoneController->SetOnline(false);
1225
101
    QTRY_COMPARE(connectedChangedSpy.count(), 1);
108
    TRY_COMPARE(connectedChangedSpy.count(), 1);
1226
102
    QVERIFY(!TelepathyHelper::instance()->connected());
109
    QVERIFY(!TelepathyHelper::instance()->connected());
1227
103
110
1228
104
    // now set one of the accounts back online
111
    // now set one of the accounts back online
1229
105
    connectedChangedSpy.clear();
112
    connectedChangedSpy.clear();
1230
106
    mPhoneController->SetOnline(true);
113
    mPhoneController->SetOnline(true);
1232
107
    QTRY_COMPARE(connectedChangedSpy.count(), 1);
114
    TRY_COMPARE(connectedChangedSpy.count(), 1);
1233
108
    QVERIFY(TelepathyHelper::instance()->connected());
115
    QVERIFY(TelepathyHelper::instance()->connected());
1234
109
116
1235
110
    // and the other one just in case
117
    // and the other one just in case
1236
@@ -124,10 +131,10 @@
1237
124
131
1238
125
    // now check that new accounts are captured
132
    // now check that new accounts are captured
1239
126
    QSignalSpy accountsChangedSpy(TelepathyHelper::instance(), SIGNAL(accountsChanged()));
133
    QSignalSpy accountsChangedSpy(TelepathyHelper::instance(), SIGNAL(accountsChanged()));
1241
127
    Tp::AccountPtr newAccount = addAccount("mock", "mock", "extra");
134
    Tp::AccountPtr newAccount = addAccountAndWait("mock", "mock", "extra");
1242
128
    QVERIFY(!newAccount.isNull());
135
    QVERIFY(!newAccount.isNull());
1243
129
136
1245
130
    QTRY_COMPARE(accountsChangedSpy.count(), 1);
137
    TRY_COMPARE(accountsChangedSpy.count(), 1);
1246
131
    QCOMPARE(TelepathyHelper::instance()->accounts().count(), 3);
138
    QCOMPARE(TelepathyHelper::instance()->accounts().count(), 3);
1247
132
139
1248
133
    bool accountFound = false;
140
    bool accountFound = false;
1249
@@ -142,7 +149,7 @@
1250
142
    // now remove the extra account and make sure it is properly removed
149
    // now remove the extra account and make sure it is properly removed
1251
143
    accountsChangedSpy.clear();
150
    accountsChangedSpy.clear();
1252
144
    QVERIFY(removeAccount(newAccount));
151
    QVERIFY(removeAccount(newAccount));
1254
145
    QTRY_COMPARE(accountsChangedSpy.count(), 1);
152
    TRY_COMPARE(accountsChangedSpy.count(), 1);
1255
146
    QCOMPARE(TelepathyHelper::instance()->accounts().count(), 2);
153
    QCOMPARE(TelepathyHelper::instance()->accounts().count(), 2);
1256
147
    QCOMPARE(TelepathyHelper::instance()->accounts()[0]->accountId(), first->accountId());
154
    QCOMPARE(TelepathyHelper::instance()->accounts()[0]->accountId(), first->accountId());
1257
148
    QCOMPARE(TelepathyHelper::instance()->accounts()[1]->accountId(), second->accountId());
155
    QCOMPARE(TelepathyHelper::instance()->accounts()[1]->accountId(), second->accountId());
1258
@@ -184,15 +191,15 @@
1259
184
    // create two accounts with modem-objpath parameters and make sure they are listed first
191
    // create two accounts with modem-objpath parameters and make sure they are listed first
1260
185
    QVariantMap parameters;
192
    QVariantMap parameters;
1261
186
    parameters["modem-objpath"] = "/phonesim1";
193
    parameters["modem-objpath"] = "/phonesim1";
1263
187
    Tp::AccountPtr firstAccount = addAccount("mock", "ofono", "firstPhoneAccount", parameters);
194
    Tp::AccountPtr firstAccount = addAccountAndWait("mock", "ofono", "firstPhoneAccount", parameters);
1264
188
    QVERIFY(!firstAccount.isNull());
195
    QVERIFY(!firstAccount.isNull());
1265
189
196
1266
190
    parameters["modem-objpath"] = "/phonesim2";
197
    parameters["modem-objpath"] = "/phonesim2";
1268
191
    Tp::AccountPtr secondAccount = addAccount("mock", "ofono", "secondPhoneAccount", parameters);
198
    Tp::AccountPtr secondAccount = addAccountAndWait("mock", "ofono", "secondPhoneAccount", parameters);
1269
192
    QVERIFY(!secondAccount.isNull());
199
    QVERIFY(!secondAccount.isNull());
1270
193
200
1271
194
    // wait for the accounts to appear;
201
    // wait for the accounts to appear;
1273
195
    QTRY_COMPARE(TelepathyHelper::instance()->accounts().count(), 4);
202
    TRY_COMPARE(TelepathyHelper::instance()->accounts().count(), 4);
1274
196
203
1275
197
    // and check the order
204
    // and check the order
1276
198
    QCOMPARE(TelepathyHelper::instance()->accounts()[0]->accountId(), firstAccount->uniqueIdentifier());
205
    QCOMPARE(TelepathyHelper::instance()->accounts()[0]->accountId(), firstAccount->uniqueIdentifier());
1277
@@ -200,11 +207,11 @@
1278
200
207
1279
201
    // now add a third account that should go before the two others
208
    // now add a third account that should go before the two others
1280
202
    parameters["modem-objpath"] = "/phonesim0";
209
    parameters["modem-objpath"] = "/phonesim0";
1282
203
    Tp::AccountPtr thirdAccount = addAccount("mock", "ofono", "thirdPhoneAccount", parameters);
210
    Tp::AccountPtr thirdAccount = addAccountAndWait("mock", "ofono", "thirdPhoneAccount", parameters);
1283
204
    QVERIFY(!thirdAccount.isNull());
211
    QVERIFY(!thirdAccount.isNull());
1284
205
212
1285
206
    // wait for the accounts to appear;
213
    // wait for the accounts to appear;
1287
207
    QTRY_COMPARE(TelepathyHelper::instance()->accounts().count(), 5);
214
    TRY_COMPARE(TelepathyHelper::instance()->accounts().count(), 5);
1288
208
    QCOMPARE(TelepathyHelper::instance()->accounts()[0]->accountId(), thirdAccount->uniqueIdentifier());
215
    QCOMPARE(TelepathyHelper::instance()->accounts()[0]->accountId(), thirdAccount->uniqueIdentifier());
1289
209
216
1290
210
    // and remove the created accounts
217
    // and remove the created accounts
1291
@@ -219,10 +226,10 @@
1292
219
226
1293
220
    // now check that new accounts are captured
227
    // now check that new accounts are captured
1294
221
    QSignalSpy accountIdsChangedSpy(TelepathyHelper::instance(), SIGNAL(accountIdsChanged()));
228
    QSignalSpy accountIdsChangedSpy(TelepathyHelper::instance(), SIGNAL(accountIdsChanged()));
1296
222
    Tp::AccountPtr newAccount = addAccount("mock", "mock", "extra");
229
    Tp::AccountPtr newAccount = addAccountAndWait("mock", "mock", "extra");
1297
223
    QVERIFY(!newAccount.isNull());
230
    QVERIFY(!newAccount.isNull());
1298
224
231
1300
225
    QTRY_COMPARE(accountIdsChangedSpy.count(), 1);
232
    TRY_COMPARE(accountIdsChangedSpy.count(), 1);
1301
226
    QCOMPARE(TelepathyHelper::instance()->accountIds().count(), 3);
233
    QCOMPARE(TelepathyHelper::instance()->accountIds().count(), 3);
1302
227
234
1303
228
    // just to make sure check that each account id matches one account
235
    // just to make sure check that each account id matches one account
1304
@@ -233,7 +240,7 @@
1305
233
    // now remove the extra account and make sure it is properly removed
240
    // now remove the extra account and make sure it is properly removed
1306
234
    accountIdsChangedSpy.clear();
241
    accountIdsChangedSpy.clear();
1307
235
    QVERIFY(removeAccount(newAccount));
242
    QVERIFY(removeAccount(newAccount));
1309
236
    QTRY_COMPARE(accountIdsChangedSpy.count(), 1);
243
    TRY_COMPARE(accountIdsChangedSpy.count(), 1);
1310
237
    QCOMPARE(TelepathyHelper::instance()->accountIds().count(), 2);
244
    QCOMPARE(TelepathyHelper::instance()->accountIds().count(), 2);
1311
238
    QCOMPARE(TelepathyHelper::instance()->accountIds()[0], TelepathyHelper::instance()->accounts()[0]->accountId());
245
    QCOMPARE(TelepathyHelper::instance()->accountIds()[0], TelepathyHelper::instance()->accounts()[0]->accountId());
1312
239
    QCOMPARE(TelepathyHelper::instance()->accountIds()[1], TelepathyHelper::instance()->accounts()[1]->accountId());
246
    QCOMPARE(TelepathyHelper::instance()->accountIds()[1], TelepathyHelper::instance()->accounts()[1]->accountId());
1313
@@ -248,22 +255,22 @@
1314
248
255
1315
249
    // now set one of the accounts as offline and make sure it is captured
256
    // now set one of the accounts as offline and make sure it is captured
1316
250
    mGenericController->SetOnline(false);
257
    mGenericController->SetOnline(false);
1318
251
    QTRY_COMPARE_WITH_TIMEOUT(activeAccountsSpy.count(), 1, DEFAULT_TIMEOUT);
258
    TRY_COMPARE(activeAccountsSpy.count(), 1);
1319
252
    QTRY_COMPARE(TelepathyHelper::instance()->activeAccounts().count(), 1);
259
    QTRY_COMPARE(TelepathyHelper::instance()->activeAccounts().count(), 1);
1320
253
    QCOMPARE(TelepathyHelper::instance()->activeAccounts()[0]->accountId(), mPhoneTpAccount->uniqueIdentifier());
260
    QCOMPARE(TelepathyHelper::instance()->activeAccounts()[0]->accountId(), mPhoneTpAccount->uniqueIdentifier());
1321
254
261
1322
255
    // set the other account offline to make sure
262
    // set the other account offline to make sure
1323
256
    activeAccountsSpy.clear();
263
    activeAccountsSpy.clear();
1324
257
    mPhoneController->SetOnline(false);
264
    mPhoneController->SetOnline(false);
1326
258
    QTRY_COMPARE_WITH_TIMEOUT(activeAccountsSpy.count(), 1, DEFAULT_TIMEOUT);
265
    TRY_COMPARE(activeAccountsSpy.count(), 1);
1327
259
    QVERIFY(TelepathyHelper::instance()->activeAccounts().isEmpty());
266
    QVERIFY(TelepathyHelper::instance()->activeAccounts().isEmpty());
1328
260
267
1329
261
    // and set both accounts online again
268
    // and set both accounts online again
1330
262
    activeAccountsSpy.clear();
269
    activeAccountsSpy.clear();
1331
263
    mGenericController->SetOnline(true);
270
    mGenericController->SetOnline(true);
1332
264
    mPhoneController->SetOnline(true);
271
    mPhoneController->SetOnline(true);
1335
265
    QTRY_COMPARE_WITH_TIMEOUT(activeAccountsSpy.count(), 2, DEFAULT_TIMEOUT);
272
    TRY_COMPARE(activeAccountsSpy.count(), 2);
1336
266
    QTRY_COMPARE(TelepathyHelper::instance()->activeAccounts().count(), 2);
273
    QCOMPARE(TelepathyHelper::instance()->activeAccounts().count(), 2);
1337
267
}
274
}
1338
268
275
1339
269
void TelepathyHelperTest::testAccountForId()
276
void TelepathyHelperTest::testAccountForId()
1340
@@ -291,7 +298,7 @@
1341
291
    QSignalSpy emergencyCallsSpy(TelepathyHelper::instance(), SIGNAL(emergencyCallsAvailableChanged()));
298
    QSignalSpy emergencyCallsSpy(TelepathyHelper::instance(), SIGNAL(emergencyCallsAvailableChanged()));
1342
292
299
1343
293
    // check that calls are available by default
300
    // check that calls are available by default
1345
294
    QVERIFY(TelepathyHelper::instance()->emergencyCallsAvailable());
301
    TRY_VERIFY(TelepathyHelper::instance()->emergencyCallsAvailable());
1346
295
302
1347
296
    // set the generic account as "flightmode" and make sure it doesn't affect the emergencyCallsAvailable
303
    // set the generic account as "flightmode" and make sure it doesn't affect the emergencyCallsAvailable
1348
297
    mGenericController->SetPresence("flightmode", "");
304
    mGenericController->SetPresence("flightmode", "");
1349
@@ -301,7 +308,7 @@
1350
301
308
1351
302
    // now set the phone account as "flightmode", and see if the emergencyCallsAvailable value
309
    // now set the phone account as "flightmode", and see if the emergencyCallsAvailable value
1352
303
    mPhoneController->SetPresence("flightmode", "");
310
    mPhoneController->SetPresence("flightmode", "");
1354
304
    QTRY_COMPARE(emergencyCallsSpy.count(), 1);
311
    TRY_VERIFY(emergencyCallsSpy.count() > 0);
1355
305
    QVERIFY(!TelepathyHelper::instance()->emergencyCallsAvailable());
312
    QVERIFY(!TelepathyHelper::instance()->emergencyCallsAvailable());
1356
306
313
1357
307
    // set the generic account online and check if it affects the value
314
    // set the generic account online and check if it affects the value
1358
@@ -313,9 +320,25 @@
1359
313
320
1360
314
    // and finally set the phone account back online
321
    // and finally set the phone account back online
1361
315
    mPhoneController->SetOnline(true);
322
    mPhoneController->SetOnline(true);
1363
316
    QTRY_COMPARE(emergencyCallsSpy.count(), 1);
323
    TRY_VERIFY(emergencyCallsSpy.count() > 0);
1364
317
    QVERIFY(TelepathyHelper::instance()->emergencyCallsAvailable());
324
    QVERIFY(TelepathyHelper::instance()->emergencyCallsAvailable());
1365
318
}
325
}
1366
319
326
1367
327
Tp::AccountPtr TelepathyHelperTest::addAccountAndWait(const QString &manager, const QString &protocol, const QString &displayName, const QVariantMap &parameters)
1368
328
{
1369
329
    QSignalSpy accountAddedSpy(TelepathyHelper::instance(), SIGNAL(accountAdded(AccountEntry*)));
1370
330
    Tp::AccountPtr account = addAccount(manager, protocol, displayName, parameters);
1371
331
1372
332
    WAIT_FOR(accountAddedSpy.count() == 1);
1373
333
1374
334
    AccountEntry *accountEntry = accountAddedSpy.first().first().value<AccountEntry*>();
1375
335
    WAIT_FOR(accountEntry->ready());
1376
336
1377
337
    // and make sure the status and status message are the ones we expect
1378
338
    WAIT_FOR(accountEntry->status() == QString("available"));
1379
339
1380
340
    return account;
1381
341
}
1382
342
1383
320
QTEST_MAIN(TelepathyHelperTest)
343
QTEST_MAIN(TelepathyHelperTest)
1384
321
#include "TelepathyHelperTest.moc"
344
#include "TelepathyHelperTest.moc"
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2015-05-12
Tiago Salem Herrmann (community)		2015-04-28	Approve on 2015-05-11
Review via email: mp+257694@code.launchpad.net