From c82202f16bdad4a0aeab37912a5db0ba510415b6 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Wed, 26 Oct 2011 16:53:41 +0200 Subject: [PATCH] initial RosterManagerTest --- include/transport/localbuddy.h | 1 + src/localbuddy.cpp | 6 ++ src/tests/rostermanager.cpp | 126 +++++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+) create mode 100644 src/tests/rostermanager.cpp diff --git a/include/transport/localbuddy.h b/include/transport/localbuddy.h index 26b61983..c8f81174 100644 --- a/include/transport/localbuddy.h +++ b/include/transport/localbuddy.h @@ -63,6 +63,7 @@ class LocalBuddy : public Buddy { std::string m_statusMessage; std::string m_iconHash; Swift::StatusShow m_status; + bool m_firstSet; }; } diff --git a/src/localbuddy.cpp b/src/localbuddy.cpp index ce64ad87..a12b9ee9 100644 --- a/src/localbuddy.cpp +++ b/src/localbuddy.cpp @@ -25,12 +25,18 @@ namespace Transport { LocalBuddy::LocalBuddy(RosterManager *rosterManager, long id) : Buddy(rosterManager, id) { m_status = Swift::StatusShow::None; + m_firstSet = true; } LocalBuddy::~LocalBuddy() { } void LocalBuddy::setAlias(const std::string &alias) { + if (m_firstSet) { + m_firstSet = false; + m_alias = alias; + return; + } bool changed = m_alias != alias; m_alias = alias; diff --git a/src/tests/rostermanager.cpp b/src/tests/rostermanager.cpp new file mode 100644 index 00000000..860308e0 --- /dev/null +++ b/src/tests/rostermanager.cpp @@ -0,0 +1,126 @@ +#include "transport/userregistry.h" +#include "transport/config.h" +#include "transport/storagebackend.h" +#include "transport/user.h" +#include "transport/transport.h" +#include "transport/conversation.h" +#include "transport/usermanager.h" +#include "transport/localbuddy.h" +#include +#include +#include +#include +#include +#include +#include +#include "Swiften/Server/ServerStanzaChannel.h" +#include "Swiften/Server/ServerFromClientSession.h" +#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h" +#include "basictest.h" + +using namespace Transport; + +class RosterManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest { + CPPUNIT_TEST_SUITE(RosterManagerTest); + CPPUNIT_TEST(setBuddy); + CPPUNIT_TEST_SUITE_END(); + + public: + void setUp (void) { + setMeUp(); + userManager->onUserCreated.connect(boost::bind(&RosterManagerTest::handleUserCreated, this, _1)); + connectUser(); + received.clear(); + } + + void tearDown (void) { + received.clear(); + disconnectUser(); + tearMeDown(); + } + + void handleUserCreated(User *user) { + + } + + void connectUser() { + CPPUNIT_ASSERT_EQUAL(0, userManager->getUserCount()); + userRegistry->isValidUserPassword(Swift::JID("user@localhost/resource"), serverFromClientSession.get(), Swift::createSafeByteArray("password")); + loop->processEvents(); + CPPUNIT_ASSERT_EQUAL(1, userManager->getUserCount()); + + User *user = userManager->getUser("user@localhost"); + CPPUNIT_ASSERT(user); + + UserInfo userInfo = user->getUserInfo(); + CPPUNIT_ASSERT_EQUAL(std::string("password"), userInfo.password); + CPPUNIT_ASSERT(user->isReadyToConnect() == true); + CPPUNIT_ASSERT(user->isConnected() == false); + + user->setConnected(true); + CPPUNIT_ASSERT(user->isConnected() == true); + + CPPUNIT_ASSERT_EQUAL(1, (int) received.size()); + CPPUNIT_ASSERT(getStanza(received[0])->getPayload()); + received.clear(); + } + + void add2Buddies() { + User *user = userManager->getUser("user@localhost"); + CPPUNIT_ASSERT(user); + + LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1); + buddy->setFlags(BUDDY_JID_ESCAPING); + buddy->setName("buddy1"); + buddy->setAlias("Buddy 1"); + std::vector grp; + grp.push_back("group1"); + buddy->setGroups(grp); + buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status1"); + user->getRosterManager()->setBuddy(buddy); + + buddy = new LocalBuddy(user->getRosterManager(), -1); + buddy->setFlags(BUDDY_JID_ESCAPING); + buddy->setName("buddy2"); + buddy->setAlias("Buddy 2"); + std::vector grp2; + grp2.push_back("group2"); + buddy->setGroups(grp2); + buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status2"); + user->getRosterManager()->setBuddy(buddy); + } + + void setBuddy() { + add2Buddies(); + CPPUNIT_ASSERT_EQUAL(2, (int) received.size()); + + Swift::RosterPayload::ref payload = getStanza(received[0])->getPayload(); + CPPUNIT_ASSERT(payload); + CPPUNIT_ASSERT_EQUAL(1, (int) payload->getItems().size()); + Swift::RosterItemPayload item = payload->getItems()[0]; + CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), Buddy::JIDToLegacyName(item.getJID())); + CPPUNIT_ASSERT_EQUAL(std::string("Buddy 1"), item.getName()); + + payload = getStanza(received[1])->getPayload(); + CPPUNIT_ASSERT(payload); + CPPUNIT_ASSERT_EQUAL(1, (int) payload->getItems().size()); + item = payload->getItems()[0]; + CPPUNIT_ASSERT_EQUAL(std::string("buddy2"), Buddy::JIDToLegacyName(item.getJID())); + CPPUNIT_ASSERT_EQUAL(std::string("Buddy 2"), item.getName()); + + // TODO send response and check for presence + } + + void disconnectUser() { + userManager->disconnectUser("user@localhost"); + dynamic_cast(factories->getTimerFactory())->setTime(10); + loop->processEvents(); + + CPPUNIT_ASSERT_EQUAL(0, userManager->getUserCount()); + CPPUNIT_ASSERT_EQUAL(1, (int) received.size()); + CPPUNIT_ASSERT(dynamic_cast(getStanza(received[0]))); + } + +}; + +CPPUNIT_TEST_SUITE_REGISTRATION (RosterManagerTest);