1.1 --- a/tests/test_person_non_participation.sh Fri Mar 11 18:33:57 2016 +0100
1.2 +++ b/tests/test_person_non_participation.sh Fri Mar 11 18:34:29 2016 +0100
1.3 @@ -5,9 +5,6 @@
1.4 USER="mailto:vincent.vole@example.com"
1.5 IMPOSTER="mailto:oliver.otter@example.com"
1.6 SENDER="mailto:paul.boddie@example.com"
1.7 -FBFILE="$STORE/$USER/freebusy"
1.8 -FBOTHERFILE="$STORE/$USER/freebusy-other/$SENDER"
1.9 -FBIMPOSTERFILE="$STORE/$SENDER/freebusy-other/$IMPOSTER"
1.10
1.11 mkdir -p "$PREFS/$USER"
1.12 echo 'no' > "$PREFS/$USER/participating"
1.13 @@ -27,7 +24,10 @@
1.14
1.15 "$OUTGOING_SCRIPT" < "$TEMPLATES/event-request-person.txt" $ARGS 2>> $ERROR
1.16
1.17 - [ -e "$STORE/$SENDER/objects/event6@example.com" ] \
1.18 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "object" "event6@example.com" \
1.19 +> out0O.tmp
1.20 +
1.21 + grep -q "event6@example.com" "out0O.tmp" \
1.22 && echo "Success" \
1.23 || echo "Failed"
1.24
1.25 @@ -41,11 +41,17 @@
1.26 && echo "Success" \
1.27 || echo "Failed"
1.28
1.29 - ! [ -e "$FBFILE" ] \
1.30 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.31 +> out2f.tmp
1.32 +
1.33 + ! grep -q "event6@example.com" "out2f.tmp" \
1.34 && echo "Success" \
1.35 || echo "Failed"
1.36
1.37 - ! [ -e "$FBOTHERFILE" ] \
1.38 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_other" "$SENDER" \
1.39 +> out2s.tmp
1.40 +
1.41 + ! grep -q "event6@example.com" "out2s.tmp" \
1.42 && echo "Success" \
1.43 || echo "Failed"
1.44
1.45 @@ -55,8 +61,10 @@
1.46 | tee out3.tmp \
1.47 | "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR
1.48
1.49 - ! [ -e "$FBFILE" ] \
1.50 -|| ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
1.51 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.52 +> out2f.tmp
1.53 +
1.54 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2f.tmp" \
1.55 && echo "Success" \
1.56 || echo "Failed"
1.57
1.58 @@ -68,12 +76,16 @@
1.59 | "$SHOWMAIL" \
1.60 > out5.tmp
1.61
1.62 - [ -e "$STORE/$SENDER/objects/event6@example.com" ] \
1.63 -&& ! grep -q "otter" "$STORE/$SENDER/objects/event6@example.com" \
1.64 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "object" "event6@example.com" \
1.65 +> out5O.tmp
1.66 +
1.67 + ! grep -q "otter" "out5O.tmp" \
1.68 && echo "Success" \
1.69 || echo "Failed"
1.70
1.71 - ( ! [ -e "$FBIMPOSTERFILE" ] \
1.72 - || ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBIMPOSTERFILE") \
1.73 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy_other" "$IMPOSTER" \
1.74 +> out5s.tmp
1.75 +
1.76 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out5s.tmp" \
1.77 && echo "Success" \
1.78 || echo "Failed"