# HG changeset patch # User Paul Boddie # Date 1432071576 -7200 # Node ID 161982c8ee531970bb935efbeb151e62f3def673 # Parent 48341bb56051c7d93792f197e5de300c8295b594 Fixed absent free/busy tests, added a day recurrence test plus necessary attendee information for the sender. diff -r 48341bb56051 -r 161982c8ee53 tests/outgoing_invitation.sh --- a/tests/outgoing_invitation.sh Tue May 19 23:38:48 2015 +0200 +++ b/tests/outgoing_invitation.sh Tue May 19 23:39:36 2015 +0200 @@ -16,6 +16,7 @@ rm -r $STATIC $OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-request.txt 2> /dev/null +cp "$FBFILE" out1.tmp grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \ && echo "Success" \ @@ -23,12 +24,14 @@ $OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-cancel.txt 2> /dev/null echo "Cancel..." +cp "$FBFILE" out2.tmp - ! grep -q '^FREEBUSY' "$FBFILE" \ + ! grep -q '^2' "$FBFILE" \ && echo "Success" \ || echo "Failed" $OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-request-recurring.txt 2> /dev/null +cp "$FBFILE" out3.tmp [ `cat "$FBFILE" | wc -l` = '3' ] \ && grep -q "^20141212T090000Z${TAB}20141212T100000Z" "$FBFILE" \ @@ -36,6 +39,7 @@ || echo "Failed" $OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-cancel-recurring-instance.txt 2> /dev/null +cp "$FBFILE" out4.tmp [ `cat "$FBFILE" | wc -l` = '2' ] \ && ! grep -q "^20141114T090000Z${TAB}20141114T100000Z" "$FBFILE" \ @@ -43,6 +47,7 @@ || echo "Failed" $OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-request-recurring-reschedule-instance.txt 2> /dev/null +cp "$FBFILE" out5.tmp grep -q "^20141011T080000Z${TAB}20141011T090000Z" "$FBFILE" \ && ! grep -q "^20141010T090000Z${TAB}20141010T100000Z" "$FBFILE" \ @@ -50,7 +55,16 @@ || echo "Failed" $OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-cancel-recurring.txt 2> /dev/null +cp "$FBFILE" out6.tmp - ! grep -q '^FREEBUSY' "$FBFILE" \ + ! grep -q '^2' "$FBFILE" \ && echo "Success" \ || echo "Failed" + +$OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-request-recurring-day.txt 2> /dev/null +cp "$FBFILE" out7.tmp + + [ `cat "$FBFILE" | wc -l` = '3' ] \ +&& grep -q "^20141211T230000Z${TAB}20141212T230000Z" "$FBFILE" \ +&& echo "Success" \ +|| echo "Failed" diff -r 48341bb56051 -r 161982c8ee53 tests/templates/event-cancel-multiple-attendee.txt --- a/tests/templates/event-cancel-multiple-attendee.txt Tue May 19 23:38:48 2015 +0200 +++ b/tests/templates/event-cancel-multiple-attendee.txt Tue May 19 23:39:36 2015 +0200 @@ -2,7 +2,9 @@ MIME-Version: 1.0 From: paul.boddie@example.com To: resource-room-confroom@example.com -Subject: Invitation! +Subject: Cancellation! + +Uninvite only resource-room-confroom from the event. --===============0047278175== Content-Type: text/plain; charset="us-ascii" diff -r 48341bb56051 -r 161982c8ee53 tests/templates/event-cancel-recurring-instance.txt --- a/tests/templates/event-cancel-recurring-instance.txt Tue May 19 23:38:48 2015 +0200 +++ b/tests/templates/event-cancel-recurring-instance.txt Tue May 19 23:39:36 2015 +0200 @@ -2,7 +2,9 @@ MIME-Version: 1.0 From: paul.boddie@example.com To: resource-room-confroom@example.com -Subject: Invitation! +Subject: Cancellation! + +Cancel an instance for resource-room-confroom and paul.boddie. --===============0047278175== Content-Type: text/plain; charset="us-ascii" @@ -22,6 +24,7 @@ BEGIN:VEVENT ORGANIZER:mailto:paul.boddie@example.com ATTENDEE;RSVP=TRUE:mailto:resource-room-confroom@example.com +ATTENDEE;RSVP=TRUE:mailto:paul.boddie@example.com DTSTAMP:20141009T182400Z DTSTART;TZID=Europe/Oslo:20141114T100000 DTEND;TZID=Europe/Oslo:20141114T110000 diff -r 48341bb56051 -r 161982c8ee53 tests/templates/event-cancel-recurring.txt --- a/tests/templates/event-cancel-recurring.txt Tue May 19 23:38:48 2015 +0200 +++ b/tests/templates/event-cancel-recurring.txt Tue May 19 23:39:36 2015 +0200 @@ -2,7 +2,9 @@ MIME-Version: 1.0 From: paul.boddie@example.com To: resource-room-confroom@example.com -Subject: Invitation! +Subject: Cancellation! + +Cancel the event for resource-room-confroom and paul.boddie. --===============0047278175== Content-Type: text/plain; charset="us-ascii" @@ -22,6 +24,7 @@ BEGIN:VEVENT ORGANIZER:mailto:paul.boddie@example.com ATTENDEE;RSVP=TRUE:mailto:resource-room-confroom@example.com +ATTENDEE;RSVP=TRUE:mailto:paul.boddie@example.com DTSTAMP:20141009T182400Z DTSTART;TZID=Europe/Oslo:20141010T100000 DTEND;TZID=Europe/Oslo:20141010T110000 diff -r 48341bb56051 -r 161982c8ee53 tests/templates/event-cancel.txt --- a/tests/templates/event-cancel.txt Tue May 19 23:38:48 2015 +0200 +++ b/tests/templates/event-cancel.txt Tue May 19 23:39:36 2015 +0200 @@ -2,6 +2,9 @@ MIME-Version: 1.0 From: paul.boddie@example.com To: resource-room-confroom@example.com +Subject: Cancellation! + +Cancel the event for resource-room-confroom and paul.boddie. --===============0047278175== Content-Type: text/plain; charset="us-ascii" @@ -20,8 +23,8 @@ VERSION:2.0 BEGIN:VEVENT ORGANIZER:mailto:paul.boddie@example.com +ATTENDEE;RSVP=TRUE:mailto:resource-room-confroom@example.com ATTENDEE;RSVP=TRUE:mailto:paul.boddie@example.com -ATTENDEE;RSVP=TRUE:mailto:resource-room-confroom@example.com DTSTAMP:20141125T004600Z DTSTART;TZID=Europe/Oslo:20141126T160000 DTEND;TZID=Europe/Oslo:20141126T170000