1 files changed, 28 insertions, 6 deletions
diff --git a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
index c396e48..9320af1 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
@@ -1,8 +1,7 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #include <cppunit/extensions/HelperMacros.h>
@@ -26,15 +25,14 @@
 #include <Swiften/Presence/PresenceOracle.h>
 #include <Swiften/Presence/SubscriptionManager.h>
 #include <Swiften/Queries/DummyIQChannel.h>
 #include <Swiften/Queries/IQRouter.h>
 #include <Swiften/Roster/XMPPRosterImpl.h>
+#include <Swiften/VCards/VCardManager.h>
 #include <Swiften/VCards/VCardMemoryStorage.h>
-// #include <Swiften/Elements/Payload.h>
-// #include <Swiften/Elements/RosterItemPayload.h>
-// #include <Swiften/Elements/RosterPayload.h>
+#include <Swift/Controllers/FileTransfer/FileTransferOverview.h>
 #include <Swift/Controllers/Roster/ContactRosterItem.h>
 #include <Swift/Controllers/Roster/GroupRosterItem.h>
 #include <Swift/Controllers/Roster/Roster.h>
 #include <Swift/Controllers/Roster/RosterController.h>
 #include <Swift/Controllers/Settings/DummySettingsProvider.h>
@@ -60,10 +58,11 @@ class RosterControllerTest : public CppUnit::TestFixture {
                CPPUNIT_TEST(testSendRename);
                CPPUNIT_TEST(testPresence);
                CPPUNIT_TEST(testHighestPresence);
                CPPUNIT_TEST(testNotHighestPresence);
                CPPUNIT_TEST(testUnavailablePresence);
+                CPPUNIT_TEST(testRemoveResultsInUnavailablePresence);
                CPPUNIT_TEST_SUITE_END();
        public:
                void setUp() {
                        jid_ = JID("testjid@swift.im/swift");
@@ -73,11 +72,11 @@ class RosterControllerTest : public CppUnit::TestFixture {
                        mucRegistry_ = new MUCRegistry();
                        nickResolver_ = new NickResolver(jid_.toBare(), xmppRoster_, NULL, mucRegistry_);
                        channel_ = new DummyIQChannel();
                        router_ = new IQRouter(channel_);
                        stanzaChannel_ = new DummyStanzaChannel();
-                        presenceOracle_ = new PresenceOracle(stanzaChannel_);
+                        presenceOracle_ = new PresenceOracle(stanzaChannel_, xmppRoster_);
                        subscriptionManager_ = new SubscriptionManager(stanzaChannel_);
                        eventController_ = new EventController();
                        uiEventStream_ = new UIEventStream();
                        settings_ = new DummySettingsProvider();
                        nickManager_ = new DummyNickManager();
@@ -317,10 +316,33 @@ class RosterControllerTest : public CppUnit::TestFixture {
                        CPPUNIT_ASSERT_EQUAL(groups.size(), item.getGroups().size());
                        assertVectorsEqual(groups, item.getGroups(), __LINE__);
                }
+                void testRemoveResultsInUnavailablePresence() {
+                        std::vector<std::string> groups;
+                        groups.push_back("testGroup1");
+                        JID from("test@testdomain.com");
+                        xmppRoster_->addContact(from, "name", groups, RosterItemPayload::Both);
+                        Presence::ref lowPresence(new Presence());
+                        lowPresence->setFrom(withResource(from, "bob"));
+                        lowPresence->setPriority(2);
+                        lowPresence->setStatus("Not here");
+                        Presence::ref highPresence(new Presence());
+                        highPresence->setFrom(withResource(from, "bert"));
+                        highPresence->setPriority(10);
+                        highPresence->setStatus("So totally here");
+                        stanzaChannel_->onPresenceReceived(highPresence);
+                        stanzaChannel_->onPresenceReceived(lowPresence);
+                        CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), presenceOracle_->getAllPresence("test@testdomain.com").size());
+                        xmppRoster_->onJIDRemoved(JID("test@testdomain.com"));
+                        CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), presenceOracle_->getAllPresence("test@testdomain.com").size());
+                        CPPUNIT_ASSERT_EQUAL(Presence::Unavailable, presenceOracle_->getAllPresence("test@testdomain.com")[0]->getType());
+                }
                void assertVectorsEqual(const std::vector<std::string>& v1, const std::vector<std::string>& v2, int line) {
                        foreach (const std::string& entry, v1) {
                                if (std::find(v2.begin(), v2.end(), entry) == v2.end()) {
                                        std::stringstream stream;
                                        stream <<       "Couldn't find " << entry << " in v2 (line " << line << ")";