5 files changed, 63 insertions, 3 deletions
diff --git a/Swiften/Avatars/AvatarManager.cpp b/Swiften/Avatars/AvatarManager.cpp
index 599d1d4..7abbb8b 100644
--- a/Swiften/Avatars/AvatarManager.cpp
+++ b/Swiften/Avatars/AvatarManager.cpp
@@ -1,66 +1,77 @@
 #include "Swiften/Avatars/AvatarManager.h"
 
 #include <boost/bind.hpp>
 
 #include "Swiften/Client/StanzaChannel.h"
 #include "Swiften/Elements/VCardUpdate.h"
 #include "Swiften/Queries/Requests/GetVCardRequest.h"
 #include "Swiften/StringCodecs/SHA1.h"
 #include "Swiften/StringCodecs/Hexify.h"
 #include "Swiften/Avatars/AvatarStorage.h"
 #include "Swiften/MUC/MUCRegistry.h"
 
 namespace Swift {
 
 AvatarManager::AvatarManager(StanzaChannel* stanzaChannel, IQRouter* iqRouter, AvatarStorage* avatarStorage, MUCRegistry* mucRegistry) : stanzaChannel_(stanzaChannel), iqRouter_(iqRouter), avatarStorage_(avatarStorage), mucRegistry_(mucRegistry) {
 	stanzaChannel->onPresenceReceived.connect(boost::bind(&AvatarManager::handlePresenceReceived, this, _1));
 }
 
+AvatarManager::AvatarManager() {
+	stanzaChannel_ = NULL;
+	iqRouter_ = NULL;
+	avatarStorage_ = NULL;
+	mucRegistry_ = NULL;
+}
+
+AvatarManager::~AvatarManager() {
+
+}
+
 void AvatarManager::handlePresenceReceived(boost::shared_ptr<Presence> presence) {
 	boost::shared_ptr<VCardUpdate> update = presence->getPayload<VCardUpdate>();
 	if (!update) {
 		return;
 	}
 	JID from = getAvatarJID(presence->getFrom());
 	String& hash = avatarHashes_[from];
 	if (hash != update->getPhotoHash()) {
 		String newHash = update->getPhotoHash();
 		if (avatarStorage_->hasAvatar(newHash)) {
 			setAvatarHash(from, newHash);
 		}
 		else {
 			boost::shared_ptr<GetVCardRequest> request(new GetVCardRequest(from, iqRouter_));
 			request->onResponse.connect(boost::bind(&AvatarManager::handleVCardReceived, this, from, newHash, _1, _2));
 			request->send();
 		}
 	}
 }
 
 void AvatarManager::handleVCardReceived(const JID& from, const String& promisedHash, boost::shared_ptr<VCard> vCard, const boost::optional<ErrorPayload>& error) {
 	if (error) {
 		// FIXME: What to do here?
 		std::cerr << "Warning: " << from << ": Could not get vCard" << std::endl;
 		return;
 	}
 	String realHash = Hexify::hexify(SHA1::getHash(vCard->getPhoto()));
 	if (promisedHash != realHash) {
 		std::cerr << "Warning: " << from << ": Got different vCard photo hash (" << promisedHash << " != " << realHash << ")" << std::endl;
 	}
 	avatarStorage_->addAvatar(realHash, vCard->getPhoto());
 	setAvatarHash(from, realHash);
 }
 
 void AvatarManager::setAvatar(const JID& jid, const ByteArray& avatar) {
 	String hash = Hexify::hexify(SHA1::getHash(avatar));
 	avatarStorage_->addAvatar(hash, avatar);
 	setAvatarHash(getAvatarJID(jid), hash);
 }
 
 void AvatarManager::setAvatarHash(const JID& from, const String& hash) {
 	avatarHashes_[from] = hash;
 	onAvatarChanged(from, hash);
 }
 
 String AvatarManager::getAvatarHash(const JID& jid) const {
 	std::map<JID, String>::const_iterator i = avatarHashes_.find(getAvatarJID(jid));
 	if (i != avatarHashes_.end()) {
diff --git a/Swiften/Avatars/AvatarManager.h b/Swiften/Avatars/AvatarManager.h
index 65ec372..448526e 100644
--- a/Swiften/Avatars/AvatarManager.h
+++ b/Swiften/Avatars/AvatarManager.h
@@ -1,44 +1,49 @@
 #pragma once
 
 #include <boost/filesystem.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/signal.hpp>
 #include <map>
 
 #include "Swiften/JID/JID.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/Elements/VCard.h"
 #include "Swiften/Elements/ErrorPayload.h"
 
 namespace Swift {
 	class MUCRegistry;
 	class AvatarStorage;
 	class StanzaChannel;
 	class IQRouter;
 
 	class AvatarManager {
 		public:
 			AvatarManager(StanzaChannel*, IQRouter*, AvatarStorage*, MUCRegistry*);
+			virtual ~AvatarManager();
 
-			String getAvatarHash(const JID&) const;
-			boost::filesystem::path getAvatarPath(const JID&) const;
-			void setAvatar(const JID&, const ByteArray& avatar);
+			virtual String getAvatarHash(const JID&) const;
+			virtual boost::filesystem::path getAvatarPath(const JID&) const;
+			virtual void setAvatar(const JID&, const ByteArray& avatar);
 
 		public:
 			boost::signal<void (const JID&, const String&)> onAvatarChanged;
 
+		protected:
+			/** Used only for testing. Leads to a non-functional object. */
+			AvatarManager();
+
 		private:
 			void handlePresenceReceived(boost::shared_ptr<Presence>);
 			void handleVCardReceived(const JID& from, const String& hash, boost::shared_ptr<VCard>, const boost::optional<ErrorPayload>&);
 			void setAvatarHash(const JID& from, const String& hash);
 			JID getAvatarJID(const JID& o) const;
 
 		private:
 			StanzaChannel* stanzaChannel_;
 			IQRouter* iqRouter_;
 			AvatarStorage* avatarStorage_;
 			MUCRegistry* mucRegistry_;
 			std::map<JID, String> avatarHashes_;
 	};
 }
diff --git a/Swiften/Avatars/UnitTest/MockAvatarManager.cpp b/Swiften/Avatars/UnitTest/MockAvatarManager.cpp
new file mode 100644
index 0000000..2d3d48a
--- /dev/null
+++ b/Swiften/Avatars/UnitTest/MockAvatarManager.cpp
@@ -0,0 +1,26 @@
+#include "Swiften/Avatars/UnitTest/MockAvatarManager.h"
+
+namespace Swift {
+
+MockAvatarManager::MockAvatarManager() {
+
+}
+
+MockAvatarManager::~MockAvatarManager() {
+
+}
+
+String MockAvatarManager::getAvatarHash(const JID& jid) const {
+	return jid.toBare();
+}
+
+boost::filesystem::path MockAvatarManager::getAvatarPath(const JID& jid) const {
+	return jid.getResource().getUTF8String();
+}
+
+void MockAvatarManager::setAvatar(const JID&, const ByteArray&) {
+
+}
+
+}
+
diff --git a/Swiften/Avatars/UnitTest/MockAvatarManager.h b/Swiften/Avatars/UnitTest/MockAvatarManager.h
new file mode 100644
index 0000000..416d921
--- /dev/null
+++ b/Swiften/Avatars/UnitTest/MockAvatarManager.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include "Swiften/Avatars/AvatarManager.h"
+#include "Swiften/Client/DummyStanzaChannel.h"
+
+namespace Swift {
+	class MockAvatarManager : public AvatarManager {
+		public:
+			MockAvatarManager();
+			virtual ~MockAvatarManager();
+			virtual String getAvatarHash(const JID&) const;
+			virtual boost::filesystem::path getAvatarPath(const JID&) const;
+			virtual void setAvatar(const JID&, const ByteArray& avatar);
+		private:
+			DummyStanzaChannel channel_;
+	};
+}
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 0009125..cdae324 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -68,96 +68,97 @@ sources = [
 		"Serializer/PayloadSerializers/PrivateStorageSerializer.cpp",
 		"Serializer/PresenceSerializer.cpp",
 		"Serializer/StanzaSerializer.cpp",
 		"Serializer/StreamFeaturesSerializer.cpp",
 		"Serializer/XML/XMLElement.cpp",
 		"Serializer/XML/XMLNode.cpp",
 		"Serializer/XMPPSerializer.cpp",
 		"Server/ServerFromClientSession.cpp",
 		"Server/ServerSession.cpp",
 		"Server/ServerStanzaRouter.cpp",
 		"Server/SimpleUserRegistry.cpp",
 		"Server/UserRegistry.cpp",
 		"Session/Session.cpp",
 		"Session/SessionStream.cpp",
 		"Session/BasicSessionStream.cpp",
 		"StringCodecs/Base64.cpp",
 		"StringCodecs/SHA1.cpp",
 		"StringCodecs/HMACSHA1.cpp",
 		"StringCodecs/MD5.cpp",
 		"StringCodecs/PBKDF2.cpp",
 		"StringCodecs/Hexify.cpp",
 	]
 # "Notifier/GrowlNotifier.cpp",
 
 if myenv.get("HAVE_OPENSSL", 0) :
 	sources += ["TLS/OpenSSL/OpenSSLContext.cpp"]
 
 SConscript(dirs = [
 		"Base",
 		"StringPrep",
 		"SASL",
 		"Application",
 		"EventLoop",
 		"Parser",
 		"JID",
 		"Network",
 		"History",
 		"StreamStack",
 		"LinkLocal",
 	])
 SConscript(test_only = True, dirs = [
 		"QA",
   ])
 
 myenv.StaticLibrary("Swiften", sources + swiften_env["SWIFTEN_OBJECTS"])
 
 env.Append(UNITTEST_SOURCES = [
 		File("Application/UnitTest/ApplicationTest.cpp"),
+		File("Avatars/UnitTest/MockAvatarManager.cpp"),
 		File("Base/UnitTest/IDGeneratorTest.cpp"),
 		File("Base/UnitTest/StringTest.cpp"),
 		File("Base/UnitTest/ByteArrayTest.cpp"),
 		File("Client/UnitTest/ClientSessionTest.cpp"),
 		File("Compress/UnitTest/ZLibCompressorTest.cpp"),
 		File("Compress/UnitTest/ZLibDecompressorTest.cpp"),
 		File("Disco/UnitTest/CapsInfoGeneratorTest.cpp"),
 		File("Elements/UnitTest/IQTest.cpp"),
 		File("Elements/UnitTest/StanzaTest.cpp"),
 		File("Elements/UnitTest/StanzasTest.cpp"),
 		File("EventLoop/UnitTest/EventLoopTest.cpp"),
 		File("EventLoop/UnitTest/SimpleEventLoopTest.cpp"),
 		File("History/UnitTest/SQLiteHistoryManagerTest.cpp"),
 		File("JID/UnitTest/JIDTest.cpp"),
 		File("LinkLocal/UnitTest/LinkLocalConnectorTest.cpp"),
 		File("LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp"),
 		File("LinkLocal/UnitTest/LinkLocalServiceInfoTest.cpp"),
 		File("LinkLocal/UnitTest/LinkLocalServiceTest.cpp"),
 		File("Network/UnitTest/HostAddressTest.cpp"),
 		File("Network/UnitTest/ConnectorTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/BodyParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/DiscoInfoParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/PriorityParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/RawXMLPayloadParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/ResourceBindParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/RosterParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/SecurityLabelParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/SecurityLabelsCatalogParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/SoftwareVersionParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/StatusParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/StatusShowParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/VCardParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/StorageParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/PrivateStorageParserTest.cpp"),
 		File("Parser/PayloadParsers/UnitTest/VCardUpdateParserTest.cpp"),
 		File("Parser/UnitTest/AttributeMapTest.cpp"),
 		File("Parser/UnitTest/IQParserTest.cpp"),
 		File("Parser/UnitTest/MessageParserTest.cpp"),
 		File("Parser/UnitTest/PayloadParserFactoryCollectionTest.cpp"),
 		File("Parser/UnitTest/PresenceParserTest.cpp"),
 		File("Parser/UnitTest/SerializingParserTest.cpp"),
 		File("Parser/UnitTest/StanzaParserTest.cpp"),
 		File("Parser/UnitTest/StreamFeaturesParserTest.cpp"),
 		File("Parser/UnitTest/XMLParserTest.cpp"),
 		File("Parser/UnitTest/XMPPParserTest.cpp"),
 		File("Presence/UnitTest/PresenceOracleTest.cpp"),
 		File("Presence/UnitTest/PresenceSenderTest.cpp"),