Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-08-27 20:19:14 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-08-27 21:52:18 (GMT) |
| commit | 7f1bcf974efac0ed87b6f8f639e1fdc16a89eb09 (patch) | |
| tree | 7fa948375b6cc56f37bd2be400d6d8be9ca97837 /Swift/Controllers/Chat/UnitTest | |
| parent | ba774f85e77531c7971804cb738c6b434a197258 (diff) | |
| download | swift-7f1bcf974efac0ed87b6f8f639e1fdc16a89eb09.zip swift-7f1bcf974efac0ed87b6f8f639e1fdc16a89eb09.tar.bz2 | |
Separate MUCRegistry from ChatsManager.
Diffstat (limited to 'Swift/Controllers/Chat/UnitTest')
| -rw-r--r-- | Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp index 1676403..4b95948 100644 --- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp +++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp @@ -60,14 +60,15 @@ public: eventController_ = new EventController(); chatWindowFactory_ = mocks_->InterfaceMock<ChatWindowFactory>(); xmppRoster_ = boost::shared_ptr<XMPPRoster>(new XMPPRoster()); - nickResolver_ = new NickResolver(jid_.toBare(), xmppRoster_, NULL); + mucRegistry_ = new MUCRegistry(); + nickResolver_ = new NickResolver(jid_.toBare(), xmppRoster_, NULL, mucRegistry_); presenceOracle_ = new PresenceOracle(stanzaChannel_); serverDiscoInfo_ = boost::shared_ptr<DiscoInfo>(new DiscoInfo()); presenceSender_ = new PresenceSender(stanzaChannel_); uiEventStream_ = new UIEventStream(); chatListWindowFactory_ = mocks_->InterfaceMock<ChatListWindowFactory>(); mocks_->ExpectCall(chatListWindowFactory_, ChatListWindowFactory::createWindow).With(uiEventStream_).Return(NULL); - manager_ = new ChatsManager(jid_, stanzaChannel_, iqRouter_, eventController_, chatWindowFactory_, nickResolver_, presenceOracle_, serverDiscoInfo_, presenceSender_, uiEventStream_, chatListWindowFactory_, true, NULL); + manager_ = new ChatsManager(jid_, stanzaChannel_, iqRouter_, eventController_, chatWindowFactory_, nickResolver_, presenceOracle_, serverDiscoInfo_, presenceSender_, uiEventStream_, chatListWindowFactory_, true, NULL, mucRegistry_); vcardStorage_ = new VCardMemoryStorage(); vcardManager_ = new VCardManager(jid_, iqRouter_, vcardStorage_); @@ -85,6 +86,7 @@ public: delete presenceSender_; delete presenceOracle_; delete nickResolver_; + delete mucRegistry_; delete stanzaChannel_; delete eventController_; delete iqChannel_; @@ -323,6 +325,7 @@ private: MockRepository* mocks_; UIEventStream* uiEventStream_; ChatListWindowFactory* chatListWindowFactory_; + MUCRegistry* mucRegistry_; }; CPPUNIT_TEST_SUITE_REGISTRATION(ChatsManagerTest); |