From 7634e391323e8edabf93dbe6e48c06f047a90faf Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandre.savard@savoirfairelinux.com>
Date: Mon, 20 Sep 2010 14:41:13 -0400
Subject: [PATCH] [#3963] Fix instant messaging test failures
---
sflphone-common/test/instantmessagingtest.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/sflphone-common/test/instantmessagingtest.cpp b/sflphone-common/test/instantmessagingtest.cpp
index f36a92136e..fb0f49308e 100644
--- a/sflphone-common/test/instantmessagingtest.cpp
+++ b/sflphone-common/test/instantmessagingtest.cpp
@@ -204,8 +204,8 @@ void InstantMessagingTest::testGenerateXmlUriList ()
sfl::InstantMessaging::UriEntry entry2;
entry2[sfl::IM_XML_URI] = "\"sip:manu@example.com\"";
- list.push_front(&entry1);
- list.push_front(&entry2);
+ list.push_front(entry1);
+ list.push_front(entry2);
std::string buffer = _im->generateXmlUriList(list);
CPPUNIT_ASSERT(buffer.size() != 0);
@@ -251,8 +251,8 @@ void InstantMessagingTest::testXmlUriListParsing ()
while (iterEntry != list.end()) {
- sfl::InstantMessaging::UriEntry *entry = static_cast<sfl::InstantMessaging::UriEntry *> (*iterEntry);
- iterAttr = entry->find (sfl::IM_XML_URI);
+ sfl::InstantMessaging::UriEntry entry = static_cast<sfl::InstantMessaging::UriEntry> (*iterEntry);
+ iterAttr = entry.find (sfl::IM_XML_URI);
if((iterAttr->second == std::string("sip:alex@example.com")) ||
(iterAttr->second == std::string("sip:manu@example.com")))
@@ -314,12 +314,12 @@ void InstantMessagingTest::testGetUriListArea ()
CPPUNIT_ASSERT(list.size() == 2);
// order may be important, for example to identify message sender
- sfl::InstantMessaging::UriEntry *entry = list.front();
- CPPUNIT_ASSERT(entry->size() == 2);
+ sfl::InstantMessaging::UriEntry entry = list.front();
+ CPPUNIT_ASSERT(entry.size() == 2);
- sfl::InstantMessaging::UriEntry::iterator iterAttr = entry->find (sfl::IM_XML_URI);
+ sfl::InstantMessaging::UriEntry::iterator iterAttr = entry.find (sfl::IM_XML_URI);
- if(iterAttr == entry->end()) {
+ if(iterAttr == entry.end()) {
std::cout << "Error, did not found attribute" << std::endl;
CPPUNIT_ASSERT(false);
}
--
GitLab