Swiftdiff options
Diffstat (limited to 'Swift/Controllers/Roster/UnitTest/RosterTest.cpp')
| -rw-r--r-- | Swift/Controllers/Roster/UnitTest/RosterTest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp index 4444e8a..0c3e769 100644 --- a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp +++ b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp @@ -66,80 +66,80 @@ class RosterTest : public CppUnit::TestFixture { roster_->removeContact(jid2_); CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(static_cast<GroupRosterItem*>(roster_->getRoot()->getChildren()[0])->getChildren().size())); CPPUNIT_ASSERT_EQUAL(std::string("Bert"), static_cast<GroupRosterItem*>(roster_->getRoot()->getChildren()[0])->getChildren()[0]->getDisplayName()); } void testRemoveSecondContactSameBare() { JID jid4a("a@b/c"); JID jid4b("a@b/d"); roster_->addContact(jid4a, JID(), "Bert", "group1", ""); roster_->addContact(jid4b, JID(), "Cookie", "group1", ""); CPPUNIT_ASSERT_EQUAL(std::string("Cookie"), static_cast<GroupRosterItem*>(roster_->getRoot()->getChildren()[0])->getChildren()[1]->getDisplayName()); roster_->removeContact(jid4b); CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(static_cast<GroupRosterItem*>(roster_->getRoot()->getChildren()[0])->getChildren().size())); CPPUNIT_ASSERT_EQUAL(std::string("Bert"), static_cast<GroupRosterItem*>(roster_->getRoot()->getChildren()[0])->getChildren()[0]->getDisplayName()); } void testApplyPresenceLikeMUC() { JID jid4a("a@b/c"); JID jid4b("a@b/d"); JID jid4c("a@b/e"); roster_->addContact(jid4a, JID(), "Bird", "group1", ""); roster_->addContact(jid4b, JID(), "Cookie", "group1", ""); roster_->removeContact(jid4b); roster_->addContact(jid4c, JID(), "Bert", "group1", ""); roster_->addContact(jid4b, JID(), "Ernie", "group1", ""); boost::shared_ptr<Presence> presence(new Presence()); presence->setShow(StatusShow::DND); presence->setFrom(jid4a); roster_->applyOnItems(SetPresence(presence, JID::WithResource)); presence->setFrom(jid4b); roster_->applyOnItems(SetPresence(presence, JID::WithResource)); presence->setFrom(jid4c); roster_->applyOnItems(SetPresence(presence, JID::WithResource)); - presence = boost::shared_ptr<Presence>(new Presence()); + presence = boost::make_shared<Presence>(); presence->setFrom(jid4b); presence->setShow(StatusShow::Online); roster_->applyOnItems(SetPresence(presence, JID::WithResource)); std::vector<RosterItem*> children = static_cast<GroupRosterItem*>(roster_->getRoot()->getDisplayedChildren()[0])->getDisplayedChildren(); CPPUNIT_ASSERT_EQUAL(3, static_cast<int>(children.size())); /* Check order */ CPPUNIT_ASSERT_EQUAL(std::string("Ernie"), children[0]->getDisplayName()); CPPUNIT_ASSERT_EQUAL(std::string("Bert"), children[1]->getDisplayName()); CPPUNIT_ASSERT_EQUAL(std::string("Bird"), children[2]->getDisplayName()); - presence = boost::shared_ptr<Presence>(new Presence()); + presence = boost::make_shared<Presence>(); presence->setFrom(jid4c); presence->setType(Presence::Unavailable); roster_->removeContact(jid4c); roster_->applyOnItems(SetPresence(presence, JID::WithResource)); } void testReSortLikeMUC() { JID jid4a("a@b/c"); JID jid4b("a@b/d"); JID jid4c("a@b/e"); roster_->addContact(jid4a, JID(), "Bird", "group1", ""); roster_->addContact(jid4b, JID(), "Cookie", "group2", ""); roster_->addContact(jid4b, JID(), "Ernie", "group1", ""); roster_->getGroup("group1")->setManualSort("2"); roster_->getGroup("group2")->setManualSort("1"); GroupRosterItem* root = roster_->getRoot(); const std::vector<RosterItem*> kids = root->getDisplayedChildren(); CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), kids.size()); CPPUNIT_ASSERT_EQUAL(std::string("group2"), kids[0]->getDisplayName()); CPPUNIT_ASSERT_EQUAL(std::string("group1"), kids[1]->getDisplayName()); } private: Roster *roster_; JID jid1_; JID jid2_; JID jid3_; }; CPPUNIT_TEST_SUITE_REGISTRATION(RosterTest); |