summaryrefslogtreecommitdiff
path: root/tubes/qa
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2012-03-21 16:10:16 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2012-07-17 16:39:23 +0200
commit638b3deee9e8a52fe75512aa9627fb1ca279ac32 (patch)
treefc31d1ce7ea064d3160494b087d0155de10ed246 /tubes/qa
parentd681b14b57a95a4c67a3a199b9324631f99609ba (diff)
singleton impl
Diffstat (limited to 'tubes/qa')
-rw-r--r--tubes/qa/test_manager.cxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx
index f017a9cc2ea6..3618f6ca4ad9 100644
--- a/tubes/qa/test_manager.cxx
+++ b/tubes/qa/test_manager.cxx
@@ -97,7 +97,6 @@ static TeleManager* mpManager2 = NULL;
// enabled and connected.
static rtl::OUString sAcc1( RTL_CONSTASCII_USTRINGPARAM( "libo1@localhost.localdomain"));
static rtl::OUString sAcc2( RTL_CONSTASCII_USTRINGPARAM( "libo2@localhost.localdomain"));
-static rtl::OUString sService( RTL_CONSTASCII_USTRINGPARAM( "TeleTest"));
static sal_uInt32 nSentPackets = 0;
TestTeleTubes::TestTeleTubes()
@@ -161,12 +160,12 @@ void TestTeleTubes::testContactList()
void TestTeleTubes::testSetupManager1()
{
- mpManager1 = new TeleManager( sAcc1, sService, true);
+ mpManager1 = new TeleManager( true);
}
void TestTeleTubes::testSetupManager2()
{
- mpManager2 = new TeleManager( sAcc2, sService);
+ mpManager2 = new TeleManager;
}
void TestTeleTubes::testPrepareAccountManager1()
@@ -185,13 +184,13 @@ void TestTeleTubes::testPrepareAccountManager2()
void TestTeleTubes::testStartBuddySession1()
{
- bool bStarted = mpManager1->startBuddySession( sAcc2);
+ bool bStarted = mpManager1->startBuddySession( sAcc1, sAcc2);
CPPUNIT_ASSERT( bStarted == true);
}
void TestTeleTubes::testStartBuddySession2()
{
- //bool bStarted = mpManager2->startBuddySession( sAcc1);
+ //bool bStarted = mpManager2->startBuddySession( sAcc2, sAcc1);
//CPPUNIT_ASSERT( bStarted == true);
}
@@ -203,8 +202,8 @@ void TestTeleTubes::testConnect1()
void TestTeleTubes::testConnect2()
{
- //bool bConnected = mpManager2->connect();
- //CPPUNIT_ASSERT( bConnected == true);
+ bool bConnected = mpManager2->connect();
+ CPPUNIT_ASSERT( bConnected == true);
}
void TestTeleTubes::testSendPacket()