From 529d1b4304aa3bd87414c28ffaeae0b19a44f0f2 Mon Sep 17 00:00:00 2001 From: niko Date: Wed, 17 Oct 2012 23:15:14 +0000 Subject: kolab2 dist lists --- test/synckolab/parser/kolab2/contactTest.js | 15 +++++ test/synckolab/parser/kolab2/raw/list.test.xml | 4 +- .../parser/kolab2/xml/contactFullTest.xml | 71 ++++++++++++++++++++++ .../parser/kolab2/xml/contactMinimalTest.xml | 17 ++++++ test/synckolab/parser/kolab2/xml/list.test.xml | 21 +++++++ test/synckolab/parser/kolab3/contactTest.js | 5 +- .../synckolab/parser/kolab3/xml/list.test1.eml.xml | 13 ++-- 7 files changed, 135 insertions(+), 11 deletions(-) create mode 100644 test/synckolab/parser/kolab2/xml/contactFullTest.xml create mode 100644 test/synckolab/parser/kolab2/xml/contactMinimalTest.xml create mode 100644 test/synckolab/parser/kolab2/xml/list.test.xml diff --git a/test/synckolab/parser/kolab2/contactTest.js b/test/synckolab/parser/kolab2/contactTest.js index d1fa937..d247613 100644 --- a/test/synckolab/parser/kolab2/contactTest.js +++ b/test/synckolab/parser/kolab2/contactTest.js @@ -26,6 +26,21 @@ test("skolab2 ynckolab.addressbookTools.parseMessageContent", function(){ jsonEntry = JSON.parse(content); equal(synckolab.tools.equalsObject(entry, jsonEntry), true, src + "\n" + JSON.stringify(entry, null, " ")); + // json -> kolab 2 xml + /* + if(entry.type === "maillist") { + content = synckolab.addressbookTools.list2Xml(entry); + } else { + content = synckolab.addressbookTools.card2Xml(entry); + } + xmlcontent = readFile("test/synckolab/parser/kolab2/xml/"+src + ".xml"); + if (xmlcontent.replace(/[\n\r\t ]/g, "").length !== content.replace(/[\n\r\t ]/g, "").length) { + equal(xmlcontent.replace(/[\n\r\t ]/g, ""), content.replace(/[\n\r\t ]/g, ""), src); + var diff = diffString(xmlcontent, content); + print("DIFF FOUND:"+ xmlcontent.replace(/[\n\r\t ]/g, "").length + " vs. "+ content.replace(/[\n\r\t ]/g, "").length +"\n" + diff); + } + */ + } diff --git a/test/synckolab/parser/kolab2/raw/list.test.xml b/test/synckolab/parser/kolab2/raw/list.test.xml index 6aece4e..9f07b00 100644 --- a/test/synckolab/parser/kolab2/raw/list.test.xml +++ b/test/synckolab/parser/kolab2/raw/list.test.xml @@ -3,8 +3,8 @@ SyncKolab, Kolab resource list_name 20121017T214612Z - 20121017T214612Z - public + 1970-01-01T00:00:00Z + public list-name list-description list-nickname diff --git a/test/synckolab/parser/kolab2/xml/contactFullTest.xml b/test/synckolab/parser/kolab2/xml/contactFullTest.xml new file mode 100644 index 0000000..895dfac --- /dev/null +++ b/test/synckolab/parser/kolab2/xml/contactFullTest.xml @@ -0,0 +1,71 @@ + + + SyncKolab, Kolab resource + pas-id-1D84CEA337CD1878 + 1970-01-01T00:00:00Z + public + multiline +note with öäü! + + testöä + lastnameöäü + testöä lastname + + w-org + w-web + p-web + w-department + w-title + nick + 1980-1-22 + + home1 + 01-home + + + business1 + 01-work + + + fax + 01-fax + + + mobile + 01-mobile + + + page + 01-page + + + testöä lastname + email@mail.com + + + testöä lastname + additional@mail.com + +

+ home + priv-addr1 + priv-addr2 + priv-city + priv-state + p123 + p-country +

+ business + w-addr1 + w-addr2 + w-city + w-state + w123 + w-country +

+ cust1 + cust2 + cust3 + true + diff --git a/test/synckolab/parser/kolab2/xml/contactMinimalTest.xml b/test/synckolab/parser/kolab2/xml/contactMinimalTest.xml new file mode 100644 index 0000000..29cc0ed --- /dev/null +++ b/test/synckolab/parser/kolab2/xml/contactMinimalTest.xml @@ -0,0 +1,17 @@ + + + SyncKolab, Kolab resource + sk-vc-C18A6B3AE0CD9EDC + 1970-01-01T00:00:00Z + public + + Test + LastName + Test Lastname + + + Test Lastname + email@test.com + + true + diff --git a/test/synckolab/parser/kolab2/xml/list.test.xml b/test/synckolab/parser/kolab2/xml/list.test.xml new file mode 100644 index 0000000..d9575ac --- /dev/null +++ b/test/synckolab/parser/kolab2/xml/list.test.xml @@ -0,0 +1,21 @@ + + + SyncKolab, Kolab resource + list_name + 20121017T231244Z + 1970-01-01T00:00:00Z + public + list-name + list-description + list-nickname + + testöä lastname + weird@email.com + urn:uuid:pas-id-1D84CEA337CD1878 + + + cont2#öüä&$ + weird@email.com + urn:uuid:pas-id-A4E937D838A897AD + + diff --git a/test/synckolab/parser/kolab3/contactTest.js b/test/synckolab/parser/kolab3/contactTest.js index 51f0044..d5030c7 100644 --- a/test/synckolab/parser/kolab3/contactTest.js +++ b/test/synckolab/parser/kolab3/contactTest.js @@ -33,8 +33,9 @@ test("kolab3 synckolab.addressbookTools.parseMessageContent", function(){ content = synckolab.addressbookTools.card2Kolab3(entry); } xmlcontent = readFile("test/synckolab/parser/kolab3/xml/"+src + ".xml"); - if (xmlcontent.replace(/[\n\r\t ]/g, "").length != content.replace(/[\n\r\t ]/g, "").length) { - var diff = diffString(xmlcontent, content) + if (xmlcontent.replace(/[\n\r\t ]/g, "").length !== content.replace(/[\n\r\t ]/g, "").length) { + equal(xmlcontent.replace(/[\n\r\t ]/g, ""), content.replace(/[\n\r\t ]/g, ""), src); + var diff = diffString(xmlcontent, content); print("DIFF FOUND:"+ xmlcontent.replace(/[\n\r\t ]/g, "").length + " vs. "+ content.replace(/[\n\r\t ]/g, "").length +"\n" + diff); } } diff --git a/test/synckolab/parser/kolab3/xml/list.test1.eml.xml b/test/synckolab/parser/kolab3/xml/list.test1.eml.xml index 464d2dd..3457c17 100644 --- a/test/synckolab/parser/kolab3/xml/list.test1.eml.xml +++ b/test/synckolab/parser/kolab3/xml/list.test1.eml.xml @@ -1,13 +1,11 @@ - - + + list_name

3.0dev1

SyncKolab 3.0.0, Kolab resource - 19700101T000000ZZ - - group - + 20121017T224839ZZ + group list-name list-nickname @@ -22,4 +20,5 @@ list-description - \ No newline at end of file + + -- cgit v0.12