Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2013-08-04 20:45:19 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2013-08-04 20:45:19 (GMT) |
| commit | 5d21021b92a3d7d5755e80a5be10cfbdf984b9db (patch) | |
| tree | ca6b0b5e7a025bd9dabaeed2d1d6cc59d3feeab0 /Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp | |
| parent | 85e23f6d04ea4d31a325f5267c78cbba2cbbac92 (diff) | |
| download | swift-contrib-5d21021b92a3d7d5755e80a5be10cfbdf984b9db.zip swift-contrib-5d21021b92a3d7d5755e80a5be10cfbdf984b9db.tar.bz2 | |
Factor Chat Message Parsing out and test it
Change-Id: Ia11dbebc736ecf9996f6d0fcc4550b749c55d433
Diffstat (limited to 'Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp')
| -rw-r--r-- | Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp b/Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp index cf6c581..0fc6a18 100644 --- a/Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp +++ b/Swift/Controllers/Chat/UnitTest/MUCControllerTest.cpp @@ -28,4 +28,5 @@ #include "Swiften/Disco/DummyEntityCapsProvider.h" #include <Swift/Controllers/Settings/DummySettingsProvider.h> +#include <Swift/Controllers/Chat/ChatMessageParser.h> using namespace Swift; @@ -68,5 +69,6 @@ public: muc_ = boost::make_shared<MUC>(stanzaChannel_, iqRouter_, directedPresenceSender_, mucJID_, mucRegistry_); mocks_->ExpectCall(chatWindowFactory_, ChatWindowFactory::createChatWindow).With(muc_->getJID(), uiEventStream_).Return(window_); - controller_ = new MUCController (self_, muc_, boost::optional<std::string>(), nick_, stanzaChannel_, iqRouter_, chatWindowFactory_, presenceOracle_, avatarManager_, uiEventStream_, false, timerFactory, eventController_, entityCapsProvider_, NULL, NULL, mucRegistry_, highlightManager_, &emoticons_); + chatMessageParser_ = new ChatMessageParser(std::map<std::string, std::string>()); + controller_ = new MUCController (self_, muc_, boost::optional<std::string>(), nick_, stanzaChannel_, iqRouter_, chatWindowFactory_, presenceOracle_, avatarManager_, uiEventStream_, false, timerFactory, eventController_, entityCapsProvider_, NULL, NULL, mucRegistry_, highlightManager_, chatMessageParser_); } @@ -87,4 +89,5 @@ public: delete mucRegistry_; delete avatarManager_; + delete chatMessageParser_; } @@ -346,5 +349,5 @@ private: DummySettingsProvider* settings_; HighlightManager* highlightManager_; - std::map<std::string, std::string> emoticons_; + ChatMessageParser* chatMessageParser_; }; |