summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp')
-rw-r--r--Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp b/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp
index ddc8785..7ebce17 100644
--- a/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp
@@ -7,62 +7,62 @@
#include <Swift/Controllers/Roster/TableRoster.h>
std::ostream& operator<<(std::ostream& os, const Swift::TableRoster::Index& i);
std::ostream& operator<<(std::ostream& os, const Swift::TableRoster::Index& i) {
os << "(" << i.section << ", " << i.row << ")";
return os;
}
#include <memory>
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <boost/variant.hpp>
#include <Swiften/Network/DummyTimerFactory.h>
#include <Swift/Controllers/Roster/Roster.h>
#include <Swift/Controllers/Roster/GroupRosterItem.h>
#include <Swift/Controllers/Roster/ItemOperations/SetPresence.h>
using namespace Swift;
class TableRosterTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(TableRosterTest);
CPPUNIT_TEST(testAddContact_EmptyRoster);
CPPUNIT_TEST_SUITE_END();
public:
void setUp() {
- timerFactory = std::unique_ptr<DummyTimerFactory>(new DummyTimerFactory());
- roster = std::unique_ptr<Roster>(new Roster());
+ timerFactory = std::make_unique<DummyTimerFactory>();
+ roster = std::make_unique<Roster>();
jid1 = JID("jid1@example.com");
jid2 = JID("jid2@example.com");
}
void testAddContact_EmptyRoster() {
/*
std::shared_ptr<TableRoster> tableRoster(createTestling());
addContact(jid1, "1", "group1");
CPPUNIT_ASSERT_EQUAL(4, static_cast<int>(events.size()));
CPPUNIT_ASSERT(boost::get<BeginUpdatesEvent>(&events[0]));
CPPUNIT_ASSERT(boost::get<SectionsInsertedEvent>(&events[1]));
CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(boost::get<SectionsInsertedEvent>(events[1]).sections.size()));
CPPUNIT_ASSERT_EQUAL(0, static_cast<int>(boost::get<SectionsInsertedEvent>(events[1]).sections[0]));
CPPUNIT_ASSERT(boost::get<RowsInsertedEvent>(&events[2]));
CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(boost::get<RowsInsertedEvent>(events[2]).rows.size()));
CPPUNIT_ASSERT_EQUAL(TableRoster::Index(0, 0), boost::get<RowsInsertedEvent>(events[2]).rows[0]);
CPPUNIT_ASSERT(boost::get<EndUpdatesEvent>(&events[3]));
CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(tableRoster->getNumberOfSections()));
CPPUNIT_ASSERT_EQUAL(std::string("group1"), tableRoster->getSectionTitle(0));
CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(tableRoster->getNumberOfRowsInSection(0)));
CPPUNIT_ASSERT_EQUAL(jid1, tableRoster->getItem(TableRoster::Index(0, 0)).jid);
*/
}
private:
void addContact(const JID& jid, const std::string& name, const std::string& group) {
roster->addContact(jid, JID(), name, group, "");