From 81ca3a2debc383c1bfa66860c72b3c726ada491b Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: Tue, 28 Aug 2012 13:12:46 +0200 Subject: [PATCH] Removed duplicities from tests --- src/tests/basictest.cpp | 49 +++++++++++++++++++++++++++++++ src/tests/basictest.h | 4 +++ src/tests/filetransfermanager.cpp | 49 ------------------------------- src/tests/localbuddy.cpp | 32 -------------------- src/tests/rostermanager.cpp | 49 ------------------------------- src/tests/user.cpp | 39 ++---------------------- src/tests/usermanager.cpp | 33 --------------------- 7 files changed, 56 insertions(+), 199 deletions(-) diff --git a/src/tests/basictest.cpp b/src/tests/basictest.cpp index 55e638fd..f88fc34e 100644 --- a/src/tests/basictest.cpp +++ b/src/tests/basictest.cpp @@ -152,3 +152,52 @@ Swift::Stanza *BasicTest::getStanza(boost::shared_ptr element) { return stanza; } +void BasicTest::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 BasicTest::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]))); +} + +void BasicTest::add2Buddies() { + User *user = userManager->getUser("user@localhost"); + CPPUNIT_ASSERT(user); + + std::vector grp; + grp.push_back("group1"); + LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy1", "Buddy 1", grp, BUDDY_JID_ESCAPING); + buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status1"); + user->getRosterManager()->setBuddy(buddy); + + std::vector grp2; + grp2.push_back("group2"); + buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy2", "Buddy 2", grp2, BUDDY_JID_ESCAPING); + buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status2"); + user->getRosterManager()->setBuddy(buddy); +} + diff --git a/src/tests/basictest.h b/src/tests/basictest.h index 7fec78c6..fe754bd9 100644 --- a/src/tests/basictest.h +++ b/src/tests/basictest.h @@ -217,6 +217,10 @@ class BasicTest : public Swift::XMPPParserClient { storage->setUser(user); } + void connectUser(); + void disconnectUser(); + void add2Buddies(); + Swift::Stanza *getStanza(boost::shared_ptr element); protected: diff --git a/src/tests/filetransfermanager.cpp b/src/tests/filetransfermanager.cpp index e3ffec20..02e4b90b 100644 --- a/src/tests/filetransfermanager.cpp +++ b/src/tests/filetransfermanager.cpp @@ -58,55 +58,6 @@ class FileTransferManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTe tearMeDown(); } - 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 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]))); - } - - void add2Buddies() { - User *user = userManager->getUser("user@localhost"); - CPPUNIT_ASSERT(user); - - std::vector grp; - grp.push_back("group1"); - LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy1", "Buddy 1", grp, BUDDY_JID_ESCAPING); - buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status1"); - user->getRosterManager()->setBuddy(buddy); - - std::vector grp2; - grp2.push_back("group2"); - buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy2", "Buddy 2", grp2, BUDDY_JID_ESCAPING); - buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status2"); - user->getRosterManager()->setBuddy(buddy); - } - void handleFTDataNeeded() { dataNeeded = true; diff --git a/src/tests/localbuddy.cpp b/src/tests/localbuddy.cpp index 12364ce6..fdc6fb87 100644 --- a/src/tests/localbuddy.cpp +++ b/src/tests/localbuddy.cpp @@ -42,28 +42,6 @@ class LocalBuddyTest : public CPPUNIT_NS :: TestFixture, public BasicTest { tearMeDown(); } - 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 createWithInvalidName() { User *user = userManager->getUser("user@localhost"); CPPUNIT_ASSERT(user); @@ -136,16 +114,6 @@ class LocalBuddyTest : public CPPUNIT_NS :: TestFixture, public BasicTest { CPPUNIT_ASSERT_EQUAL(std::string("Buddy 2"), item.getName()); } - 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 (LocalBuddyTest); diff --git a/src/tests/rostermanager.cpp b/src/tests/rostermanager.cpp index 64fa80fc..774212cf 100644 --- a/src/tests/rostermanager.cpp +++ b/src/tests/rostermanager.cpp @@ -59,45 +59,6 @@ class RosterManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest { m_buddy = buddy->getName(); } - 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); - - std::vector grp; - grp.push_back("group1"); - LocalBuddy *buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy1", "Buddy 1", grp, BUDDY_JID_ESCAPING); - buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status1"); - user->getRosterManager()->setBuddy(buddy); - - std::vector grp2; - grp2.push_back("group2"); - buddy = new LocalBuddy(user->getRosterManager(), -1, "buddy2", "Buddy 2", grp2, BUDDY_JID_ESCAPING); - buddy->setStatus(Swift::StatusShow(Swift::StatusShow::Away), "status2"); - user->getRosterManager()->setBuddy(buddy); - } - void setBuddy() { add2Buddies(); CPPUNIT_ASSERT_EQUAL(2, (int) received.size()); @@ -267,16 +228,6 @@ class RosterManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest { CPPUNIT_ASSERT_EQUAL(std::string("buddy1"), m_buddy); } - 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); diff --git a/src/tests/user.cpp b/src/tests/user.cpp index f1f03a44..2aac1d55 100644 --- a/src/tests/user.cpp +++ b/src/tests/user.cpp @@ -54,7 +54,9 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { void tearDown (void) { received.clear(); - disconnectUser(); + if (!disconnected) { + disconnectUser(); + } tearMeDown(); } @@ -83,29 +85,6 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { room = r; } - 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); - - CPPUNIT_ASSERT_EQUAL(true, readyToConnect); - - user->setConnected(true); - CPPUNIT_ASSERT(user->isConnected() == true); - - CPPUNIT_ASSERT_EQUAL(1, (int) received.size()); - CPPUNIT_ASSERT(getStanza(received[0])->getPayload()); - received.clear(); - } void sendCurrentPresence() { User *user = userManager->getUser("user@localhost"); @@ -223,18 +202,6 @@ class UserTest : public CPPUNIT_NS :: TestFixture, public BasicTest { disconnected = true; } - void disconnectUser() { - if (disconnected) - return; - 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 (UserTest); diff --git a/src/tests/usermanager.cpp b/src/tests/usermanager.cpp index d2102cf5..5ae281a0 100644 --- a/src/tests/usermanager.cpp +++ b/src/tests/usermanager.cpp @@ -37,27 +37,6 @@ class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest { tearMeDown(); } - 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()); - } - void connectUserTransportDisabled() { addUser(); storage->updateUserSetting(1, "enable_transport", "0"); @@ -70,18 +49,6 @@ class UserManagerTest : public CPPUNIT_NS :: TestFixture, public BasicTest { CPPUNIT_ASSERT(!user); } - void disconnectUser() { - connectUser(); - received.clear(); - - 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]))); - } void handleProbePresence() { Swift::Presence::ref response = Swift::Presence::create();