summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorniko <niko>2012-10-17 20:03:26 (GMT)
committerniko <niko>2012-10-17 20:03:26 (GMT)
commitb7eb7d9eb8ce505cf40b7539650ff82e6565bd87 (patch)
treeda0499b19b7955a2011a9a73371cfcdd88dd3876 /test
parenta1fe7cf420e90204a8a8303775b71fcb228ff797 (diff)
downloadsynckolab-b7eb7d9eb8ce505cf40b7539650ff82e6565bd87.tar.gz
fix ordering of elements
Diffstat (limited to 'test')
-rw-r--r--test/synckolab/parser/kolab3/xml/contact.complex.mime.xml65
-rw-r--r--test/synckolab/parser/kolab3/xml/contact.simple.mime.xml9
-rw-r--r--test/synckolab/parser/kolab3/xml/contact.test.mime.xml11
-rw-r--r--test/synckolab/parser/kolab3/xml/contact.test2.mime.xml5
4 files changed, 48 insertions, 42 deletions
diff --git a/test/synckolab/parser/kolab3/xml/contact.complex.mime.xml b/test/synckolab/parser/kolab3/xml/contact.complex.mime.xml
index d621e31..a03f02b 100644
--- a/test/synckolab/parser/kolab3/xml/contact.complex.mime.xml
+++ b/test/synckolab/parser/kolab3/xml/contact.complex.mime.xml
@@ -2,38 +2,54 @@
<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
<vcard>
<uid><uri>urn:uuid:Huu5X7hfYy</uri></uid>
+ <x-kolab-version><text>3.0dev1</text></x-kolab-version>
<prodid><text>SyncKolab 3.0.0, Kolab resource</text></prodid>
<rev><timestamp>19700101T000000ZZ</timestamp></rev>
<kind>
<text>individual</text>
</kind>
- <note>
- <text>Notes</text>
- </note>
+ <fn><text>Displayname</text></fn>
<n>
- <given>Lastname</given>
<surname>Firstname</surname>
+ <given>Lastname</given>
</n>
- <fn><text>Displayname</text></fn>
+ <note>
+ <text>Notes</text>
+ </note>
+ <title>
+ <text>Title</text>
+ </title>
<url>
<uri>www.homepage.org</uri>
</url>
<url>
<uri>www.blog.test</uri>
</url>
- <impp>
- <uri>messaging</uri>
- </impp>
- <title>
- <text>Title</text>
- </title>
+ <adr>
+ <parameters><type><text>home</text></type></parameters>
+ <street>Home Street</street>
+ <locality>Home Locality</locality>
+ <region>Home Region</region>
+ <code>Home Postal Code</code>
+ <country>Gabon</country>
+ </adr>
+ <adr>
+ <parameters><type><text>work</text></type></parameters>
+ <street>Work Street</street>
+ <locality>Work Locality</locality>
+ <region>Work Region</region>
+ <code>Work Postal Code</code>
+ <country>Azerbaijan</country>
+ </adr>
<nickname>
<text>Nickname</text>
</nickname>
- <bday> <date-time>2043</date-time>
-</bday>
- <anniversary> <date-time>2009-7-28</date-time>
-</anniversary>
+ <bday>
+ <date-time>2043</date-time>
+ </bday>
+ <anniversary>
+ <date-time>2009-7-28</date-time>
+ </anniversary>
<tel>
<parameters><type><text>home</text></type></parameters>
<text>+4930-homephone</text>
@@ -50,6 +66,9 @@
<parameters><type><text>cell</text></type></parameters>
<text>+4930-mobile</text>
</tel>
+ <impp>
+ <uri>messaging</uri>
+ </impp>
<email>
<parameters><pref><integer>1</integer></pref></parameters>
<text>first@email.org</text>
@@ -57,22 +76,6 @@
<email>
<text>second@email.org</text>
</email>
- <adr>
- <parameters><type><text>home</text></type></parameters>
- <street>Home Street</street>
- <locality>Home Locality</locality>
- <region>Home Region</region>
- <code>Home Postal Code</code>
- <country>Gabon</country>
- </adr>
- <adr>
- <parameters><type><text>work</text></type></parameters>
- <street>Work Street</street>
- <locality>Work Locality</locality>
- <region>Work Region</region>
- <code>Work Postal Code</code>
- <country>Azerbaijan</country>
- </adr>
<x-custom><identifier>X-AllowRemoteContent</identifier><value>true</value></x-custom>
</vcard>
</vcards> \ No newline at end of file
diff --git a/test/synckolab/parser/kolab3/xml/contact.simple.mime.xml b/test/synckolab/parser/kolab3/xml/contact.simple.mime.xml
index 232951c..36fe656 100644
--- a/test/synckolab/parser/kolab3/xml/contact.simple.mime.xml
+++ b/test/synckolab/parser/kolab3/xml/contact.simple.mime.xml
@@ -2,16 +2,17 @@
<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
<vcard>
<uid><uri>urn:uuid:4xuyC0cyjV</uri></uid>
+ <x-kolab-version><text>3.0dev1</text></x-kolab-version>
<prodid><text>SyncKolab 3.0.0, Kolab resource</text></prodid>
<rev><timestamp>19700101T000000ZZ</timestamp></rev>
- <kind>
+ <kind>
<text>individual</text>
- </kind>
+ </kind>
+ <fn><text>Volker Krause</text></fn>
<n>
- <given>Krause</given>
<surname>Volker</surname>
+ <given>Krause</given>
</n>
- <fn><text>Volker Krause</text></fn>
<email>
<parameters><pref><integer>1</integer></pref></parameters>
<text>vkrause@kde.org</text>
diff --git a/test/synckolab/parser/kolab3/xml/contact.test.mime.xml b/test/synckolab/parser/kolab3/xml/contact.test.mime.xml
index 45269a7..9c5370d 100644
--- a/test/synckolab/parser/kolab3/xml/contact.test.mime.xml
+++ b/test/synckolab/parser/kolab3/xml/contact.test.mime.xml
@@ -2,21 +2,22 @@
<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
<vcard>
<uid><uri>urn:uuid:e79e08cc-0f02-11e2-9e3c-000476ed9009</uri></uid>
+ <x-kolab-version><text>3.0dev1</text></x-kolab-version>
<prodid><text>SyncKolab 3.0.0, Kolab resource</text></prodid>
<rev><timestamp>19700101T000000ZZ</timestamp></rev>
<kind>
<text>individual</text>
</kind>
+ <fn><text>firstname lastname</text></fn>
+ <n>
+ <surname>firstname</surname>
+ <given>lastname</given>
+ </n>
<note>
<text>multi line
notes
with empty</text>
</note>
- <n>
- <given>lastname</given>
- <surname>firstname</surname>
- </n>
- <fn><text>firstname lastname</text></fn>
<bday> <date-time>2042</date-time>
</bday>
<tel>
diff --git a/test/synckolab/parser/kolab3/xml/contact.test2.mime.xml b/test/synckolab/parser/kolab3/xml/contact.test2.mime.xml
index 0831cb8..5a92b9b 100644
--- a/test/synckolab/parser/kolab3/xml/contact.test2.mime.xml
+++ b/test/synckolab/parser/kolab3/xml/contact.test2.mime.xml
@@ -2,16 +2,17 @@
<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
<vcard>
<uid><uri>urn: uuid:ebf6fdc2-1149-11e2-841b-000476ed9009</uri></uid>
+ <x-kolab-version><text>3.0dev1</text></x-kolab-version>
<prodid><text>SyncKolab 3.0.0, Kolab resource</text></prodid>
<rev><timestamp>19700101T000000ZZ</timestamp></rev>
<kind>
<text>individual</text>
</kind>
+ <fn><text>Hans Wurst</text></fn>
<n>
- <given>Wurst</given>
<surname>Hans</surname>
+ <given>Wurst</given>
</n>
- <fn><text>Hans Wurst</text></fn>
<tel>
<parameters><type><text>home</text></type></parameters>
<text>+49123456789</text>