Swift
summaryrefslogtreecommitdiffstats
path: root/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp')
-rw-r--r--Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp37
1 files changed, 14 insertions, 23 deletions
diff --git a/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp b/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp
index e3d9c58..ce100ee 100644
--- a/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp
+++ b/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp
@@ -25,26 +25,18 @@ class VCardUpdateAvatarManagerTest : public CppUnit::TestFixture {
25 CPPUNIT_TEST_SUITE(VCardUpdateAvatarManagerTest); 25 CPPUNIT_TEST_SUITE(VCardUpdateAvatarManagerTest);
26 CPPUNIT_TEST(testUpdate_NewHashNewVCardRequestsVCard); 26 CPPUNIT_TEST(testUpdate_NewHashNewVCardRequestsVCard);
27 CPPUNIT_TEST(testUpdate_NewHashStoresAvatarAndEmitsNotificationOnVCardReceive); 27 CPPUNIT_TEST(testUpdate_NewHashStoresAvatarAndEmitsNotificationOnVCardReceive);
28 CPPUNIT_TEST(testUpdate_KnownHash); 28 CPPUNIT_TEST(testUpdate_KnownHash);
29 CPPUNIT_TEST(testUpdate_KnownHashFromDifferentUserDoesNotRequestVCardButTriggersNotification); 29 CPPUNIT_TEST(testUpdate_KnownHashFromDifferentUserDoesNotRequestVCardButTriggersNotification);
30 /*& 30 CPPUNIT_TEST(testStanzaChannelReset);
31 CPPUNIT_TEST(testUpdate_UpdateNewHashAlreadyHaveAvatar);
32 CPPUNIT_TEST(testUpdate_UpdateNewHashFromMUC);
33 CPPUNIT_TEST(testUpdate_UpdateSameHash);*/
34 //CPPUNIT_TEST(testUpdate_UpdateWithError);
35 /*
36 CPPUNIT_TEST(testUpdate_UpdateNewHashSameThanOtherUser);
37 CPPUNIT_TEST(testReceiveVCard);
38 CPPUNIT_TEST(testGetAvatarPath);
39 CPPUNIT_TEST(testGetAvatarPathFromMUC);*/
40 CPPUNIT_TEST_SUITE_END(); 31 CPPUNIT_TEST_SUITE_END();
41 32
42 public: 33 public:
43 void setUp() { 34 void setUp() {
44 ownJID = JID("foo@fum.com/bum"); 35 ownJID = JID("foo@fum.com/bum");
45 stanzaChannel = new DummyStanzaChannel(); 36 stanzaChannel = new DummyStanzaChannel();
37 stanzaChannel->setAvailable(true);
46 iqRouter = new IQRouter(stanzaChannel); 38 iqRouter = new IQRouter(stanzaChannel);
47 mucRegistry = new DummyMUCRegistry(); 39 mucRegistry = new DummyMUCRegistry();
48 avatarStorage = new AvatarMemoryStorage(); 40 avatarStorage = new AvatarMemoryStorage();
49 vcardStorage = new VCardMemoryStorage(); 41 vcardStorage = new VCardMemoryStorage();
50 vcardManager = new VCardManager(ownJID, iqRouter, vcardStorage); 42 vcardManager = new VCardManager(ownJID, iqRouter, vcardStorage);
@@ -109,26 +101,25 @@ class VCardUpdateAvatarManagerTest : public CppUnit::TestFixture {
109 CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(changes.size())); 101 CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(changes.size()));
110 CPPUNIT_ASSERT_EQUAL(user2.toBare(), changes[0].first); 102 CPPUNIT_ASSERT_EQUAL(user2.toBare(), changes[0].first);
111 CPPUNIT_ASSERT_EQUAL(avatar1Hash, changes[0].second); 103 CPPUNIT_ASSERT_EQUAL(avatar1Hash, changes[0].second);
112 } 104 }
113 105
114/* 106 void testStanzaChannelReset() {
115 void testUpdate_UpdateNewHashFromMUC() {
116 std::auto_ptr<VCardUpdateAvatarManager> testling = createManager(); 107 std::auto_ptr<VCardUpdateAvatarManager> testling = createManager();
117 } 108 stanzaChannel->onPresenceReceived(createPresenceWithPhotoHash(user1, avatar1Hash));
118 109 stanzaChannel->onIQReceived(createVCardResult(avatar1));
119 */ 110 changes.clear();
120 111 stanzaChannel->sentStanzas.clear();
121 /*void testUpdate_UpdateWithError() {
122 std::auto_ptr<VCardUpdateAvatarManager> testling = createManager();
123 boost::shared_ptr<Presence> update = createPresenceWithPhotoHash();
124 update->addPayload(boost::shared_ptr<ErrorPayload>(new ErrorPayload()));
125 stanzaChannel_->onPresenceReceived(update);
126 112
127 CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(stanzaChannel_->sentStanzas.size())); 113 stanzaChannel->setAvailable(false);
128 }*/ 114 stanzaChannel->setAvailable(true);
115 stanzaChannel->onPresenceReceived(createPresenceWithPhotoHash(user1, avatar1Hash));
129 116
117 CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(changes.size()));
118 CPPUNIT_ASSERT_EQUAL(user1.toBare(), changes[0].first);
119 CPPUNIT_ASSERT_EQUAL(avatar1Hash, changes[0].second);
120 }
130 121
131 private: 122 private:
132 std::auto_ptr<VCardUpdateAvatarManager> createManager() { 123 std::auto_ptr<VCardUpdateAvatarManager> createManager() {
133 std::auto_ptr<VCardUpdateAvatarManager> result(new VCardUpdateAvatarManager(vcardManager, stanzaChannel, avatarStorage, mucRegistry)); 124 std::auto_ptr<VCardUpdateAvatarManager> result(new VCardUpdateAvatarManager(vcardManager, stanzaChannel, avatarStorage, mucRegistry));
134 result->onAvatarChanged.connect(boost::bind(&VCardUpdateAvatarManagerTest::handleAvatarChanged, this, _1, _2)); 125 result->onAvatarChanged.connect(boost::bind(&VCardUpdateAvatarManagerTest::handleAvatarChanged, this, _1, _2));