diff 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 /Swift/Controllers/UnitTest | |
parent | 0c377fa93ffd8538da9e71ddc71d4e8c07600a22 (diff) | |
download | swift-2e86507010e1f8754049a3bb37ce9041bb19d870.zip swift-2e86507010e1f8754049a3bb37ce9041bb19d870.tar.bz2 |
Fixing up the unit tests again. Oops.
Diffstat (limited to 'Swift/Controllers/UnitTest')
-rw-r--r-- | Swift/Controllers/UnitTest/NickResolverTest.cpp | 10 | ||||
-rw-r--r-- | Swift/Controllers/UnitTest/RosterControllerTest.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Swift/Controllers/UnitTest/NickResolverTest.cpp b/Swift/Controllers/UnitTest/NickResolverTest.cpp index e3123f9..6f509c0 100644 --- a/Swift/Controllers/UnitTest/NickResolverTest.cpp +++ b/Swift/Controllers/UnitTest/NickResolverTest.cpp @@ -33,7 +33,7 @@ class NickResolverTest : public CppUnit::TestFixture boost::shared_ptr<XMPPRoster> xmppRoster(new XMPPRoster()); NickResolver resolver(xmppRoster); JID testJID("foo@bar/baz"); - xmppRoster->addContact(testJID, "", groups_); + xmppRoster->addContact(testJID, "", groups_, RosterItemPayload::Both); CPPUNIT_ASSERT_EQUAL(String("foo@bar"), resolver.jidToNick(testJID)); } @@ -41,7 +41,7 @@ class NickResolverTest : public CppUnit::TestFixture boost::shared_ptr<XMPPRoster> xmppRoster(new XMPPRoster()); NickResolver resolver(xmppRoster); JID testJID("foo@bar/baz"); - xmppRoster->addContact(testJID, "Test", groups_); + xmppRoster->addContact(testJID, "Test", groups_, RosterItemPayload::Both); CPPUNIT_ASSERT_EQUAL(String("Test"), resolver.jidToNick(testJID)); } @@ -50,8 +50,8 @@ class NickResolverTest : public CppUnit::TestFixture boost::shared_ptr<XMPPRoster> xmppRoster(new XMPPRoster()); NickResolver resolver(xmppRoster); JID testJID("foo@bar/baz"); - xmppRoster->addContact(testJID, "FailTest", groups_); - xmppRoster->addContact(testJID, "Test", groups_); + xmppRoster->addContact(testJID, "FailTest", groups_, RosterItemPayload::Both); + xmppRoster->addContact(testJID, "Test", groups_, RosterItemPayload::Both); CPPUNIT_ASSERT_EQUAL(String("Test"), resolver.jidToNick(testJID)); } @@ -60,7 +60,7 @@ class NickResolverTest : public CppUnit::TestFixture boost::shared_ptr<XMPPRoster> xmppRoster(new XMPPRoster()); NickResolver resolver(xmppRoster); JID testJID("foo@bar/baz"); - xmppRoster->addContact(testJID, "FailTest", groups_); + xmppRoster->addContact(testJID, "FailTest", groups_, RosterItemPayload::Both); xmppRoster->removeContact(testJID); CPPUNIT_ASSERT_EQUAL(String("foo@bar"), resolver.jidToNick(testJID)); } diff --git a/Swift/Controllers/UnitTest/RosterControllerTest.cpp b/Swift/Controllers/UnitTest/RosterControllerTest.cpp index bfd98ac..80b2284 100644 --- a/Swift/Controllers/UnitTest/RosterControllerTest.cpp +++ b/Swift/Controllers/UnitTest/RosterControllerTest.cpp @@ -64,7 +64,7 @@ class RosterControllerTest : public CppUnit::TestFixture std::vector<String> groups; groups.push_back("testGroup1"); groups.push_back("testGroup2"); - xmppRoster_->addContact(JID("test@testdomain.com/bob"), "name", groups); + xmppRoster_->addContact(JID("test@testdomain.com/bob"), "name", groups, RosterItemPayload::Both); CPPUNIT_ASSERT_EQUAL(2, (int)treeWidgetFactory_->getGroups().size()); //CPPUNIT_ASSERT_EQUAL(String("Bob"), xmppRoster_->getNameForJID(JID("foo@bar.com"))); |