Swiftdiff options
| author | dknn <yoann.blein@free.fr> | 2012-08-17 15:32:43 (GMT) |
|---|---|---|
| committer | dknn <yoann.blein@free.fr> | 2012-09-22 09:34:49 (GMT) |
| commit | 6247ed394302ff2cf1f33a71df808bebf7241242 (patch) | |
| tree | d4d61fb5e66611ecdc75cf1149b64e23fef2b077 /Swift/Controllers/Chat/UnitTest | |
| parent | c8ced8597ab28b928862d21554c0a68c238b1165 (diff) | |
| download | swift-contrib-6247ed394302ff2cf1f33a71df808bebf7241242.zip swift-contrib-6247ed394302ff2cf1f33a71df808bebf7241242.tar.bz2 | |
Fix test suite compliance
Diffstat (limited to 'Swift/Controllers/Chat/UnitTest')
| -rw-r--r-- | Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp index 482b19c..2bf0ba0 100644 --- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp +++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp @@ -52,6 +52,7 @@ #include <Swift/Controllers/SettingConstants.h> #include <Swift/Controllers/WhiteboardManager.h> #include <Swiften/Whiteboard/WhiteboardSessionManager.h> +#include <Swift/Controllers/ScreenSharing/UnitTest/DummyScreenSharingOverview.h> using namespace Swift; @@ -103,13 +104,15 @@ public: chatListWindow_ = new MockChatListWindow(); ftManager_ = new DummyFileTransferManager(); ftOverview_ = new FileTransferOverview(ftManager_); + ssOverview_ = new DummyScreenSharingOverview; avatarManager_ = new NullAvatarManager(); wbSessionManager_ = new WhiteboardSessionManager(iqRouter_, stanzaChannel_, presenceOracle_, entityCapsManager_); wbManager_ = new WhiteboardManager(whiteboardWindowFactory_, uiEventStream_, nickResolver_, wbSessionManager_); mocks_->ExpectCall(chatListWindowFactory_, ChatListWindowFactory::createChatListWindow).With(uiEventStream_).Return(chatListWindow_); - manager_ = new ChatsManager(jid_, stanzaChannel_, iqRouter_, eventController_, chatWindowFactory_, joinMUCWindowFactory_, nickResolver_, presenceOracle_, directedPresenceSender_, uiEventStream_, chatListWindowFactory_, true, NULL, mucRegistry_, entityCapsManager_, mucManager_, mucSearchWindowFactory_, profileSettings_, ftOverview_, xmppRoster_, false, settings_, NULL, wbManager_); + manager_ = new ChatsManager(jid_, stanzaChannel_, iqRouter_, eventController_, chatWindowFactory_, joinMUCWindowFactory_, nickResolver_, presenceOracle_, directedPresenceSender_, uiEventStream_, chatListWindowFactory_, true, NULL, mucRegistry_, entityCapsManager_, mucManager_, mucSearchWindowFactory_, profileSettings_, ftOverview_, ssOverview_, xmppRoster_, false, settings_, NULL, wbManager_); + avatarManager_ = new NullAvatarManager(); manager_->setAvatarManager(avatarManager_); }; @@ -118,6 +121,7 @@ public: delete profileSettings_; delete avatarManager_; delete manager_; + delete ssOverview_; delete ftOverview_; delete ftManager_; delete wbSessionManager_; @@ -479,6 +483,7 @@ private: ChatListWindow* chatListWindow_; FileTransferOverview* ftOverview_; FileTransferManager* ftManager_; + ScreenSharingOverview* ssOverview_; WhiteboardSessionManager* wbSessionManager_; WhiteboardManager* wbManager_; }; |