send empty name if we receive it from backend
This commit is contained in:
parent
711c1674fe
commit
f9eb932dbc
2 changed files with 21 additions and 6 deletions
|
@ -154,12 +154,7 @@ void RosterManager::sendBuddyRosterPush(Buddy *buddy) {
|
|||
Swift::RosterPayload::ref payload = Swift::RosterPayload::ref(new Swift::RosterPayload());
|
||||
Swift::RosterItemPayload item;
|
||||
item.setJID(buddy->getJID().toBare());
|
||||
if (buddy->getAlias().empty()) {
|
||||
item.setName(buddy->getJID().toBare().toString());
|
||||
}
|
||||
else {
|
||||
item.setName(buddy->getAlias());
|
||||
}
|
||||
item.setName(buddy->getAlias());
|
||||
item.setGroups(buddy->getGroups());
|
||||
item.setSubscription(Swift::RosterItemPayload::Both);
|
||||
|
||||
|
|
|
@ -23,6 +23,7 @@ using namespace Transport;
|
|||
class RosterManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
|
||||
CPPUNIT_TEST_SUITE(RosterManagerTest);
|
||||
CPPUNIT_TEST(setBuddy);
|
||||
CPPUNIT_TEST(setBuddyNoAlias);
|
||||
CPPUNIT_TEST(sendCurrentPresences);
|
||||
CPPUNIT_TEST(sendUnavailablePresences);
|
||||
CPPUNIT_TEST(sendCurrentPresence);
|
||||
|
@ -72,6 +73,25 @@ class RosterManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
|
|||
|
||||
}
|
||||
|
||||
void setBuddyNoAlias() {
|
||||
User *user = userManager->getUser("user@localhost");
|
||||
CPPUNIT_ASSERT(user);
|
||||
|
||||
std::vector<std::string> grp;
|
||||
grp.push_back("group1");
|
||||
LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy1", "", grp, BUDDY_JID_ESCAPING);
|
||||
user->getRosterManager()->setBuddy(buddy);
|
||||
|
||||
CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
|
||||
|
||||
Swift::RosterPayload::ref payload1 = getStanza(received[0])->getPayload<Swift::RosterPayload>();
|
||||
CPPUNIT_ASSERT(payload1);
|
||||
CPPUNIT_ASSERT_EQUAL(1, (int) payload1->getItems().size());
|
||||
Swift::RosterItemPayload item = payload1->getItems()[0];
|
||||
CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID()));
|
||||
CPPUNIT_ASSERT_EQUAL(std::string(""), item.getName());
|
||||
}
|
||||
|
||||
void setBuddy() {
|
||||
add2Buddies();
|
||||
CPPUNIT_ASSERT_EQUAL(4, (int) received.size());
|
||||
|
|
Loading…
Add table
Reference in a new issue