summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/Roster/UnitTest')
-rw-r--r--Swiften/Roster/UnitTest/RosterTest.cpp21
1 files changed, 10 insertions, 11 deletions
diff --git a/Swiften/Roster/UnitTest/RosterTest.cpp b/Swiften/Roster/UnitTest/RosterTest.cpp
index 9c8e65b..0300188 100644
--- a/Swiften/Roster/UnitTest/RosterTest.cpp
+++ b/Swiften/Roster/UnitTest/RosterTest.cpp
@@ -14,8 +14,7 @@
using namespace Swift;
-class RosterTest : public CppUnit::TestFixture
-{
+class RosterTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(RosterTest);
CPPUNIT_TEST(testGetGroup);
CPPUNIT_TEST(testRemoveContact);
@@ -24,17 +23,11 @@ class RosterTest : public CppUnit::TestFixture
CPPUNIT_TEST(testApplyPresenceLikeMUC);
CPPUNIT_TEST_SUITE_END();
- private:
- Roster *roster_;
- JID jid1_;
- JID jid2_;
- JID jid3_;
-
public:
-
- RosterTest() : jid1_(JID("a@b.c")), jid2_(JID("b@c.d")), jid3_(JID("c@d.e")) {}
-
void setUp() {
+ jid1_ = JID("a@b.c");
+ jid2_ = JID("b@c.d");
+ jid3_ = JID("c@d.e");
roster_ = new Roster();
}
@@ -124,6 +117,12 @@ class RosterTest : public CppUnit::TestFixture
}
+ private:
+ Roster *roster_;
+ JID jid1_;
+ JID jid2_;
+ JID jid3_;
};
+
CPPUNIT_TEST_SUITE_REGISTRATION(RosterTest);