# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1432058215 -7200
# Node ID 29ac310ee5a6b101a634b1fa67b0dd0d35244759
# Parent  dc885408a8144a2202c58b2a10389003d14d5c63
Split the invitation tests into separate scripts, fixing some of the result
checks, and adding tests for rescheduling recurring instances.

diff -r dc885408a814 -r 29ac310ee5a6 tests/templates/event-request-recurring-reschedule-instance.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/templates/event-request-recurring-reschedule-instance.txt	Tue May 19 19:56:55 2015 +0200
@@ -0,0 +1,35 @@
+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:20141009T182500Z
+DTSTART;TZID=Europe/Oslo:20141011T100000
+DTEND;TZID=Europe/Oslo:20141011T110000
+SUMMARY:Recurring event
+UID:event3@example.com
+RECURRENCE-ID;TZID=Europe/Oslo:20141010T100000
+SEQUENCE:2
+END:VEVENT
+END:VCALENDAR
+
+--===============0047278175==--
diff -r dc885408a814 -r 29ac310ee5a6 tests/test_multiple_invitation.sh
--- a/tests/test_multiple_invitation.sh	Tue May 19 19:55:19 2015 +0200
+++ b/tests/test_multiple_invitation.sh	Tue May 19 19:56:55 2015 +0200
@@ -17,7 +17,7 @@
 > out0.tmp
 
    grep -q 'METHOD:REPLY' out0.tmp \
-&& grep -q -v '^FREEBUSY' out0.tmp \
+&& ! grep -q '^FREEBUSY' out0.tmp \
 && echo "Success" \
 || echo "Failed"
 
@@ -26,7 +26,7 @@
 > out1.tmp
 
    grep -q 'METHOD:REPLY' out1.tmp \
-&& grep -q -v '^FREEBUSY' out1.tmp \
+&& ! grep -q '^FREEBUSY' out1.tmp \
 && echo "Success" \
 || echo "Failed"
 
@@ -74,7 +74,7 @@
 > out6.tmp
 
    grep -q 'METHOD:REPLY' out6.tmp \
-&& grep -q -v 'FREEBUSY' out6.tmp \
+&& ! grep -q '^FREEBUSY' out6.tmp \
 && echo "Success" \
 || echo "Failed"
 
diff -r dc885408a814 -r 29ac310ee5a6 tests/test_resource_invitation.sh
--- a/tests/test_resource_invitation.sh	Tue May 19 19:55:19 2015 +0200
+++ b/tests/test_resource_invitation.sh	Tue May 19 19:56:55 2015 +0200
@@ -17,7 +17,7 @@
 > out0.tmp
 
    grep -q 'METHOD:REPLY' out0.tmp \
-&& grep -q -v '^FREEBUSY' out0.tmp \
+&& ! grep -q '^FREEBUSY' out0.tmp \
 && echo "Success" \
 || echo "Failed"
 
@@ -26,7 +26,7 @@
 > out1.tmp
 
    grep -q 'METHOD:REPLY' out1.tmp \
-&& grep -q -v '^FREEBUSY' out1.tmp \
+&& ! grep -q '^FREEBUSY' out1.tmp \
 && echo "Success" \
 || echo "Failed"
 
@@ -75,7 +75,7 @@
 > out6.tmp
 
    grep -q 'METHOD:REPLY' out6.tmp \
-&& grep -q -v 'FREEBUSY' out6.tmp \
+&& ! grep -q '^FREEBUSY' out6.tmp \
 && echo "Success" \
 || echo "Failed"
 
@@ -87,69 +87,6 @@
 > out7.tmp
 
    grep -q 'METHOD:REPLY' out7.tmp \
-&& 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 \
+&& ! grep -q '^FREEBUSY' out7.tmp \
 && echo "Success" \
 || echo "Failed"
-
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel-recurring-instance.txt 2> /dev/null
-echo "Cancel..."
-
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
-> out10.tmp
-
-   grep -q 'METHOD:REPLY' out10.tmp \
-&& [ `grep 'FREEBUSY;FBTYPE=BUSY' out10.tmp | wc -l` = '2' ] \
-&& grep -q -v 'FREEBUSY;FBTYPE=BUSY:20141114T090000Z/20141114T100000Z' out10.tmp \
-&& echo "Success" \
-|| echo "Failed"
-
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel-recurring.txt 2> /dev/null
-echo "Cancel..."
-
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
-> out11.tmp
-
-   grep -q 'METHOD:REPLY' out11.tmp \
-&& grep -q -v 'FREEBUSY' out11.tmp \
-&& echo "Success" \
-|| echo "Failed"
-
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-recurring-day.txt 2> /dev/null \
-| $SHOWMAIL \
-> out12.tmp
-
-   grep -q 'METHOD:REPLY' out12.tmp \
-&& grep -q 'ATTENDEE;PARTSTAT=ACCEPTED' out12.tmp \
-&& echo "Success" \
-|| echo "Failed"
-
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
-> out13.tmp
-
-   grep -q 'METHOD:REPLY' out13.tmp \
-&& [ `grep 'FREEBUSY;FBTYPE=BUSY' out13.tmp | wc -l` = '3' ] \
-&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141211T230000Z/20141212T230000Z' out13.tmp \
-&& echo "Success" \
-|| echo "Failed"
diff -r dc885408a814 -r 29ac310ee5a6 tests/test_resource_invitation_recurring.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_resource_invitation_recurring.sh	Tue May 19 19:56:55 2015 +0200
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+THIS_DIR=`dirname $0`
+
+TEMPLATES=$THIS_DIR/templates
+RESOURCE_SCRIPT=$THIS_DIR/../imip_resource.py
+SHOWMAIL=$THIS_DIR/../tools/showmail.py
+STORE=/tmp/store
+STATIC=/tmp/static
+ARGS="-S $STORE -P $STATIC -d"
+
+rm -r $STORE
+rm -r $STATIC
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
+| $SHOWMAIL \
+> out0.tmp
+
+   grep -q 'METHOD:REPLY' out0.tmp \
+&& ! grep -q '^FREEBUSY' out0.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-recurring.txt 2> /dev/null \
+| $SHOWMAIL \
+> out2.tmp
+
+   grep -q 'METHOD:REPLY' out2.tmp \
+&& grep -q 'ATTENDEE;PARTSTAT=ACCEPTED' out2.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
+| $SHOWMAIL \
+> out3.tmp
+
+   grep -q 'METHOD:REPLY' out3.tmp \
+&& [ `grep 'FREEBUSY;FBTYPE=BUSY' out3.tmp | wc -l` = '3' ] \
+&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141212T090000Z/20141212T100000Z' out3.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel-recurring-instance.txt 2> /dev/null
+echo "Cancel..."
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
+| $SHOWMAIL \
+> out4.tmp
+
+   grep -q 'METHOD:REPLY' out4.tmp \
+&& [ `grep 'FREEBUSY;FBTYPE=BUSY' out4.tmp | wc -l` = '2' ] \
+&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141114T090000Z/20141114T100000Z' out4.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-recurring-reschedule-instance.txt 2> /dev/null \
+| $SHOWMAIL \
+> out5.tmp
+
+   grep -q 'METHOD:REPLY' out5.tmp \
+&& grep -q 'ATTENDEE;PARTSTAT=ACCEPTED' out5.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
+| $SHOWMAIL \
+> out6.tmp
+
+   grep -q 'METHOD:REPLY' out6.tmp \
+&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141011T080000Z/20141011T090000Z' out6.tmp \
+&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141010T090000Z/20141010T100000Z' out6.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel-recurring.txt 2> /dev/null
+echo "Cancel..."
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
+| $SHOWMAIL \
+> out7.tmp
+
+   grep -q 'METHOD:REPLY' out7.tmp \
+&& ! grep -q '^FREEBUSY' out7.tmp \
+&& echo "Success" \
+|| echo "Failed"
diff -r dc885408a814 -r 29ac310ee5a6 tests/test_resource_invitation_recurring_day.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_resource_invitation_recurring_day.sh	Tue May 19 19:56:55 2015 +0200
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+THIS_DIR=`dirname $0`
+
+TEMPLATES=$THIS_DIR/templates
+RESOURCE_SCRIPT=$THIS_DIR/../imip_resource.py
+SHOWMAIL=$THIS_DIR/../tools/showmail.py
+STORE=/tmp/store
+STATIC=/tmp/static
+ARGS="-S $STORE -P $STATIC -d"
+
+rm -r $STORE
+rm -r $STATIC
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
+| $SHOWMAIL \
+> out0.tmp
+
+   grep -q 'METHOD:REPLY' out0.tmp \
+&& ! grep -q '^FREEBUSY' out0.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-recurring-day.txt 2> /dev/null \
+| $SHOWMAIL \
+> out1.tmp
+
+   grep -q 'METHOD:REPLY' out1.tmp \
+&& grep -q 'ATTENDEE;PARTSTAT=ACCEPTED' out1.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
+| $SHOWMAIL \
+> out2.tmp
+
+   grep -q 'METHOD:REPLY' out2.tmp \
+&& [ `grep 'FREEBUSY;FBTYPE=BUSY' out2.tmp | wc -l` = '3' ] \
+&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141211T230000Z/20141212T230000Z' out2.tmp \
+&& echo "Success" \
+|| echo "Failed"