Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-03-22 21:51:36 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-03-22 21:51:36 (GMT) |
| commit | 2e86507010e1f8754049a3bb37ce9041bb19d870 (patch) | |
| tree | ecd3b8ed0b33c12bf123f4042af41fbc2d245e4b /Swiften/Roster | |
| parent | 0c377fa93ffd8538da9e71ddc71d4e8c07600a22 (diff) | |
| download | swift-contrib-2e86507010e1f8754049a3bb37ce9041bb19d870.zip swift-contrib-2e86507010e1f8754049a3bb37ce9041bb19d870.tar.bz2 | |
Fixing up the unit tests again. Oops.
Diffstat (limited to 'Swiften/Roster')
| -rw-r--r-- | Swiften/Roster/UnitTest/XMPPRosterTest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Swiften/Roster/UnitTest/XMPPRosterTest.cpp b/Swiften/Roster/UnitTest/XMPPRosterTest.cpp index 96de30c..d03953e 100644 --- a/Swiften/Roster/UnitTest/XMPPRosterTest.cpp +++ b/Swiften/Roster/UnitTest/XMPPRosterTest.cpp @@ -102,13 +102,13 @@ class XMPPRosterTest : public CppUnit::TestFixture } void testJIDAdded() { - roster_->addContact(jid1_, "NewName", groups1_); + roster_->addContact(jid1_, "NewName", groups1_, RosterItemPayload::Both); CPPUNIT_ASSERT_EQUAL(Add, handler_->getLastEvent()); CPPUNIT_ASSERT_EQUAL(jid1_, handler_->getLastJID()); CPPUNIT_ASSERT_EQUAL(String("NewName"), roster_->getNameForJID(jid1_)); CPPUNIT_ASSERT(groups1_ == roster_->getGroupsForJID(jid1_)); handler_->reset(); - roster_->addContact(jid2_, "NameTwo", groups1_); + roster_->addContact(jid2_, "NameTwo", groups1_, RosterItemPayload::Both); CPPUNIT_ASSERT_EQUAL(Add, handler_->getLastEvent()); CPPUNIT_ASSERT_EQUAL(jid2_, handler_->getLastJID()); CPPUNIT_ASSERT_EQUAL(String("NameTwo"), roster_->getNameForJID(jid2_)); @@ -116,7 +116,7 @@ class XMPPRosterTest : public CppUnit::TestFixture CPPUNIT_ASSERT(groups1_ == roster_->getGroupsForJID(jid2_)); CPPUNIT_ASSERT(groups1_ == roster_->getGroupsForJID(jid1_)); handler_->reset(); - roster_->addContact(jid3_, "NewName", groups2_); + roster_->addContact(jid3_, "NewName", groups2_, RosterItemPayload::Both); CPPUNIT_ASSERT_EQUAL(Add, handler_->getLastEvent()); CPPUNIT_ASSERT_EQUAL(jid3_, handler_->getLastJID()); CPPUNIT_ASSERT_EQUAL(String("NewName"), roster_->getNameForJID(jid3_)); @@ -124,17 +124,17 @@ class XMPPRosterTest : public CppUnit::TestFixture } void testJIDRemoved() { - roster_->addContact(jid1_, "NewName", groups1_); + roster_->addContact(jid1_, "NewName", groups1_, RosterItemPayload::Both); handler_->reset(); roster_->removeContact(jid1_); CPPUNIT_ASSERT_EQUAL(Remove, handler_->getLastEvent()); CPPUNIT_ASSERT_EQUAL(jid1_, handler_->getLastJID()); handler_->reset(); - roster_->addContact(jid1_, "NewName2", groups1_); + roster_->addContact(jid1_, "NewName2", groups1_, RosterItemPayload::Both); CPPUNIT_ASSERT_EQUAL(Add, handler_->getLastEvent()); CPPUNIT_ASSERT_EQUAL(jid1_, handler_->getLastJID()); CPPUNIT_ASSERT_EQUAL(String("NewName2"), roster_->getNameForJID(jid1_)); - roster_->addContact(jid2_, "NewName3", groups1_); + roster_->addContact(jid2_, "NewName3", groups1_, RosterItemPayload::Both); handler_->reset(); roster_->removeContact(jid2_); CPPUNIT_ASSERT_EQUAL(Remove, handler_->getLastEvent()); @@ -146,13 +146,13 @@ class XMPPRosterTest : public CppUnit::TestFixture } void testJIDUpdated() { - roster_->addContact(jid1_, "NewName", groups1_); + roster_->addContact(jid1_, "NewName", groups1_, RosterItemPayload::Both); CPPUNIT_ASSERT_EQUAL(Add, handler_->getLastEvent()); CPPUNIT_ASSERT_EQUAL(jid1_, handler_->getLastJID()); CPPUNIT_ASSERT_EQUAL(String("NewName"), roster_->getNameForJID(jid1_)); CPPUNIT_ASSERT(groups1_ == roster_->getGroupsForJID(jid1_)); handler_->reset(); - roster_->addContact(jid1_, "NameTwo", groups2_); + roster_->addContact(jid1_, "NameTwo", groups2_, RosterItemPayload::Both); CPPUNIT_ASSERT_EQUAL(Update, handler_->getLastEvent()); CPPUNIT_ASSERT_EQUAL(jid1_, handler_->getLastJID()); CPPUNIT_ASSERT_EQUAL(String("NameTwo"), roster_->getNameForJID(jid1_)); |