c++/lib

[Thomas Brüderli]

 c++/lib/php/test.php |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

New commits:
commit c0ae520b20452a4ab17212c4115c39a1351f9d53
Author: Thomas B <roundcube at gmail.com>
Date:   Wed Mar 21 08:52:01 2012 +0100

    Adapt php binding tests to recent changes in the library implementation

diff --git a/c++/lib/php/test.php b/c++/lib/php/test.php
index 916bc5a..be1ef59 100644
--- a/c++/lib/php/test.php
+++ b/c++/lib/php/test.php
@@ -132,27 +132,26 @@ assertfalse(strpos($xml, '<bday><date>'), "Unset BDay with empty cDateTime");
 $dl = new DistList;
 $dl->setName("DalistÄÖŸ");
 
-$m = new vectormember;
-$a = new Member;
-$a->setName("Member-A");
-$a->setEmail("a at localhost");
-$a->setUid("x-mem-a");
+$m = new vectorcontactref;
+$a = new ContactReference(ContactReference::EmailReference, "a at localhost", "Member-A");
 $m->push($a);
 
-$b = new Member;
+$b = new ContactReference(ContactReference::UidReference, "x-member-b-fff");
 $b->setName("Member-B");
-$b->setEmail("b at localhost");
-$b->setUid("x-mem-b");
 $m->push($b);
 
-assertequal($m->size(), 2, "vectormember::size()");
+#$c = new ContactReference(ContactReference::EmailAndUidReference, "c at localhost", "dddaab06-0000-0000-eeb5-cc64ff7f0000");
+#$c->setName("Member-C");
+#$m->push($c);
+
+assertequal($m->size(), 2, "vectorcontactref::size()");
 $dl->setMembers($m);
 
 $xml = kolabformat::writeDistlist($dl);
 #print $xml;
 assertcontains($xml, '<fn><text>DalistÄÖŸ</text></fn>', "kolabformat::writeDistlist(): FN (UTF-8)");
-assertcontains($xml, '<uri>mailto:Member%2DB%3Cb%40localhost%3E</uri>', "kolabformat::writeDistlist(): mailto uri");
-assertcontains($xml, '<member><parameters><x-uid><uri>x-mem-b</uri></x-uid></parameters>', "kolabformat::writeDistlist(): member x-uid");
+assertcontains($xml, '<uri>mailto:Member%2DA%3Ca%40localhost%3E</uri>', "kolabformat::writeDistlist(): mailto uri");
+assertcontains($xml, '<member><uri>urn:uuid:x-member-b-fff</uri>', "kolabformat::writeDistlist(): member urn::uuid");
 
 ?>