1.1 --- a/tests/templates/event-request-sauna-bad.txt Sun Sep 13 20:01:15 2015 +0200
1.2 +++ b/tests/templates/event-request-sauna-bad.txt Sun Sep 13 20:02:49 2015 +0200
1.3 @@ -25,7 +25,7 @@
1.4 ATTENDEE;RSVP=TRUE:mailto:resource-room-sauna@example.com
1.5 DTSTAMP:20141125T004600Z
1.6 DTSTART;TZID=Europe/Oslo:20141126T161000
1.7 -DTEND;TZID=Europe/Oslo:20141126T170000
1.8 +DTEND;TZID=Europe/Oslo:20141126T164500
1.9 SUMMARY:Meeting at 4:10pm
1.10 UID:event13@example.com
1.11 END:VEVENT
2.1 --- a/tests/templates/event-request-sauna-good.txt Sun Sep 13 20:01:15 2015 +0200
2.2 +++ b/tests/templates/event-request-sauna-good.txt Sun Sep 13 20:02:49 2015 +0200
2.3 @@ -25,7 +25,7 @@
2.4 ATTENDEE;RSVP=TRUE:mailto:resource-room-sauna@example.com
2.5 DTSTAMP:20141125T004600Z
2.6 DTSTART;TZID=Europe/Oslo:20141126T160000
2.7 -DTEND;TZID=Europe/Oslo:20141126T161500
2.8 +DTEND;TZID=Europe/Oslo:20141126T164500
2.9 SUMMARY:Meeting at 4pm
2.10 UID:event13@example.com
2.11 END:VEVENT
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/tests/templates/event-request-sauna-rival.txt Sun Sep 13 20:02:49 2015 +0200
3.3 @@ -0,0 +1,34 @@
3.4 +Content-Type: multipart/alternative; boundary="===============0047278175=="
3.5 +MIME-Version: 1.0
3.6 +From: vincent.vole@example.com
3.7 +To: resource-room-sauna@example.com
3.8 +Subject: Invitation!
3.9 +
3.10 +--===============0047278175==
3.11 +Content-Type: text/plain; charset="us-ascii"
3.12 +MIME-Version: 1.0
3.13 +Content-Transfer-Encoding: 7bit
3.14 +
3.15 +This message contains an event.
3.16 +--===============0047278175==
3.17 +MIME-Version: 1.0
3.18 +Content-Transfer-Encoding: 7bit
3.19 +Content-Type: text/calendar; charset="us-ascii"; method="REQUEST"
3.20 +
3.21 +BEGIN:VCALENDAR
3.22 +PRODID:-//imip-agent/test//EN
3.23 +METHOD:REQUEST
3.24 +VERSION:2.0
3.25 +BEGIN:VEVENT
3.26 +ORGANIZER:mailto:vincent.vole@example.com
3.27 +ATTENDEE;ROLE=CHAIR:mailto:vincent.vole@example.com
3.28 +ATTENDEE;RSVP=TRUE:mailto:resource-room-sauna@example.com
3.29 +DTSTAMP:20141125T004600Z
3.30 +DTSTART;TZID=Europe/Oslo:20141126T163000
3.31 +DTEND;TZID=Europe/Oslo:20141126T164500
3.32 +SUMMARY:Meeting at 4:30pm
3.33 +UID:event18@example.com
3.34 +END:VEVENT
3.35 +END:VCALENDAR
3.36 +
3.37 +--===============0047278175==--
4.1 --- a/tests/test_resource_invitation_constraints.sh Sun Sep 13 20:01:15 2015 +0200
4.2 +++ b/tests/test_resource_invitation_constraints.sh Sun Sep 13 20:02:49 2015 +0200
4.3 @@ -39,19 +39,30 @@
4.4
4.5 "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-sauna-bad.txt" 2>> $ERROR \
4.6 | "$SHOWMAIL" \
4.7 -> out2.tmp
4.8 +> out1.tmp
4.9
4.10 - grep -q 'METHOD:COUNTER' out2.tmp \
4.11 -&& grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161500' out2.tmp \
4.12 + grep -q 'METHOD:COUNTER' out1.tmp \
4.13 +&& grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161500' out1.tmp \
4.14 && echo "Success" \
4.15 || echo "Failed"
4.16
4.17 ! [ -e "$FBFILE" ] \
4.18 -|| ! grep -q "^20141126T151500Z${TAB}20141126T170000Z" "$FBFILE" \
4.19 +|| ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBFILE" \
4.20 +&& echo "Success" \
4.21 +|| echo "Failed"
4.22 +
4.23 + grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
4.24 && echo "Success" \
4.25 || echo "Failed"
4.26
4.27 - grep -q "^20141126T151500Z${TAB}20141126T170000Z" "$FBOFFERFILE" \
4.28 +# Attempt to schedule an event in the proposed period.
4.29 +
4.30 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-sauna-rival.txt" 2>> $ERROR \
4.31 +| "$SHOWMAIL" \
4.32 +> out2.tmp
4.33 +
4.34 + grep -q 'METHOD:REPLY' out2.tmp \
4.35 +&& grep -q 'ATTENDEE;PARTSTAT=DECLINED' out2.tmp \
4.36 && echo "Success" \
4.37 || echo "Failed"
4.38
4.39 @@ -60,8 +71,9 @@
4.40 > out3.tmp
4.41
4.42 grep -q 'METHOD:REPLY' out3.tmp \
4.43 -&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T151000Z/20141126T160000Z' out3.tmp \
4.44 -&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T151500Z/20141126T160000Z' out3.tmp \
4.45 +&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T151000Z/20141126T154500Z' out3.tmp \
4.46 +&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T151500Z/20141126T154500Z' out3.tmp \
4.47 +&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T153000Z/20141126T154500Z' out3.tmp \
4.48 && echo "Success" \
4.49 || echo "Failed"
4.50
4.51 @@ -74,12 +86,13 @@
4.52 && echo "Success" \
4.53 || echo "Failed"
4.54
4.55 - grep -q "^20141126T150000Z${TAB}20141126T151500Z" "$FBFILE" \
4.56 + grep -q "^20141126T150000Z${TAB}20141126T154500Z" "$FBFILE" \
4.57 && echo "Success" \
4.58 || echo "Failed"
4.59
4.60 - ! grep -q "^20141126T150000Z${TAB}20141126T151500Z" "$FBOFFERFILE" \
4.61 -&& ! grep -q "^20141126T151500Z${TAB}20141126T170000Z" "$FBOFFERFILE" \
4.62 + ! grep -q "^20141126T150000Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
4.63 +&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
4.64 +&& ! grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
4.65 && echo "Success" \
4.66 || echo "Failed"
4.67
4.68 @@ -88,6 +101,8 @@
4.69 > out6.tmp
4.70
4.71 grep -q 'METHOD:REPLY' out6.tmp \
4.72 -&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T150000Z/20141126T151500Z' out6.tmp \
4.73 +&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T150000Z/20141126T154500Z' out6.tmp \
4.74 +&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T151500Z/20141126T154500Z' out6.tmp \
4.75 +&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T153000Z/20141126T154500Z' out6.tmp \
4.76 && echo "Success" \
4.77 || echo "Failed"