diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-03-22 12:43:59 +0000 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-07-17 16:39:31 +0200 |
| commit | 813b650dfbbc85efebe0dca903aa285d48237b85 (patch) | |
| tree | 0e68dd836ca38227f0b7d9c2ba03dd7b9041dc29 /tubes/qa | |
| parent | c6aa7e8aab81d27e0f8d1bcca82fa86d8f32d736 (diff) | |
tubes test: store OString identifiers
This will prevent having to convert them in multiple places.
Diffstat (limited to 'tubes/qa')
| -rw-r--r-- | tubes/qa/test_manager.cxx | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/tubes/qa/test_manager.cxx b/tubes/qa/test_manager.cxx index ea5806d83a89..da1b3ec88b01 100644 --- a/tubes/qa/test_manager.cxx +++ b/tubes/qa/test_manager.cxx @@ -91,8 +91,8 @@ private: rtl::OUString maTestConfigIniURL; rtl::Bootstrap maTestConfig; - rtl::OUString maAcc1; - rtl::OUString maAcc2; + rtl::OString maOffererIdentifier; + rtl::OString maAccepterIdentifier; }; // static, not members, so they actually survive cppunit test iteration @@ -107,10 +107,15 @@ TestTeleTubes::TestTeleTubes() { TeleManager::addSuffixToNames( "TeleTest"); + rtl::OUString aOffererIdentifier; CPPUNIT_ASSERT_MESSAGE( "See README for how to set up test-config.ini", - maTestConfig.getFrom("offerer", maAcc1)); + maTestConfig.getFrom("offerer", aOffererIdentifier)); + maOffererIdentifier = OUStringToOString( aOffererIdentifier, RTL_TEXTENCODING_UTF8); + + rtl::OUString aAccepterIdentifier; CPPUNIT_ASSERT_MESSAGE( "See README for how to set up test-config.ini", - maTestConfig.getFrom("accepter", maAcc2)); + maTestConfig.getFrom("accepter", aAccepterIdentifier)); + maAccepterIdentifier = OUStringToOString( aAccepterIdentifier, RTL_TEXTENCODING_UTF8); } TestTeleTubes::~TestTeleTubes() @@ -194,9 +199,9 @@ void TestTeleTubes::testPrepareAccountManager2() void TestTeleTubes::testStartBuddySession1() { - TpAccount *pAcc1 = mpManager1->getAccount( OUStringToOString( maAcc1, RTL_TEXTENCODING_UTF8)); + TpAccount *pAcc1 = mpManager1->getAccount(maOffererIdentifier); CPPUNIT_ASSERT ( pAcc1 != 0); - bool bStarted = mpManager1->startBuddySession( pAcc1, maAcc2); + bool bStarted = mpManager1->startBuddySession( pAcc1, maAccepterIdentifier); CPPUNIT_ASSERT( bStarted == true); } |