1.1 --- a/tests/test_resource_invitation_constraints.sh Sun Sep 13 20:01:15 2015 +0200
1.2 +++ b/tests/test_resource_invitation_constraints.sh Sun Sep 13 20:02:49 2015 +0200
1.3 @@ -39,19 +39,30 @@
1.4
1.5 "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-sauna-bad.txt" 2>> $ERROR \
1.6 | "$SHOWMAIL" \
1.7 -> out2.tmp
1.8 +> out1.tmp
1.9
1.10 - grep -q 'METHOD:COUNTER' out2.tmp \
1.11 -&& grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161500' out2.tmp \
1.12 + grep -q 'METHOD:COUNTER' out1.tmp \
1.13 +&& grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161500' out1.tmp \
1.14 && echo "Success" \
1.15 || echo "Failed"
1.16
1.17 ! [ -e "$FBFILE" ] \
1.18 -|| ! grep -q "^20141126T151500Z${TAB}20141126T170000Z" "$FBFILE" \
1.19 +|| ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBFILE" \
1.20 +&& echo "Success" \
1.21 +|| echo "Failed"
1.22 +
1.23 + grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
1.24 && echo "Success" \
1.25 || echo "Failed"
1.26
1.27 - grep -q "^20141126T151500Z${TAB}20141126T170000Z" "$FBOFFERFILE" \
1.28 +# Attempt to schedule an event in the proposed period.
1.29 +
1.30 + "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-sauna-rival.txt" 2>> $ERROR \
1.31 +| "$SHOWMAIL" \
1.32 +> out2.tmp
1.33 +
1.34 + grep -q 'METHOD:REPLY' out2.tmp \
1.35 +&& grep -q 'ATTENDEE;PARTSTAT=DECLINED' out2.tmp \
1.36 && echo "Success" \
1.37 || echo "Failed"
1.38
1.39 @@ -60,8 +71,9 @@
1.40 > out3.tmp
1.41
1.42 grep -q 'METHOD:REPLY' out3.tmp \
1.43 -&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T151000Z/20141126T160000Z' out3.tmp \
1.44 -&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T151500Z/20141126T160000Z' out3.tmp \
1.45 +&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T151000Z/20141126T154500Z' out3.tmp \
1.46 +&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T151500Z/20141126T154500Z' out3.tmp \
1.47 +&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T153000Z/20141126T154500Z' out3.tmp \
1.48 && echo "Success" \
1.49 || echo "Failed"
1.50
1.51 @@ -74,12 +86,13 @@
1.52 && echo "Success" \
1.53 || echo "Failed"
1.54
1.55 - grep -q "^20141126T150000Z${TAB}20141126T151500Z" "$FBFILE" \
1.56 + grep -q "^20141126T150000Z${TAB}20141126T154500Z" "$FBFILE" \
1.57 && echo "Success" \
1.58 || echo "Failed"
1.59
1.60 - ! grep -q "^20141126T150000Z${TAB}20141126T151500Z" "$FBOFFERFILE" \
1.61 -&& ! grep -q "^20141126T151500Z${TAB}20141126T170000Z" "$FBOFFERFILE" \
1.62 + ! grep -q "^20141126T150000Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
1.63 +&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
1.64 +&& ! grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
1.65 && echo "Success" \
1.66 || echo "Failed"
1.67
1.68 @@ -88,6 +101,8 @@
1.69 > out6.tmp
1.70
1.71 grep -q 'METHOD:REPLY' out6.tmp \
1.72 -&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T150000Z/20141126T151500Z' out6.tmp \
1.73 +&& grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T150000Z/20141126T154500Z' out6.tmp \
1.74 +&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T151500Z/20141126T154500Z' out6.tmp \
1.75 +&& ! grep -q 'FREEBUSY;FBTYPE=BUSY:20141126T153000Z/20141126T154500Z' out6.tmp \
1.76 && echo "Success" \
1.77 || echo "Failed"