1 files changed, 54 insertions, 33 deletions
diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h
index 998a4eb..74478d5 100644
--- a/Swift/Controllers/UnitTest/MockChatWindow.h
+++ b/Swift/Controllers/UnitTest/MockChatWindow.h
@@ -6,60 +6,81 @@
 
 #pragma once
 
-#include "Swift/Controllers/UIInterfaces/ChatWindow.h"
+#include <boost/shared_ptr.hpp>
+
+#include <Swift/Controllers/UIInterfaces/ChatWindow.h>
+#include <Swiften/Base/foreach.h>
+
 
 namespace Swift {
 	class MockChatWindow : public ChatWindow {
 		public:
-			MockChatWindow() : labelsEnabled_(false) {};
+			MockChatWindow() : labelsEnabled_(false) {}
 			virtual ~MockChatWindow();
 
-			virtual std::string addMessage(const std::string& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, boost::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message; return "";};
-			virtual std::string addAction(const std::string& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, boost::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime&) {lastMessageBody_ = message; return "";};
-			virtual void addSystemMessage(const std::string& /*message*/) {};
-			virtual void addErrorMessage(const std::string& /*message*/) {};
-			virtual void addPresenceMessage(const std::string& /*message*/) {};
+			virtual std::string addMessage(const ChatMessage& message, const std::string& /*senderName*/, bool /*senderIsSelf*/, boost::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime& /*time*/, const HighlightAction& /*highlight*/) {
+			lastMessageBody_ = bodyFromMessage(message); return "id";}
+
+			virtual std::string addAction(const ChatMessage& /*message*/, const std::string& /*senderName*/, bool /*senderIsSelf*/, boost::shared_ptr<SecurityLabel> /*label*/, const std::string& /*avatarPath*/, const boost::posix_time::ptime& /*time*/, const HighlightAction& /*highlight*/) {return "id";}
+
+			virtual void addSystemMessage(const ChatMessage& /*message*/, Direction /*direction*/) {}
+			virtual void addPresenceMessage(const ChatMessage& /*message*/, Direction /*direction*/) {}
+
+			virtual void addErrorMessage(const ChatMessage& /*message*/) {}
+			virtual void replaceMessage(const ChatMessage& /*message*/, const std::string& /*id*/, const boost::posix_time::ptime& /*time*/, const HighlightAction& /*highlight*/) {}
+			virtual void replaceWithAction(const ChatMessage& /*message*/, const std::string& /*id*/, const boost::posix_time::ptime& /*time*/, const HighlightAction& /*highlight*/) {}
+			virtual void replaceLastMessage(const ChatMessage& /*message*/) {}
 
 			// File transfer related stuff
-			virtual std::string addFileTransfer(const std::string& /*senderName*/, bool /*senderIsSelf*/,const std::string& /*filename*/, const boost::uintmax_t /*sizeInBytes*/) { return 0; };
-			virtual void setFileTransferProgress(std::string /*id*/, const int /*alreadyTransferedBytes*/) { };
-			virtual void setFileTransferStatus(std::string /*id*/, const FileTransferState /*state*/, const std::string& /*msg*/) { };
+			virtual std::string addFileTransfer(const std::string& /*senderName*/, bool /*senderIsSelf*/,const std::string& /*filename*/, const boost::uintmax_t /*sizeInBytes*/) { return 0; }
+			virtual void setFileTransferProgress(std::string /*id*/, const int /*alreadyTransferedBytes*/) { }
+			virtual void setFileTransferStatus(std::string /*id*/, const FileTransferState /*state*/, const std::string& /*msg*/) { }
 			
 			virtual void setMessageReceiptState(const std::string &/* id */, ReceiptState /* state */) { }
 
-			virtual void setContactChatState(ChatState::ChatStateType /*state*/) {};
-			virtual void setName(const std::string& name) {name_ = name;};
-			virtual void show() {};
-			virtual void activate() {};
-			virtual void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) {labels_ = labels;};
-			virtual void setSecurityLabelsEnabled(bool enabled) {labelsEnabled_ = enabled;};
-			virtual void setUnreadMessageCount(int /*count*/) {};
-			virtual void convertToMUC() {};
-			virtual void setSecurityLabelsError() {};
+			virtual void setContactChatState(ChatState::ChatStateType /*state*/) {}
+			virtual void setName(const std::string& name) {name_ = name;}
+			virtual void show() {}
+			virtual void activate() {}
+			virtual void setAvailableSecurityLabels(const std::vector<SecurityLabelsCatalog::Item>& labels) {labels_ = labels;}
+			virtual void setSecurityLabelsEnabled(bool enabled) {labelsEnabled_ = enabled;}
+			virtual void setUnreadMessageCount(int /*count*/) {}
+			virtual void convertToMUC() {}
+			virtual void setSecurityLabelsError() {}
 			virtual SecurityLabelsCatalog::Item getSelectedSecurityLabel() {return label_;}
-			virtual void setInputEnabled(bool /*enabled*/) {};
-			virtual void setRosterModel(Roster* /*roster*/) {};
-			virtual void setTabComplete(TabComplete*) {};
-			virtual void replaceLastMessage(const std::string&) {};
-			virtual void replaceMessage(const std::string&, const std::string&, const boost::posix_time::ptime&) {};
-			virtual void replaceWithAction(const std::string& /*message*/, const std::string& /*id*/, const boost::posix_time::ptime& /*time*/) {};
-			void setAckState(const std::string& /*id*/, AckState /*state*/) {};
-			virtual void flash() {};
-			virtual void setAlert(const std::string& /*alertText*/, const std::string& /*buttonText*/) {};
-			virtual void cancelAlert() {};
+			virtual void setInputEnabled(bool /*enabled*/) {}
+			virtual void setRosterModel(Roster* /*roster*/) {}
+			virtual void setTabComplete(TabComplete*) {}
+
+			void setAckState(const std::string& /*id*/, AckState /*state*/) {}
+			virtual void flash() {}
+			virtual void setAlert(const std::string& /*alertText*/, const std::string& /*buttonText*/) {}
+			virtual void cancelAlert() {}
 			virtual void setCorrectionEnabled(Tristate /*enabled*/) {}
 			void setAvailableOccupantActions(const std::vector<OccupantAction>&/* actions*/) {}
 			void setSubject(const std::string& /*subject*/) {}
 			virtual void showRoomConfigurationForm(Form::ref) {}
-			virtual void addMUCInvitation(const std::string& /*senderName*/, const JID& /*jid*/, const std::string& /*reason*/, const std::string& /*password*/, bool = true) {};
+			virtual void addMUCInvitation(const std::string& /*senderName*/, const JID& /*jid*/, const std::string& /*reason*/, const std::string& /*password*/, bool = true) {}
 
-			virtual std::string addWhiteboardRequest(bool) {return "";};
-			virtual void setWhiteboardSessionStatus(std::string, const ChatWindow::WhiteboardSessionState){};
+			virtual std::string addWhiteboardRequest(bool) {return "";}
+			virtual void setWhiteboardSessionStatus(std::string, const ChatWindow::WhiteboardSessionState){}
 
 			virtual void setAffiliations(MUCOccupant::Affiliation, const std::vector<JID>&) {}
-			virtual void setAvailableRoomActions(const std::vector<RoomAction> &) {};
+			virtual void setAvailableRoomActions(const std::vector<RoomAction> &) {}
 			virtual InviteToChatWindow* createInviteToChatWindow() {return NULL;}
 
+			virtual void setBlockingState(BlockingState) {}
+
+			std::string bodyFromMessage(const ChatMessage& message) {
+				boost::shared_ptr<ChatTextMessagePart> text;
+				foreach (boost::shared_ptr<ChatMessagePart> part, message.getParts()) {
+					if ((text = boost::dynamic_pointer_cast<ChatTextMessagePart>(part))) {
+						return text->text;
+					}
+				}
+				return "";
+			}
+
 			std::string name_;
 			std::string lastMessageBody_;
 			std::vector<SecurityLabelsCatalog::Item> labels_;