summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-01-29 23:52:25 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-01-29 23:52:25 (GMT)
commit01f868c4040234ed4b1ee7d0e08377a89b928b77 (patch)
tree650b42976a38e18d61a58d1b3a7c7ef509472237 /Swift/Controllers
parented8990c5ee4f54d63e88b6bad28356d0c032a8c3 (diff)
downloadswift-01f868c4040234ed4b1ee7d0e08377a89b928b77.zip
swift-01f868c4040234ed4b1ee7d0e08377a89b928b77.tar.bz2
Fix chatwindow unit tests
Diffstat (limited to 'Swift/Controllers')
-rw-r--r--Swift/Controllers/UnitTest/ChatsManagerTest.cpp4
-rw-r--r--Swift/Controllers/UnitTest/MockChatWindow.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/Swift/Controllers/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/UnitTest/ChatsManagerTest.cpp
index 0dfc52b..219b9b0 100644
--- a/Swift/Controllers/UnitTest/ChatsManagerTest.cpp
+++ b/Swift/Controllers/UnitTest/ChatsManagerTest.cpp
@@ -4,8 +4,8 @@
#include "Swift/Controllers/ChatsManager.h"
-#include "Swift/Controllers/ChatWindow.h"
-#include "Swift/Controllers/ChatWindowFactory.h"
+#include "Swift/Controllers/UIInterfaces/ChatWindow.h"
+#include "Swift/Controllers/UIInterfaces/ChatWindowFactory.h"
#include "Swiften/Roster/TreeWidgetFactory.h"
#include "Swiften/Client/Client.h"
#include "Swift/Controllers/ChatController.h"
diff --git a/Swift/Controllers/UnitTest/MockChatWindow.h b/Swift/Controllers/UnitTest/MockChatWindow.h
index 2625553..dc744cd 100644
--- a/Swift/Controllers/UnitTest/MockChatWindow.h
+++ b/Swift/Controllers/UnitTest/MockChatWindow.h
@@ -1,6 +1,6 @@
#pragma once
-#include "Swift/Controllers/ChatWindow.h"
+#include "Swift/Controllers/UIInterfaces/ChatWindow.h"
namespace Swift {
class MockChatWindow : public ChatWindow {
@@ -9,6 +9,7 @@ namespace Swift {
virtual ~MockChatWindow();
virtual void addMessage(const String& message, const String& /*senderName*/, bool /*senderIsSelf*/, const boost::optional<SecurityLabel>& /*label*/, const String& /*avatarPath*/) {lastMessageBody_ = message;};
+ virtual void addAction(const String& message, const String& /*senderName*/, bool /*senderIsSelf*/, const boost::optional<SecurityLabel>& /*label*/, const String& /*avatarPath*/) {lastMessageBody_ = message;};
virtual void addSystemMessage(const String& /*message*/) {};
virtual void addErrorMessage(const String& /*message*/) {};