summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-08-22 08:55:08 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-08-24 17:10:23 (GMT)
commitb6a34463dfcedd454ab42230a47cdb7294a76f21 (patch)
tree832b0243325451932c0d15e9e33d53948fce0110 /Swiften/QA/StorageTest
parent6e4b357141a6d09632f1e96d0eaf54f79daf52c9 (diff)
downloadswift-contrib-b6a34463dfcedd454ab42230a47cdb7294a76f21.zip
swift-contrib-b6a34463dfcedd454ab42230a47cdb7294a76f21.tar.bz2
Implemented VCardManager.
Diffstat (limited to 'Swiften/QA/StorageTest')
-rw-r--r--Swiften/QA/StorageTest/SConscript1
-rw-r--r--Swiften/QA/StorageTest/VCardFileStorageTest.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/Swiften/QA/StorageTest/SConscript b/Swiften/QA/StorageTest/SConscript
index c7401e0..c35d5b3 100644
--- a/Swiften/QA/StorageTest/SConscript
+++ b/Swiften/QA/StorageTest/SConscript
@@ -10,6 +10,7 @@ if env["TEST"] :
myenv.MergeFlags(myenv["BOOST_FLAGS"])
myenv.MergeFlags(myenv["LIBIDN_FLAGS"])
myenv.MergeFlags(myenv.get("EXPAT_FLAGS", {}))
+ myenv.MergeFlags(myenv.get("LIBXML_FLAGS", {}))
tester = myenv.Program("StorageTest", [
"VCardFileStorageTest.cpp",
diff --git a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
index 9704409..694e13b 100644
--- a/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
+++ b/Swiften/QA/StorageTest/VCardFileStorageTest.cpp
@@ -39,9 +39,9 @@ class VCardFileStorageTest : public CppUnit::TestFixture {
vcard->setFullName("Alice In Wonderland");
vcard->setEMail("alice@wonderland.lit");
- testling->setVCard(JID("alice@wonderland.lit"), vcard);
+ testling->setVCard(JID("alice@wonderland.lit/TeaRoom"), vcard);
- boost::filesystem::path vcardFile(vcardsPath / "alice@wonderland.lit.xml");
+ boost::filesystem::path vcardFile(vcardsPath / "alice@wonderland.lit%2fTeaRoom.xml");
CPPUNIT_ASSERT(boost::filesystem::exists(vcardFile));
ByteArray data;
data.readFromFile(vcardFile.string());