From: Jan Schneider Date: Mon, 1 Nov 2010 21:48:38 +0000 (+0100) Subject: Fix expectations. X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d16d3c0db326820426a29ac2e1f982e866266914;p=horde.git Fix expectations. --- diff --git a/kronolith/lib/tests/fromicalendar.phpt b/kronolith/lib/tests/fromicalendar.phpt index 06344b1cb..934f445e3 100644 --- a/kronolith/lib/tests/fromicalendar.phpt +++ b/kronolith/lib/tests/fromicalendar.phpt @@ -35,8 +35,8 @@ foreach ($components as $content) { if (is_a($content, 'Horde_Icalendar_Vevent')) { $event = new Kronolith_Event(new Driver); $event->fromiCalendar($content); - echo $event->start->rfc3339DateTime() . "\n"; - echo $event->end->rfc3339DateTime() . "\n"; + echo (string)$event->start . "\n"; + echo (string)$event->end . "\n"; var_export($event->isAllDay()); echo "\n"; if ($event->recurs()) { @@ -49,8 +49,8 @@ foreach ($components as $content) { ?> --EXPECT-- -2010-11-01T10:00:00 -2010-11-01T11:00:00 +2010-11-01 10:00:00 +2010-11-01 11:00:00 false FREQ=WEEKLY;INTERVAL=1;BYDAY=MO;UNTIL=20101129T230000Z array(2) { diff --git a/kronolith/lib/tests/toicalendar.phpt b/kronolith/lib/tests/toicalendar.phpt index 49489393c..03d19c3d7 100644 --- a/kronolith/lib/tests/toicalendar.phpt +++ b/kronolith/lib/tests/toicalendar.phpt @@ -13,11 +13,11 @@ $object->start = new Horde_Date('2007-03-15 13:10:20'); $object->end = new Horde_Date('2007-03-15 14:20:00'); $object->creator = 'joe'; $object->uid = '20070315143732.4wlenqz3edq8@horde.org'; -$object->title = 'Hübscher Termin'; -$object->description = "Schöne Bescherung\nNew line"; -$object->location = 'Allgäu'; +$object->title = 'Hübscher Termin'; +$object->description = "Schöne Bescherung\nNew line"; +$object->location = 'Allgäu'; $object->alarm = 10; -$object->tags = array('Schöngeistiges'); +$object->tags = array('Schöngeistiges'); $object->recurrence = new Horde_Date_Recurrence($object->start); $object->recurrence->setRecurType(Horde_Date_Recurrence::RECUR_DAILY); $object->recurrence->setRecurInterval(2); @@ -44,7 +44,7 @@ $object->attendees = array('juergen@example.com' => array('attendance' => Kronolith::PART_REQUIRED, 'response' => Kronolith::RESPONSE_NONE, - 'name' => 'Jürgen Doe'), + 'name' => 'Jürgen Doe'), 0 => array('attendance' => Kronolith::PART_OPTIONAL, 'response' => Kronolith::RESPONSE_ACCEPTED, @@ -78,12 +78,12 @@ DTSTART:20070315T121020Z DTEND:20070315T132000Z DTSTAMP:%d%d%d%d%d%d%d%dT%d%d%d%d%d%dZ UID:20070315143732.4wlenqz3edq8@horde.org -SUMMARY:Event from 1:10pm to 2:20pm +SUMMARY:busy ORGANIZER;CN=joe:mailto:joe -DESCRIPTION;ENCODING=QUOTED-PRINTABLE;CHARSET=ISO-8859-1:Sch=F6ne Bescherung=0D=0A= +DESCRIPTION;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:Sch=C3=B6ne Bescherung=0D=0A= New line -CATEGORIES;ENCODING=QUOTED-PRINTABLE;CHARSET=ISO-8859-1:Sch=F6ngeistiges -LOCATION;ENCODING=QUOTED-PRINTABLE;CHARSET=ISO-8859-1:Allg=E4u +CATEGORIES;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:Sch=C3=B6ngeistiges +LOCATION;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:Allg=C3=A4u CLASS:PUBLIC STATUS:CONFIRMED TRANSP:0 @@ -102,7 +102,7 @@ DTSTART:20070315T121020Z DTEND:20070315T132000Z DTSTAMP:%d%d%d%d%d%d%d%dT%d%d%d%d%d%dZ UID:20070315143732.4wlenqz3edq8@horde.org -SUMMARY:Event from 1:10pm to 2:20pm +SUMMARY:busy ORGANIZER;CN=joe:mailto:joe DESCRIPTION:Schöne Bescherung\nNew line CATEGORIES:Schöngeistiges @@ -133,7 +133,7 @@ ORGANIZER;CN=joe:mailto:joe CLASS:PRIVATE STATUS:TENTATIVE TRANSP:0 -ATTENDEE;EXPECT=REQUIRE;STATUS=NEEDS ACTION;RSVP=YES;ENCODING=QUOTED-PRINTABLE;CHARSET=ISO-8859-1:J=FCrgen Doe +ATTENDEE;EXPECT=REQUIRE;STATUS=NEEDS ACTION;RSVP=YES;ENCODING=QUOTED-PRINTABLE;CHARSET=UTF-8:J=C3=BCrgen Doe ATTENDEE;EXPECT=REQUEST;STATUS=ACCEPTED:Jane Doe ATTENDEE;EXPECT=FYI;STATUS=DECLINED:Jack Doe ATTENDEE;EXPECT=FYI;STATUS=TENTATIVE:jenny@example.com @@ -157,8 +157,8 @@ ORGANIZER;CN=joe:mailto:joe CLASS:PRIVATE STATUS:TENTATIVE TRANSP:OPAQUE -ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN=Jürgen - Doe:mailto:juergen@example.com +ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;CN="Jürgen + Doe":mailto:juergen@example.com ATTENDEE;ROLE=OPT-PARTICIPANT;PARTSTAT=ACCEPTED;CN=Jane Doe: ATTENDEE;ROLE=NON-PARTICIPANT;PARTSTAT=DECLINED;CN=Jack Doe:mailto:jack@example.com