Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-10-24 12:10:44 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-10-24 12:15:24 (GMT) |
| commit | b107bdd08df9ae3a978ad8f966a26eb8d551bd13 (patch) | |
| tree | ad1c4d6550f323a19dffd699c98513aa68acddaf /Swiften/Roster/UnitTest | |
| parent | cfa314bd0b6f6ed9285c7167948899184f6a8c12 (diff) | |
| download | swift-contrib-b107bdd08df9ae3a978ad8f966a26eb8d551bd13.zip swift-contrib-b107bdd08df9ae3a978ad8f966a26eb8d551bd13.tar.bz2 | |
Creating abstract XMPPRoster base class.
Diffstat (limited to 'Swiften/Roster/UnitTest')
| -rw-r--r-- | Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp | 6 | ||||
| -rw-r--r-- | Swiften/Roster/UnitTest/XMPPRosterImplTest.cpp (renamed from Swiften/Roster/UnitTest/XMPPRosterTest.cpp) | 15 |
2 files changed, 10 insertions, 11 deletions
diff --git a/Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp b/Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp index 33fc04a..17c5527 100644 --- a/Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp +++ b/Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp @@ -13,7 +13,7 @@ #include "Swiften/Elements/RosterPayload.h" #include "Swiften/Queries/DummyIQChannel.h" #include "Swiften/Queries/IQRouter.h" -#include "Swiften/Roster/XMPPRoster.h" +#include "Swiften/Roster/XMPPRosterImpl.h" using namespace Swift; @@ -31,7 +31,7 @@ class XMPPRosterControllerTest : public CppUnit::TestFixture void setUp() { channel_ = new DummyIQChannel(); router_ = new IQRouter(channel_); - xmppRoster_ = new XMPPRoster(); + xmppRoster_ = new XMPPRosterImpl(); } void tearDown() { @@ -79,7 +79,7 @@ class XMPPRosterControllerTest : public CppUnit::TestFixture private: DummyIQChannel* channel_; IQRouter* router_; - XMPPRoster* xmppRoster_; + XMPPRosterImpl* xmppRoster_; }; CPPUNIT_TEST_SUITE_REGISTRATION(XMPPRosterControllerTest); diff --git a/Swiften/Roster/UnitTest/XMPPRosterTest.cpp b/Swiften/Roster/UnitTest/XMPPRosterImplTest.cpp index 7e64d8c..fbc3430 100644 --- a/Swiften/Roster/UnitTest/XMPPRosterTest.cpp +++ b/Swiften/Roster/UnitTest/XMPPRosterImplTest.cpp @@ -11,7 +11,7 @@ #include <vector> -#include "Swiften/Roster/XMPPRoster.h" +#include "Swiften/Roster/XMPPRosterImpl.h" using namespace Swift; @@ -73,16 +73,16 @@ private: }; -class XMPPRosterTest : public CppUnit::TestFixture +class XMPPRosterImplTest : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(XMPPRosterTest); + CPPUNIT_TEST_SUITE(XMPPRosterImplTest); CPPUNIT_TEST(testJIDAdded); CPPUNIT_TEST(testJIDRemoved); CPPUNIT_TEST(testJIDUpdated); CPPUNIT_TEST_SUITE_END(); private: - XMPPRoster* roster_; + XMPPRosterImpl* roster_; XMPPRosterSignalHandler* handler_; JID jid1_; JID jid2_; @@ -92,11 +92,10 @@ class XMPPRosterTest : public CppUnit::TestFixture public: - - XMPPRosterTest() : jid1_(JID("a@b.c")), jid2_(JID("b@c.d")), jid3_(JID("c@d.e")) {} + XMPPRosterImplTest() : jid1_(JID("a@b.c")), jid2_(JID("b@c.d")), jid3_(JID("c@d.e")) {} void setUp() { - roster_ = new XMPPRoster(); + roster_ = new XMPPRosterImpl(); handler_ = new XMPPRosterSignalHandler(roster_); groups1_.push_back("bobs"); groups1_.push_back("berts"); @@ -167,5 +166,5 @@ class XMPPRosterTest : public CppUnit::TestFixture } }; -CPPUNIT_TEST_SUITE_REGISTRATION(XMPPRosterTest); +CPPUNIT_TEST_SUITE_REGISTRATION(XMPPRosterImplTest); |