diff options
| author | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2011-08-17 11:09:38 -0700 |
|---|---|---|
| committer | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2011-08-17 11:09:38 -0700 |
| commit | b7162e63869c771f3818106d893aa4d4a8ed07c5 (patch) | |
| tree | 7414d8462b8a43bc2344a5a7027163e4c0b85094 | |
| parent | d35cab671ca34542c598b0a032d79cd790c21408 (diff) | |
Add more tests for AccountsModelItem
| -rw-r--r-- | tests/dbus/accounts-model-accounts.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/dbus/accounts-model-accounts.cpp b/tests/dbus/accounts-model-accounts.cpp index 79e2513..35c5714 100644 --- a/tests/dbus/accounts-model-accounts.cpp +++ b/tests/dbus/accounts-model-accounts.cpp @@ -116,11 +116,9 @@ void TestAccountsModelAccounts::onItemChanged() QCOMPARE(accountItem->data(Tpy::AccountsModel::CurrentPresenceRole).toString(), account->currentPresence().status()); QCOMPARE(accountItem->data(Tpy::AccountsModel::CurrentPresenceTypeRole).toUInt(), static_cast<uint>(account->currentPresence().type())); QCOMPARE(accountItem->data(Tpy::AccountsModel::CurrentPresenceStatusMessageRole).toString(), account->currentPresence().statusMessage()); - if (!account->connection().isNull()) { - QCOMPARE(accountItem->data(Tpy::AccountsModel::ConnectionStatusRole).toUInt(), static_cast<uint>(account->connection()->status())); - QCOMPARE(accountItem->data(Tpy::AccountsModel::ConnectionStatusReasonRole).toUInt(), static_cast<uint>(account->connection()->statusReason())); - QCOMPARE(accountItem->data(Tpy::AccountsModel::ContactListStateRole).toUInt(), static_cast<uint>(account->connection()->contactManager()->state())); - } + QCOMPARE(accountItem->data(Tpy::AccountsModel::ConnectionStatusRole).toUInt(), static_cast<uint>(account->connection()->status())); + QCOMPARE(accountItem->data(Tpy::AccountsModel::ConnectionStatusReasonRole).toUInt(), static_cast<uint>(account->connection()->statusReason())); + QCOMPARE(accountItem->data(Tpy::AccountsModel::ContactListStateRole).toUInt(), static_cast<uint>(account->connection()->contactManager()->state())); QCOMPARE(accountItem->data(Tpy::AccountsModel::TextChatCapabilityRole).toBool(), account->capabilities().textChats()); QCOMPARE(accountItem->data(Tpy::AccountsModel::StreamedMediaCallCapabilityRole).toBool(), account->capabilities().streamedMediaCalls()); QCOMPARE(accountItem->data(Tpy::AccountsModel::StreamedMediaAudioCallCapabilityRole).toBool(), account->capabilities().streamedMediaAudioCalls()); @@ -224,6 +222,11 @@ void TestAccountsModelAccounts::testBasics() Tp::AccountPtr accountPtr = mAccountsModel->accountForIndex(mAccountsModel->index(0, 0)); Tpy::AccountsModelItem* accountItem = qobject_cast<Tpy::AccountsModelItem *>(mAccountsModel->accountItemForId(accountPtr->uniqueIdentifier())); + QCOMPARE(accountItem->data(Tpy::AccountsModel::ConnectionStatusRole).toUInt(), static_cast<uint>(accountPtr->connection()->status())); + QCOMPARE(accountItem->data(Tpy::AccountsModel::ConnectionStatusReasonRole).toUInt(), static_cast<uint>(accountPtr->connection()->statusReason())); + QCOMPARE(accountItem->data(Tpy::AccountsModel::ContactListStateRole).toUInt(), static_cast<uint>(accountPtr->connection()->contactManager()->state())); + + QVERIFY(connect(accountItem, SIGNAL(connectionStatusChanged(QString,int)), SLOT(onConnectionStatusChanged(QString,int)))); QVERIFY(connect(accountItem, SIGNAL(nicknameChanged(QString)), |