1 files changed, 25 insertions, 1 deletions
diff --git a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
index ca74dbb..fbee894 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterControllerTest.cpp
@@ -25,23 +25,33 @@
 #include "Swiften/Avatars/NullAvatarManager.h"
 #include "Swift/Controllers/XMPPEvents/EventController.h"
 #include "Swiften/Presence/PresenceOracle.h"
 #include "Swiften/Presence/SubscriptionManager.h"
 #include "Swiften/Client/NickResolver.h"
 #include "Swift/Controllers/UIEvents/UIEventStream.h"
 #include "Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h"
 #include "Swiften/MUC/MUCRegistry.h"
 #include <Swiften/Client/DummyNickManager.h>
+#include <Swiften/Disco/EntityCapsManager.h>
+#include <Swiften/Disco/CapsProvider.h>
+#include <Swiften/Jingle/JingleSessionManager.h>
+#include <Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h>
+#include <Swiften/Base/Algorithm.h>
+#include <Swiften/EventLoop/DummyEventLoop.h>
 
 using namespace Swift;
 
 #define CHILDREN mainWindow_->roster->getRoot()->getChildren()
 
+class DummyCapsProvider : public CapsProvider {
+		DiscoInfo::ref getCaps(const std::string&) const {return DiscoInfo::ref(new DiscoInfo());}
+};
+
 class RosterControllerTest : public CppUnit::TestFixture {
 		CPPUNIT_TEST_SUITE(RosterControllerTest);
 		CPPUNIT_TEST(testAdd);
 		CPPUNIT_TEST(testAddSubscription);
 		CPPUNIT_TEST(testReceiveRename);
 		CPPUNIT_TEST(testReceiveRegroup);
 		CPPUNIT_TEST(testSendRename);
 		CPPUNIT_TEST(testPresence);
 		CPPUNIT_TEST(testHighestPresence);
@@ -60,24 +70,33 @@ class RosterControllerTest : public CppUnit::TestFixture {
 			channel_ = new DummyIQChannel();
 			router_ = new IQRouter(channel_);
 			stanzaChannel_ = new DummyStanzaChannel();
 			presenceOracle_ = new PresenceOracle(stanzaChannel_);
 			subscriptionManager_ = new SubscriptionManager(stanzaChannel_);
 			eventController_ = new EventController();
 			uiEventStream_ = new UIEventStream();
 			settings_ = new DummySettingsProvider();
 			nickManager_ = new DummyNickManager();
-			rosterController_ = new RosterController(jid_, xmppRoster_, avatarManager_, mainWindowFactory_, nickManager_, nickResolver_, presenceOracle_, subscriptionManager_, eventController_, uiEventStream_, router_, settings_);
+			capsProvider_ = new DummyCapsProvider();
+			entityCapsManager_ = new EntityCapsManager(capsProvider_, stanzaChannel_);
+			jingleSessionManager_ = new JingleSessionManager(router_);
+
+			ftManager_ = new DummyFileTransferManager();
+			ftOverview_ = new FileTransferOverview(ftManager_);
+			rosterController_ = new RosterController(jid_, xmppRoster_, avatarManager_, mainWindowFactory_, nickManager_, nickResolver_, presenceOracle_, subscriptionManager_, eventController_, uiEventStream_, router_, settings_, entityCapsManager_, ftOverview_);
 			mainWindow_ = mainWindowFactory_->last;
 		};
 
 		void tearDown() {
 			delete rosterController_;
+			delete ftManager_;
+			delete jingleSessionManager_;
+			
 			delete nickManager_;
 			delete nickResolver_;
 			delete mucRegistry_;
 			delete mainWindowFactory_;
 			delete avatarManager_;
 			delete router_;
 			delete channel_;
 			delete eventController_;
 			delete subscriptionManager_;
@@ -307,12 +326,17 @@ class RosterControllerTest : public CppUnit::TestFixture {
 		DummyIQChannel* channel_;
 		DummyStanzaChannel* stanzaChannel_;	
 		IQRouter* router_;
 		PresenceOracle* presenceOracle_;
 		SubscriptionManager* subscriptionManager_;
 		EventController* eventController_;
 		UIEventStream* uiEventStream_;
 		MockMainWindow* mainWindow_;
 		DummySettingsProvider* settings_;
+		DummyCapsProvider* capsProvider_;
+		EntityCapsManager* entityCapsManager_;
+		JingleSessionManager* jingleSessionManager_;
+		FileTransferManager* ftManager_;
+		FileTransferOverview* ftOverview_;
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(RosterControllerTest);