diff options
author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
---|---|---|
committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swiften/Client/UnitTest/BlockListImplTest.cpp | |
parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swiften/Client/UnitTest/BlockListImplTest.cpp')
-rw-r--r-- | Swiften/Client/UnitTest/BlockListImplTest.cpp | 138 |
1 files changed, 69 insertions, 69 deletions
diff --git a/Swiften/Client/UnitTest/BlockListImplTest.cpp b/Swiften/Client/UnitTest/BlockListImplTest.cpp index 9e5bc1a..0502f46 100644 --- a/Swiften/Client/UnitTest/BlockListImplTest.cpp +++ b/Swiften/Client/UnitTest/BlockListImplTest.cpp @@ -17,75 +17,75 @@ using namespace Swift; class BlockListImplTest : public CppUnit::TestFixture { - CPPUNIT_TEST_SUITE(BlockListImplTest); - CPPUNIT_TEST(testSetItemsToSubset); - CPPUNIT_TEST(testSetItemsToSuperset); - CPPUNIT_TEST(testSetItemsAllDifferent); - CPPUNIT_TEST_SUITE_END(); - - public: - - void testSetItemsToSubset() { - std::vector<JID> subset; - subset.push_back(JID("a@example.com")); - - blockList_->setItems(subset); - - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), addedJIDs_.size()); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), removedJIDs_.size()); - } - - void testSetItemsToSuperset() { - std::vector<JID> superset; - superset.push_back(JID("a@example.com")); - superset.push_back(JID("b@example.com")); - superset.push_back(JID("c@example.com")); - - blockList_->setItems(superset); - - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), addedJIDs_.size()); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), removedJIDs_.size()); - } - - void testSetItemsAllDifferent() { - std::vector<JID> newBlockList; - newBlockList.push_back(JID("x@example.com")); - newBlockList.push_back(JID("y@example.com")); - newBlockList.push_back(JID("z@example.com")); - - blockList_->setItems(newBlockList); - - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), addedJIDs_.size()); - CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), removedJIDs_.size()); - } - - void setUp() { - blockList_ = boost::make_shared<BlockListImpl>(); - addedJIDs_.clear(); - removedJIDs_.clear(); - blockList_->addItem(JID("a@example.com")); - blockList_->addItem(JID("b@example.com")); - - blockList_->onItemAdded.connect(boost::bind(&BlockListImplTest::handleBlockListItemAdded, this, _1)); - blockList_->onItemRemoved.connect(boost::bind(&BlockListImplTest::handleBlockListItemRemoved, this, _1)); - } - - void tearDown() { - blockList_.reset(); - } - - void handleBlockListItemAdded(const JID& jid) { - addedJIDs_.push_back(jid); - } - - void handleBlockListItemRemoved(const JID& jid) { - removedJIDs_.push_back(jid); - } - - private: - boost::shared_ptr<BlockListImpl> blockList_; - std::vector<JID> addedJIDs_; - std::vector<JID> removedJIDs_; + CPPUNIT_TEST_SUITE(BlockListImplTest); + CPPUNIT_TEST(testSetItemsToSubset); + CPPUNIT_TEST(testSetItemsToSuperset); + CPPUNIT_TEST(testSetItemsAllDifferent); + CPPUNIT_TEST_SUITE_END(); + + public: + + void testSetItemsToSubset() { + std::vector<JID> subset; + subset.push_back(JID("a@example.com")); + + blockList_->setItems(subset); + + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), addedJIDs_.size()); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), removedJIDs_.size()); + } + + void testSetItemsToSuperset() { + std::vector<JID> superset; + superset.push_back(JID("a@example.com")); + superset.push_back(JID("b@example.com")); + superset.push_back(JID("c@example.com")); + + blockList_->setItems(superset); + + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(1), addedJIDs_.size()); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(0), removedJIDs_.size()); + } + + void testSetItemsAllDifferent() { + std::vector<JID> newBlockList; + newBlockList.push_back(JID("x@example.com")); + newBlockList.push_back(JID("y@example.com")); + newBlockList.push_back(JID("z@example.com")); + + blockList_->setItems(newBlockList); + + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), addedJIDs_.size()); + CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(2), removedJIDs_.size()); + } + + void setUp() { + blockList_ = boost::make_shared<BlockListImpl>(); + addedJIDs_.clear(); + removedJIDs_.clear(); + blockList_->addItem(JID("a@example.com")); + blockList_->addItem(JID("b@example.com")); + + blockList_->onItemAdded.connect(boost::bind(&BlockListImplTest::handleBlockListItemAdded, this, _1)); + blockList_->onItemRemoved.connect(boost::bind(&BlockListImplTest::handleBlockListItemRemoved, this, _1)); + } + + void tearDown() { + blockList_.reset(); + } + + void handleBlockListItemAdded(const JID& jid) { + addedJIDs_.push_back(jid); + } + + void handleBlockListItemRemoved(const JID& jid) { + removedJIDs_.push_back(jid); + } + + private: + boost::shared_ptr<BlockListImpl> blockList_; + std::vector<JID> addedJIDs_; + std::vector<JID> removedJIDs_; }; CPPUNIT_TEST_SUITE_REGISTRATION(BlockListImplTest); |