1 files changed, 15 insertions, 24 deletions
diff --git a/Swiften/Roster/UnitTest/XMPPRosterSignalHandler.h b/Swiften/Roster/UnitTest/XMPPRosterSignalHandler.h
index 1bbd8e9..2cf1159 100644
--- a/Swiften/Roster/UnitTest/XMPPRosterSignalHandler.h
+++ b/Swiften/Roster/UnitTest/XMPPRosterSignalHandler.h
@@ -3,34 +3,25 @@
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
+
 #pragma once
-#include <boost/shared_ptr.hpp>
-#include <boost/bind.hpp>
 
+#include <boost/shared_ptr.hpp>
 #include <vector>
 
-
 #include "Swiften/Roster/XMPPRosterImpl.h"
 
-using namespace Swift;
-
-
 enum XMPPRosterEvents {None, Add, Remove, Update};
 
 class XMPPRosterSignalHandler {
 public:
-	XMPPRosterSignalHandler(XMPPRoster* roster) {
-		lastEvent_ = None;
-		roster->onJIDAdded.connect(boost::bind(&XMPPRosterSignalHandler::handleJIDAdded, this, _1));
-		roster->onJIDRemoved.connect(boost::bind(&XMPPRosterSignalHandler::handleJIDRemoved, this, _1));
-		roster->onJIDUpdated.connect(boost::bind(&XMPPRosterSignalHandler::handleJIDUpdated, this, _1, _2, _3));
-	}
+	XMPPRosterSignalHandler(Swift::XMPPRoster* roster);
 
 	XMPPRosterEvents getLastEvent() {
 		return lastEvent_;
 	}
 
-	JID getLastJID() {
+	Swift::JID getLastJID() {
 		return lastJID_;
 	}
 
@@ -46,28 +37,28 @@ public:
 		lastEvent_ = None;
 	}
 
+	int getEventCount() const {
+		return eventCount;
+	}
+
 private:
-	void handleJIDAdded(const JID& jid) {
+	void handleJIDAdded(const Swift::JID& jid) {
 		lastJID_ = jid;
 		lastEvent_ = Add;
+		eventCount++;
 	}
 
-	void handleJIDRemoved(const JID& jid) {
+	void handleJIDRemoved(const Swift::JID& jid) {
 		lastJID_ = jid;
 		lastEvent_ = Remove;
+		eventCount++;
 	}
 
-	void handleJIDUpdated(const JID& jid, const std::string& oldName, const std::vector<std::string>& oldGroups) {
-		CPPUNIT_ASSERT_EQUAL(None, lastEvent_);
-		lastJID_ = jid;
-		lastOldName_ = oldName;
-		lastOldGroups_ = oldGroups;
-		lastEvent_ = Update;
-	}
+	void handleJIDUpdated(const Swift::JID& jid, const std::string& oldName, const std::vector<std::string>& oldGroups);
 
 	XMPPRosterEvents lastEvent_;
-	JID lastJID_;
+	Swift::JID lastJID_;
 	std::string lastOldName_;
 	std::vector<std::string> lastOldGroups_;
-
+	int eventCount;
 };