1.1 --- a/tests/test_resource_invitation_constraints.sh Thu Mar 10 01:43:31 2016 +0100
1.2 +++ b/tests/test_resource_invitation_constraints.sh Fri Mar 11 01:33:45 2016 +0100
1.3 @@ -5,12 +5,6 @@
1.4 USER="mailto:resource-room-sauna@example.com"
1.5 SENDER="mailto:paul.boddie@example.com"
1.6 RIVALSENDER="mailto:vincent.vole@example.com"
1.7 -FBFILE="$STORE/$USER/freebusy"
1.8 -FBOFFERFILE="$STORE/$USER/freebusy-offers"
1.9 -FBSENDERFILE="$STORE/$SENDER/freebusy"
1.10 -FBSENDEROTHERFILE="$STORE/$SENDER/freebusy-other/$USER"
1.11 -FBSENDERREQUESTS="$STORE/$SENDER/requests"
1.12 -FBRIVALSENDERFILE="$STORE/$RIVALSENDER/freebusy"
1.13
1.14 mkdir -p "$PREFS/$USER"
1.15 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
1.16 @@ -32,7 +26,9 @@
1.17
1.18 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-sauna-bad.txt" 2>> $ERROR
1.19
1.20 - grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBSENDERFILE" \
1.21 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.22 +| tee out0f.tmp \
1.23 +| grep -q "^20141126T151000Z${TAB}20141126T154500Z" \
1.24 && echo "Success" \
1.25 || echo "Failed"
1.26
1.27 @@ -48,12 +44,16 @@
1.28 && echo "Success" \
1.29 || echo "Failed"
1.30
1.31 - ! [ -e "$FBFILE" ] \
1.32 -|| ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBFILE" \
1.33 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.34 +> out1f.tmp
1.35 +
1.36 + ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "out1f.tmp" \
1.37 && echo "Success" \
1.38 || echo "Failed"
1.39
1.40 - grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
1.41 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_offers" \
1.42 +| tee out1o.tmp \
1.43 +| grep -q "^20141126T151500Z${TAB}20141126T154500Z" \
1.44 && echo "Success" \
1.45 || echo "Failed"
1.46
1.47 @@ -64,20 +64,28 @@
1.48 | "$SHOWMAIL" \
1.49 > out2.tmp
1.50
1.51 - ( ! [ -e "$FBSENDEROTHERFILE" ] \
1.52 - || ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBSENDEROTHERFILE") \
1.53 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy_other" "$USER" \
1.54 +> out2f.tmp
1.55 +
1.56 + ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "out2f.tmp" \
1.57 && echo "Success" \
1.58 || echo "Failed"
1.59
1.60 - grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' "$STORE/$SENDER/objects/event13@example.com" \
1.61 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "object" "event13@example.com" \
1.62 +| tee out2O.tmp \
1.63 +| grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' \
1.64 && echo "Success" \
1.65 || echo "Failed"
1.66
1.67 - grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161500' "$STORE/$SENDER/counters/objects/event13@example.com/$USER" \
1.68 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "countered_object" "event13@example.com" "$USER" \
1.69 +| tee out2C.tmp \
1.70 +| grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161500' \
1.71 && echo "Success" \
1.72 || echo "Failed"
1.73
1.74 - grep -q 'event13@example.com' "$FBSENDERREQUESTS" \
1.75 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "requests" \
1.76 +| tee out2r.tmp \
1.77 +| grep -q 'event13@example.com' \
1.78 && echo "Success" \
1.79 || echo "Failed"
1.80
1.81 @@ -85,8 +93,11 @@
1.82
1.83 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-sauna-rival.txt" 2>> $ERROR
1.84
1.85 - ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBRIVALSENDERFILE" \
1.86 -&& grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBRIVALSENDERFILE" \
1.87 + "$LIST_SCRIPT" $LIST_ARGS "$RIVALSENDER" "freebusy" \
1.88 +> out2R.tmp
1.89 +
1.90 + ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "out2R.tmp" \
1.91 +&& grep -q "^20141126T153000Z${TAB}20141126T154500Z" "out2R.tmp" \
1.92 && echo "Success" \
1.93 || echo "Failed"
1.94
1.95 @@ -108,12 +119,17 @@
1.96 | "$SHOWMAIL" \
1.97 > out4.tmp
1.98
1.99 - ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBRIVALSENDERFILE" \
1.100 -&& grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBRIVALSENDERFILE" \
1.101 + "$LIST_SCRIPT" $LIST_ARGS "$RIVALSENDER" "freebusy" \
1.102 +> out4R.tmp
1.103 +
1.104 + ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "out4R.tmp" \
1.105 +&& grep -q "^20141126T153000Z${TAB}20141126T154500Z" "out4R.tmp" \
1.106 && echo "Success" \
1.107 || echo "Failed"
1.108
1.109 - grep -q 'ATTENDEE.*;PARTSTAT=DECLINED' "$STORE/$RIVALSENDER/objects/event18@example.com" \
1.110 + "$LIST_SCRIPT" $LIST_ARGS "$RIVALSENDER" "object" "event18@example.com" \
1.111 +| tee out4O.tmp \
1.112 +| grep -q 'ATTENDEE.*;PARTSTAT=DECLINED' \
1.113 && echo "Success" \
1.114 || echo "Failed"
1.115
1.116 @@ -134,9 +150,12 @@
1.117
1.118 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-sauna-good.txt" 2>> $ERROR
1.119
1.120 - ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBSENDERFILE" \
1.121 -&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBSENDERFILE" \
1.122 -&& ! grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBSENDERFILE" \
1.123 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.124 +> out5f.tmp
1.125 +
1.126 + ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "out5f.tmp" \
1.127 +&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "out5f.tmp" \
1.128 +&& ! grep -q "^20141126T153000Z${TAB}20141126T154500Z" "out5f.tmp" \
1.129 && echo "Success" \
1.130 || echo "Failed"
1.131
1.132 @@ -144,7 +163,10 @@
1.133 && echo "Success" \
1.134 || echo "Failed"
1.135
1.136 - ! grep -q 'event13@example.com' "$FBSENDERREQUESTS" \
1.137 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "requests" \
1.138 +> out5r.tmp
1.139 +
1.140 + ! grep -q 'event13@example.com' "out5r.tmp" \
1.141 && echo "Success" \
1.142 || echo "Failed"
1.143
1.144 @@ -159,13 +181,18 @@
1.145 && echo "Success" \
1.146 || echo "Failed"
1.147
1.148 - grep -q "^20141126T150000Z${TAB}20141126T154500Z" "$FBFILE" \
1.149 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.150 +| tee out6f.tmp \
1.151 +| grep -q "^20141126T150000Z${TAB}20141126T154500Z" \
1.152 && echo "Success" \
1.153 || echo "Failed"
1.154
1.155 - ! grep -q "^20141126T150000Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
1.156 -&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
1.157 -&& ! grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
1.158 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_offers" \
1.159 +> out6o.tmp
1.160 +
1.161 + ! grep -q "^20141126T150000Z${TAB}20141126T154500Z" "out6o.tmp" \
1.162 +&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "out6o.tmp" \
1.163 +&& ! grep -q "^20141126T153000Z${TAB}20141126T154500Z" "out6o.tmp" \
1.164 && echo "Success" \
1.165 || echo "Failed"
1.166
1.167 @@ -176,10 +203,13 @@
1.168 | "$SHOWMAIL" \
1.169 > out7.tmp
1.170
1.171 - grep -q "^20141126T150000Z${TAB}20141126T154500Z" "$FBSENDERFILE" \
1.172 -&& ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBSENDERFILE" \
1.173 -&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBSENDERFILE" \
1.174 -&& ! grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBSENDERFILE" \
1.175 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.176 +> out7f.tmp
1.177 +
1.178 + grep -q "^20141126T150000Z${TAB}20141126T154500Z" "out7f.tmp" \
1.179 +&& ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "out7f.tmp" \
1.180 +&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "out7f.tmp" \
1.181 +&& ! grep -q "^20141126T153000Z${TAB}20141126T154500Z" "out7f.tmp" \
1.182 && echo "Success" \
1.183 || echo "Failed"
1.184
1.185 @@ -187,7 +217,10 @@
1.186 && echo "Success" \
1.187 || echo "Failed"
1.188
1.189 - ! grep -q 'event13@example.com' "$FBSENDERREQUESTS" \
1.190 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "requests" \
1.191 +> out7r.tmp
1.192 +
1.193 + ! grep -q 'event13@example.com' "out7r.tmp" \
1.194 && echo "Success" \
1.195 || echo "Failed"
1.196