diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-03-22 12:59:15 +0000 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:39:32 +0200 |
| commit | 066479973ce488b0cbf37cf409cd3616661b7943 (patch) | |
| tree | d2119c09ee9abb6cb0b2e13f1279128abc5aa375 /tubes/qa | |
| parent | ebc93773e9ec3436f2519651b42b69d39fe4e2e4 (diff) | |
tubes: make startBuddySession take a TpContact *.
I removed Conference::setTarget() because it's redundant: you can get
the target from the channel. And maTarget was unused anyway.
Diffstat (limited to 'tubes/qa')
| -rw-r--r-- | tubes/qa/test_manager.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx index debfef5ef7f1..b053652fbae2 100644 --- a/tubes/qa/test_manager.cxx +++ b/tubes/qa/test_manager.cxx @@ -224,8 +224,10 @@ void TestTeleTubes::testPrepareAccountManager2() void TestTeleTubes::testStartBuddySession1() { TpAccount *pAcc1 = mpManager1->getAccount(maOffererIdentifier); - CPPUNIT_ASSERT ( pAcc1 != 0); - bool bStarted = mpManager1->startBuddySession( pAcc1, maAccepterIdentifier); + CPPUNIT_ASSERT( pAcc1 != 0); + /* This has to run after testContactList has run successfully. */ + CPPUNIT_ASSERT( mpAccepterContact != 0); + bool bStarted = mpManager1->startBuddySession( pAcc1, mpAccepterContact); CPPUNIT_ASSERT( bStarted == true); } |