1 files changed, 13 insertions, 1 deletions
diff --git a/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp b/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp
index ce100ee..5a98a0e 100644
--- a/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp
+++ b/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp
@@ -25,10 +25,11 @@ class VCardUpdateAvatarManagerTest : public CppUnit::TestFixture {
                CPPUNIT_TEST_SUITE(VCardUpdateAvatarManagerTest);
                CPPUNIT_TEST(testUpdate_NewHashNewVCardRequestsVCard);
                CPPUNIT_TEST(testUpdate_NewHashStoresAvatarAndEmitsNotificationOnVCardReceive);
                CPPUNIT_TEST(testUpdate_KnownHash);
                CPPUNIT_TEST(testUpdate_KnownHashFromDifferentUserDoesNotRequestVCardButTriggersNotification);
+                CPPUNIT_TEST(testVCardWithEmptyPhoto);
                CPPUNIT_TEST(testStanzaChannelReset);
                CPPUNIT_TEST_SUITE_END();
        public:
                void setUp() {
@@ -101,10 +102,19 @@ class VCardUpdateAvatarManagerTest : public CppUnit::TestFixture {
                        CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(changes.size()));
                        CPPUNIT_ASSERT_EQUAL(user2.toBare(), changes[0].first);
                        CPPUNIT_ASSERT_EQUAL(avatar1Hash, changes[0].second);
                }
+                void testVCardWithEmptyPhoto() {
+                        std::auto_ptr<VCardUpdateAvatarManager> testling = createManager();
+                        vcardManager->requestVCard(JID("foo@bar.com"));
+                        stanzaChannel->onIQReceived(createVCardResult(ByteArray()));
+                        
+                        CPPUNIT_ASSERT(!avatarStorage->hasAvatar(Hexify::hexify(SHA1::getHash(ByteArray()))));
+                        CPPUNIT_ASSERT_EQUAL(boost::filesystem::path(), testling->getAvatarPath(JID("foo@bar.com")));
+                }
                void testStanzaChannelReset() {
                        std::auto_ptr<VCardUpdateAvatarManager> testling = createManager();
                        stanzaChannel->onPresenceReceived(createPresenceWithPhotoHash(user1, avatar1Hash));
                        stanzaChannel->onIQReceived(createVCardResult(avatar1));
                        changes.clear();
@@ -133,11 +143,13 @@ class VCardUpdateAvatarManagerTest : public CppUnit::TestFixture {
                        return presence;
                }
                IQ::ref createVCardResult(const ByteArray& avatar) {
                        VCard::ref vcard(new VCard());
-                        vcard->setPhoto(avatar);
+                        if (!avatar.isEmpty()) {
+                                vcard->setPhoto(avatar);
+                        }
                        return IQ::createResult(JID("baz@fum.com"), stanzaChannel->sentStanzas[0]->getID(), vcard);
                }
                void handleAvatarChanged(const JID& jid, const String& hash) {
                        changes.push_back(std::pair<JID,String>(jid, hash));