Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2010-06-04 22:09:21 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2010-06-04 22:42:02 (GMT) |
| commit | 7bca08eb2829982865f1649483f9aa01b3413b1c (patch) | |
| tree | 630b333f0dd9b05478816eae27c6695b1a6bbe35 /Swiften/Roster/UnitTest | |
| parent | b3208697addc0492f4ae1f76c75a8810c20e701a (diff) | |
| download | swift-7bca08eb2829982865f1649483f9aa01b3413b1c.zip swift-7bca08eb2829982865f1649483f9aa01b3413b1c.tar.bz2 | |
Starting towards tooltips for the colour-blind.
Putting status show names along with the text in tooltips.
Covers the MeView and roster entries.
Still ToDo: status setter
Resolves: #429
Diffstat (limited to 'Swiften/Roster/UnitTest')
| -rw-r--r-- | Swiften/Roster/UnitTest/RosterTest.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Swiften/Roster/UnitTest/RosterTest.cpp b/Swiften/Roster/UnitTest/RosterTest.cpp index d170396..13a4ab0 100644 --- a/Swiften/Roster/UnitTest/RosterTest.cpp +++ b/Swiften/Roster/UnitTest/RosterTest.cpp @@ -43,9 +43,9 @@ class RosterTest : public CppUnit::TestFixture } void testGetGroup() { - roster_->addContact(jid1_, "Bert", "group1"); - roster_->addContact(jid2_, "Ernie", "group2"); - roster_->addContact(jid3_, "Cookie", "group1"); + roster_->addContact(jid1_, JID(), "Bert", "group1"); + roster_->addContact(jid2_, JID(), "Ernie", "group2"); + roster_->addContact(jid3_, JID(), "Cookie", "group1"); CPPUNIT_ASSERT_EQUAL(2, (int)roster_->getRoot()->getChildren().size()); CPPUNIT_ASSERT_EQUAL(String("group1"), roster_->getRoot()->getChildren()[0]->getDisplayName()); @@ -57,7 +57,7 @@ class RosterTest : public CppUnit::TestFixture } void testRemoveContact() { - roster_->addContact(jid1_, "Bert", "group1"); + roster_->addContact(jid1_, jid1_, "Bert", "group1"); CPPUNIT_ASSERT_EQUAL(String("Bert"), ((GroupRosterItem*)roster_->getRoot()->getChildren()[0])->getChildren()[0]->getDisplayName()); roster_->removeContact(jid1_); @@ -65,8 +65,8 @@ class RosterTest : public CppUnit::TestFixture } void testRemoveSecondContact() { - roster_->addContact(jid1_, "Bert", "group1"); - roster_->addContact(jid2_, "Cookie", "group1"); + roster_->addContact(jid1_, jid1_, "Bert", "group1"); + roster_->addContact(jid2_, jid2_, "Cookie", "group1"); CPPUNIT_ASSERT_EQUAL(String("Cookie"), ((GroupRosterItem*)roster_->getRoot()->getChildren()[0])->getChildren()[1]->getDisplayName()); roster_->removeContact(jid2_); @@ -77,8 +77,8 @@ class RosterTest : public CppUnit::TestFixture void testRemoveSecondContactSameBare() { JID jid4a("a@b/c"); JID jid4b("a@b/d"); - roster_->addContact(jid4a, "Bert", "group1"); - roster_->addContact(jid4b, "Cookie", "group1"); + roster_->addContact(jid4a, JID(), "Bert", "group1"); + roster_->addContact(jid4b, JID(), "Cookie", "group1"); CPPUNIT_ASSERT_EQUAL(String("Cookie"), ((GroupRosterItem*)roster_->getRoot()->getChildren()[0])->getChildren()[1]->getDisplayName()); roster_->removeContact(jid4b); @@ -90,11 +90,11 @@ class RosterTest : public CppUnit::TestFixture JID jid4a("a@b/c"); JID jid4b("a@b/d"); JID jid4c("a@b/e"); - roster_->addContact(jid4a, "Bird", "group1"); - roster_->addContact(jid4b, "Cookie", "group1"); + roster_->addContact(jid4a, JID(), "Bird", "group1"); + roster_->addContact(jid4b, JID(), "Cookie", "group1"); roster_->removeContact(jid4b); - roster_->addContact(jid4c, "Bert", "group1"); - roster_->addContact(jid4b, "Ernie", "group1"); + roster_->addContact(jid4c, JID(), "Bert", "group1"); + roster_->addContact(jid4b, JID(), "Ernie", "group1"); boost::shared_ptr<Presence> presence(new Presence()); presence->setShow(StatusShow::DND); presence->setFrom(jid4a); |