From 1b36dd94759c41c4af433ce53e131e318d09c14a Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Thu, 20 Mar 2014 22:56:48 +0100 Subject: [PATCH] Move vcard template to real multi-line string --- tests/storage/dav/test_carddav.py | 35 ++++++++++++++++--------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/tests/storage/dav/test_carddav.py b/tests/storage/dav/test_carddav.py index 99c1771..7c8ae34 100644 --- a/tests/storage/dav/test_carddav.py +++ b/tests/storage/dav/test_carddav.py @@ -12,22 +12,23 @@ from vdirsyncer.storage.dav.carddav import CarddavStorage from . import DavStorageTests +VCARD_TEMPLATE = u'''BEGIN:VCARD +VERSION:3.0 +FN:Cyrus Daboo +N:Daboo;Cyrus +ADR;TYPE=POSTAL:;2822 Email HQ;Suite 2821;RFCVille;PA;15213;USA +EMAIL;TYPE=INTERNET;TYPE=PREF:cyrus@example.com +NICKNAME:me +NOTE:Example VCard. +ORG:Self Employed +TEL;TYPE=WORK;TYPE=VOICE:412 605 0499 +TEL;TYPE=FAX:412 605 0705 +URL:http://www.example.com +UID:{uid} +X-SOMETHING:{r} +END:VCARD''' + + class TestCarddavStorage(DavStorageTests): storage_class = CarddavStorage - - item_template = (u'BEGIN:VCARD\n' - u'VERSION:3.0\n' - u'FN:Cyrus Daboo\n' - u'N:Daboo;Cyrus\n' - u'ADR;TYPE=POSTAL:;2822 Email HQ;' # address continuing - u'Suite 2821;RFCVille;PA;15213;USA\n' # on next line - u'EMAIL;TYPE=INTERNET;TYPE=PREF:cyrus@example.com\n' - u'NICKNAME:me\n' - u'NOTE:Example VCard.\n' - u'ORG:Self Employed\n' - u'TEL;TYPE=WORK;TYPE=VOICE:412 605 0499\n' - u'TEL;TYPE=FAX:412 605 0705\n' - u'URL:http://www.example.com\n' - u'UID:{uid}\n' - u'X-SOMETHING:{r}\n' - u'END:VCARD') + item_template = VCARD_TEMPLATE