1.1 --- a/tests/test_resource_invitation_constraints_alternative.sh Thu Mar 10 01:43:31 2016 +0100
1.2 +++ b/tests/test_resource_invitation_constraints_alternative.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 @@ -47,12 +43,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 @@ -63,21 +63,29 @@
1.48 | "$SHOWMAIL" \
1.49 > out2.tmp
1.50
1.51 - [ ! -e "$FBSENDEROTHERFILE" ] \
1.52 -|| ( ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBSENDEROTHERFILE" \
1.53 - && ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBSENDEROTHERFILE" ) \
1.54 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy_other" "$USER" \
1.55 +> out2f.tmp
1.56 +
1.57 + ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "out2f.tmp" \
1.58 +&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "out2f.tmp" \
1.59 && echo "Success" \
1.60 || echo "Failed"
1.61
1.62 - grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' "$STORE/$SENDER/objects/event13@example.com" \
1.63 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "object" "event13@example.com" \
1.64 +| tee out2O.tmp \
1.65 +| grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161000' \
1.66 && echo "Success" \
1.67 || echo "Failed"
1.68
1.69 - grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161500' "$STORE/$SENDER/counters/objects/event13@example.com/$USER" \
1.70 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "countered_object" "event13@example.com" "$USER" \
1.71 +| tee out2C.tmp \
1.72 +| grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T161500' \
1.73 && echo "Success" \
1.74 || echo "Failed"
1.75
1.76 - grep -q 'event13@example.com' "$FBSENDERREQUESTS" \
1.77 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "requests" \
1.78 +| tee out2R.tmp \
1.79 +| grep -q 'event13@example.com' \
1.80 && echo "Success" \
1.81 || echo "Failed"
1.82
1.83 @@ -94,12 +102,17 @@
1.84 | "$SHOWMAIL" \
1.85 > out4.tmp
1.86
1.87 - ! [ -e "$FBFILE" ] \
1.88 -|| ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBFILE" \
1.89 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.90 +> out4f.tmp
1.91 +
1.92 + ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "out4f.tmp" \
1.93 && echo "Success" \
1.94 || echo "Failed"
1.95
1.96 - ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
1.97 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_offers" \
1.98 +> out4o.tmp
1.99 +
1.100 + ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "out4o.tmp" \
1.101 && echo "Success" \
1.102 || echo "Failed"
1.103
1.104 @@ -107,8 +120,11 @@
1.105
1.106 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-sauna-rival.txt" 2>> $ERROR
1.107
1.108 - ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBRIVALSENDERFILE" \
1.109 -&& grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBRIVALSENDERFILE" \
1.110 + "$LIST_SCRIPT" $LIST_ARGS "$RIVALSENDER" "freebusy" \
1.111 +> out4r.tmp
1.112 +
1.113 + ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "out4r.tmp" \
1.114 +&& grep -q "^20141126T153000Z${TAB}20141126T154500Z" "out4r.tmp" \
1.115 && echo "Success" \
1.116 || echo "Failed"
1.117
1.118 @@ -123,11 +139,16 @@
1.119 && echo "Success" \
1.120 || echo "Failed"
1.121
1.122 - grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBFILE" \
1.123 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.124 +| tee out5f.tmp \
1.125 +| grep -q "^20141126T153000Z${TAB}20141126T154500Z" \
1.126 && echo "Success" \
1.127 || echo "Failed"
1.128
1.129 - ! grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBOFFERFILE" \
1.130 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_offers" \
1.131 +> out5o.tmp
1.132 +
1.133 + ! grep -q "^20141126T153000Z${TAB}20141126T154500Z" "out5o.tmp" \
1.134 && echo "Success" \
1.135 || echo "Failed"
1.136
1.137 @@ -137,13 +158,18 @@
1.138 | "$SHOWMAIL" \
1.139 > out6.tmp
1.140
1.141 - ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "$FBRIVALSENDERFILE" \
1.142 -&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "$FBRIVALSENDERFILE" \
1.143 -&& grep -q "^20141126T153000Z${TAB}20141126T154500Z" "$FBRIVALSENDERFILE" \
1.144 + "$LIST_SCRIPT" $LIST_ARGS "$RIVALSENDER" "freebusy" \
1.145 +> out6r.tmp
1.146 +
1.147 + ! grep -q "^20141126T151000Z${TAB}20141126T154500Z" "out6r.tmp" \
1.148 +&& ! grep -q "^20141126T151500Z${TAB}20141126T154500Z" "out6r.tmp" \
1.149 +&& grep -q "^20141126T153000Z${TAB}20141126T154500Z" "out6r.tmp" \
1.150 && echo "Success" \
1.151 || echo "Failed"
1.152
1.153 - grep -q 'ATTENDEE.*;PARTSTAT=ACCEPTED' "$STORE/$RIVALSENDER/objects/event18@example.com" \
1.154 + "$LIST_SCRIPT" $LIST_ARGS "$RIVALSENDER" "object" "event18@example.com" \
1.155 +| tee out6O.tmp \
1.156 +| grep -q 'ATTENDEE.*;PARTSTAT=ACCEPTED' \
1.157 && echo "Success" \
1.158 || echo "Failed"
1.159