stv0g/spectrum2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Added test for disconnecting one resource in server mode

Browse source
This commit is contained in:
HanzZ 2013-01-11 22:31:19 +01:00
parent b4e9e12a6e
commit e1c00a8a10
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/tests/usermanager.cpp
View file

@ -34,6 +34,8 @@ class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
CPPUNIT_TEST_SUITE_END();
public:
Swift::Presence::ref changedPresence;
void setUp (void) {
setMeUp();
}
@ -165,11 +167,18 @@ class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
CPPUNIT_ASSERT_EQUAL(1, (int) received.size());
}
void handleUserPresenceChanged(User *user, Swift::Presence::ref presence) {
changedPresence = presence;
}
void connectTwoResources() {
connectUser();
add2Buddies();
connectSecondResource();
User *user = userManager->getUser("user@localhost");
user->onPresenceChanged.connect(boost::bind(&UserManagerTest::handleUserPresenceChanged, this, user, _1));
// we should get presences
CPPUNIT_ASSERT_EQUAL(4, (int) received2.size());
CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received2[2])));
@ -179,6 +188,22 @@ class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest {
CPPUNIT_ASSERT(dynamic_cast<Swift::Presence *>(getStanza(received2[3])));
CPPUNIT_ASSERT_EQUAL(Swift::StatusShow::Away, dynamic_cast<Swift::Presence *>(getStanza(received2[3]))->getShow());
CPPUNIT_ASSERT_EQUAL(std::string("status2"), dynamic_cast<Swift::Presence *>(getStanza(received2[3]))->getStatus());
Swift::Presence::ref response = Swift::Presence::create();
response->setTo("localhost");
response->setFrom("user@localhost/resource");
response->setType(Swift::Presence::Unavailable);
injectPresence(response);
CPPUNIT_ASSERT_EQUAL(Swift::Presence::Available, changedPresence->getType());
Swift::Presence::ref response2 = Swift::Presence::create();
response2->setTo("localhost");
response2->setFrom("user@localhost/resource2");
response2->setType(Swift::Presence::Unavailable);
injectPresence(response2);
CPPUNIT_ASSERT_EQUAL(Swift::Presence::Unavailable, changedPresence->getType());
}
void disconnectUserBouncer() {

1
src/user.cpp
View file

@ -348,7 +348,6 @@ void User::handlePresence(Swift::Presence::ref presence, bool forceJoin) {
m_resources = currentResourcesCount;
// Change legacy network presence
if (m_readyForConnect) {
Swift::Presence::ref highest = m_presenceOracle->getHighestPriorityPresence(m_jid.toBare());