1.1 --- a/tests/test_person_invitation.sh Wed Mar 09 21:38:56 2016 +0100
1.2 +++ b/tests/test_person_invitation.sh Thu Mar 10 01:43:31 2016 +0100
1.3 @@ -4,8 +4,6 @@
1.4
1.5 USER="mailto:vincent.vole@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
1.10 mkdir -p "$PREFS/$USER"
1.11 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
1.12 @@ -37,12 +35,17 @@
1.13 && echo "Success" \
1.14 || echo "Failed"
1.15
1.16 - ! [ -e "$FBFILE" ] \
1.17 -|| ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
1.18 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.19 +> out2f.tmp
1.20 +
1.21 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2f.tmp" \
1.22 && echo "Success" \
1.23 || echo "Failed"
1.24
1.25 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBOTHERFILE" \
1.26 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_other" "$SENDER" \
1.27 +> out2fo.tmp
1.28 +
1.29 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2fo.tmp" \
1.30 && echo "Success" \
1.31 || echo "Failed"
1.32
1.33 @@ -50,7 +53,10 @@
1.34 | tee out3.tmp \
1.35 | "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR
1.36
1.37 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
1.38 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.39 +> out3f.tmp
1.40 +
1.41 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out3f.tmp" \
1.42 && echo "Success" \
1.43 || echo "Failed"
1.44
1.45 @@ -62,11 +68,17 @@
1.46 && echo "Success" \
1.47 || echo "Failed"
1.48
1.49 - ! grep -q "event7@example.com" "$FBFILE" \
1.50 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.51 +> out4f.tmp
1.52 +
1.53 + ! grep -q "event7@example.com" "out4f.tmp" \
1.54 && echo "Success" \
1.55 || echo "Failed"
1.56
1.57 - grep -q "event7@example.com" "$FBOTHERFILE" \
1.58 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_other" "$SENDER" \
1.59 +> out4fo.tmp
1.60 +
1.61 + grep -q "event7@example.com" "out4fo.tmp" \
1.62 && echo "Success" \
1.63 || echo "Failed"
1.64
1.65 @@ -74,8 +86,11 @@
1.66 | tee out5.tmp \
1.67 | "$OUTGOING_SCRIPT" $ARGS 2>> $ERROR
1.68
1.69 - grep -q "event6@example.com" "$FBFILE" \
1.70 -&& ! grep -q "event7@example.com" "$FBFILE" \
1.71 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.72 +> out5f.tmp
1.73 +
1.74 + grep -q "event6@example.com" "out5f.tmp" \
1.75 +&& ! grep -q "event7@example.com" "out5f.tmp" \
1.76 && echo "Success" \
1.77 || echo "Failed"
1.78
1.79 @@ -87,11 +102,17 @@
1.80 && echo "Success" \
1.81 || echo "Failed"
1.82
1.83 - ! grep -q "event6@example.com" "$FBFILE" \
1.84 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.85 +> out6f.tmp
1.86 +
1.87 + ! grep -q "event6@example.com" "out6f.tmp" \
1.88 && echo "Success" \
1.89 || echo "Failed"
1.90
1.91 - grep -q "event6@example.com" "$FBOTHERFILE" \
1.92 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_other" "$SENDER" \
1.93 +> out6fo.tmp
1.94 +
1.95 + grep -q "event6@example.com" "out6fo.tmp" \
1.96 && echo "Success" \
1.97 || echo "Failed"
1.98
1.99 @@ -103,11 +124,17 @@
1.100 && echo "Success" \
1.101 || echo "Failed"
1.102
1.103 - ! grep -q "event6@example.com" "$FBFILE" \
1.104 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.105 +> out7f.tmp
1.106 +
1.107 + ! grep -q "event6@example.com" "out7f.tmp" \
1.108 && echo "Success" \
1.109 || echo "Failed"
1.110
1.111 - ! grep -q "event6@example.com" "$FBOTHERFILE" \
1.112 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_other" "$SENDER" \
1.113 +> out7fo.tmp
1.114 +
1.115 + ! grep -q "event6@example.com" "out7fo.tmp" \
1.116 && echo "Success" \
1.117 || echo "Failed"
1.118
1.119 @@ -119,10 +146,16 @@
1.120 && echo "Success" \
1.121 || echo "Failed"
1.122
1.123 - ! grep -q "spoof2@example.com" "$FBFILE" \
1.124 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.125 +> out8f.tmp
1.126 +
1.127 + ! grep -q "spoof2@example.com" "out8f.tmp" \
1.128 && echo "Success" \
1.129 || echo "Failed"
1.130
1.131 - ! grep -q "spoof2@example.com" "$FBOTHERFILE" \
1.132 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_other" "$SENDER" \
1.133 +> out8fo.tmp
1.134 +
1.135 + ! grep -q "spoof2@example.com" "out8fo.tmp" \
1.136 && echo "Success" \
1.137 || echo "Failed"