# HG changeset patch # User Paul Boddie # Date 1431972974 -7200 # Node ID 655ce8a846fe8932e9c1806ca8157f5e81362c3e # Parent 03a4ad954a1e3c89216cd7f090ff77e32dd852c1 Added recurring event test and tidied up the test output. diff -r 03a4ad954a1e -r 655ce8a846fe tests/templates/event-request-recurring.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/templates/event-request-recurring.txt Mon May 18 20:16:14 2015 +0200 @@ -0,0 +1,34 @@ +Content-Type: multipart/alternative; boundary="===============0047278175==" +MIME-Version: 1.0 +From: paul.boddie@example.com +To: resource-room-confroom@example.com +Subject: Invitation! + +--===============0047278175== +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit + +This message contains an event. +--===============0047278175== +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Content-Type: text/calendar; charset="us-ascii"; method="REQUEST" + +BEGIN:VCALENDAR +PRODID:-//imip-agent/test//EN +METHOD:REQUEST +VERSION:2.0 +BEGIN:VEVENT +ORGANIZER:mailto:paul.boddie@example.com +ATTENDEE;RSVP=TRUE:mailto:resource-room-confroom@example.com +DTSTAMP:20141009T182400Z +DTSTART;TZID=Europe/Oslo:20141010T100000 +DTEND;TZID=Europe/Oslo:20141010T110000 +RRULE:FREQ=MONTHLY;BYDAY=2FR;COUNT=3 +SUMMARY:Recurring event +UID:event3@example.com +END:VEVENT +END:VCALENDAR + +--===============0047278175==-- diff -r 03a4ad954a1e -r 655ce8a846fe tests/test_resource_invitation.sh --- a/tests/test_resource_invitation.sh Mon May 18 19:59:38 2015 +0200 +++ b/tests/test_resource_invitation.sh Mon May 18 20:16:14 2015 +0200 @@ -67,8 +67,8 @@ && echo "Success" \ || echo "Failed" - $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel.txt 2> /dev/null \ -| $SHOWMAIL +$RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel.txt 2> /dev/null +echo "Cancel..." $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \ | $SHOWMAIL \ @@ -79,8 +79,8 @@ && echo "Success" \ || echo "Failed" - $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-spoofed.txt 2> /dev/null \ -| $SHOWMAIL +$RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-spoofed.txt 2> /dev/null +echo "Spoof..." $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \ | $SHOWMAIL \ @@ -90,3 +90,22 @@ && grep -q -v '^FREEBUSY' out7.tmp \ && echo "Success" \ || echo "Failed" + + $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-recurring.txt 2> /dev/null \ +| $SHOWMAIL \ +> out8.tmp + + grep -q 'METHOD:REPLY' out8.tmp \ +&& grep -q 'ATTENDEE;PARTSTAT=ACCEPTED' out8.tmp \ +&& echo "Success" \ +|| echo "Failed" + + $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \ +| $SHOWMAIL \ +> out9.tmp + + grep -q 'METHOD:REPLY' out9.tmp \ +&& [ `grep 'FREEBUSY;FBTYPE=BUSY' out9.tmp | wc -l` = '3' ] \ +&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141212T090000Z/20141212T100000Z' out9.tmp \ +&& echo "Success" \ +|| echo "Failed"