Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-08-28 12:06:32 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-08-28 12:06:32 (GMT) |
| commit | 730b88ce48471842333b8769bcfc017335b0440f (patch) | |
| tree | 3b4c2470fb5bc250d707638520348944e46fe6cf /Swiften/QA | |
| parent | 063dc0412e0f84c779f133ec7293873b76f6b2d0 (diff) | |
| parent | 33af107d8d4ffdeada9ea964fe696af4a23c5b95 (diff) | |
| download | swift-730b88ce48471842333b8769bcfc017335b0440f.zip swift-730b88ce48471842333b8769bcfc017335b0440f.tar.bz2 | |
Merge remote branch 'origin/swift-1.x'
* swift-1.x:
Catch boost file system errors when reading VCards.
Conflicts:
Swift/Controllers/Storages/VCardFileStorage.cpp
Diffstat (limited to 'Swiften/QA')
| -rw-r--r-- | Swiften/QA/StorageTest/VCardFileStorageTest.cpp | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp index 45a04ba..7667176 100644 --- a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp +++ b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp @@ -7,6 +7,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> #include <boost/algorithm/string.hpp> +#include <sstream> #include <Swiften/VCards/VCardFileStorage.h> #include <Swiften/JID/JID.h> @@ -18,8 +19,12 @@ using namespace Swift; class VCardFileStorageTest : public CppUnit::TestFixture { CPPUNIT_TEST_SUITE(VCardFileStorageTest); CPPUNIT_TEST(testSetVCard); + // Temporarily disabling this, because it generates error messages on console. Need to figure + // out something for not showing error messages during tests. + //CPPUNIT_TEST(testSetVCard_LargeFilename); CPPUNIT_TEST(testGetVCard); CPPUNIT_TEST(testGetVCard_FileDoesNotExist); + //CPPUNIT_TEST(testGetVCard_LargeFilename); CPPUNIT_TEST_SUITE_END(); public: @@ -48,6 +53,22 @@ class VCardFileStorageTest : public CppUnit::TestFixture { CPPUNIT_ASSERT(boost::starts_with(data.toString(), "<vCard xmlns=\"vcard-temp\">")); } + void testSetVCard_LargeFilename() { + std::auto_ptr<VCardFileStorage> testling(createTestling()); + VCard::ref vcard(new VCard()); + vcard->setFullName("Alice In Wonderland"); + + std::ostringstream s; + for (int i = 0; i < 1000; ++i) { + s << "_"; + } + + JID jid("alice@wonderland.lit/" + s.str()); + testling->setVCard(jid, vcard); + + // Just check whether we don't crash + } + void testGetVCard() { boost::shared_ptr<VCardFileStorage> testling(createTestling()); VCard::ref vcard(new VCard()); @@ -58,6 +79,22 @@ class VCardFileStorageTest : public CppUnit::TestFixture { CPPUNIT_ASSERT_EQUAL(std::string("Alice In Wonderland"), result->getFullName()); } + void testGetVCard_LargeFilename() { + std::auto_ptr<VCardFileStorage> testling(createTestling()); + VCard::ref vcard(new VCard()); + vcard->setFullName("Alice In Wonderland"); + + std::ostringstream s; + for (int i = 0; i < 1000; ++i) { + s << "_"; + } + JID jid("alice@wonderland.lit/" + s.str()); + + VCard::ref result = testling->getVCard(jid); + + // Just check that we don't have an exception + } + void testGetVCard_FileDoesNotExist() { boost::shared_ptr<VCardFileStorage> testling(createTestling()); VCard::ref result = testling->getVCard(JID("alice@wonderland.lit")); |