1.1 --- a/tests/test_person_invitation_counter.sh Wed Mar 09 21:38:56 2016 +0100
1.2 +++ b/tests/test_person_invitation_counter.sh Thu Mar 10 01:43:31 2016 +0100
1.3 @@ -4,11 +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 -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
1.13 mkdir -p "$PREFS/$USER"
1.14 echo 'Europe/Oslo' > "$PREFS/$USER/TZID"
1.15 @@ -28,7 +23,10 @@
1.16
1.17 "$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-person.txt" 2>> $ERROR
1.18
1.19 - grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDERFILE" \
1.20 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy" \
1.21 +> out0f.tmp
1.22 +
1.23 + grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out0f.tmp" \
1.24 && echo "Success" \
1.25 || echo "Failed"
1.26
1.27 @@ -42,8 +40,10 @@
1.28 && echo "Success" \
1.29 || echo "Failed"
1.30
1.31 - ! [ -e "$FBFILE" ] \
1.32 -|| ! grep -q "event6@example.com" "$FBFILE" \
1.33 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.34 +> out1f.tmp
1.35 +
1.36 + ! grep -q "event6@example.com" "out1f.tmp" \
1.37 && echo "Success" \
1.38 || echo "Failed"
1.39
1.40 @@ -61,9 +61,11 @@
1.41
1.42 # Note that the invitation has only been prepared, not processed.
1.43
1.44 - ! [ -e "$FBFILE" ] \
1.45 -|| ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
1.46 - && ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "$FBFILE" ) \
1.47 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.48 +> out2f.tmp
1.49 +
1.50 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2f.tmp" \
1.51 +&& ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "out2f.tmp" \
1.52 && echo "Success" \
1.53 || echo "Failed"
1.54
1.55 @@ -72,8 +74,10 @@
1.56 && echo "Success" \
1.57 || echo "Failed"
1.58
1.59 - ! [ -e "$FBOFFERFILE" ] \
1.60 -|| ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "$FBOFFERFILE" \
1.61 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_offers" \
1.62 +> out2o.tmp
1.63 +
1.64 + ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "out2o.tmp" \
1.65 && echo "Success" \
1.66 || echo "Failed"
1.67
1.68 @@ -81,13 +85,18 @@
1.69
1.70 "$OUTGOING_SCRIPT" $ARGS < out2r.tmp 2>> $ERROR
1.71
1.72 - ! [ -e "$FBFILE" ] \
1.73 -|| ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
1.74 - && ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "$FBFILE" ) \
1.75 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.76 +> out2f2.tmp
1.77 +
1.78 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out2f2.tmp" \
1.79 +&& ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "out2f2.tmp" \
1.80 && echo "Success" \
1.81 || echo "Failed"
1.82
1.83 - grep -q "^20141126T160000Z${TAB}20141126T170000Z" "$FBOFFERFILE" \
1.84 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_offers" \
1.85 +> out2o2.tmp
1.86 +
1.87 + grep -q "^20141126T160000Z${TAB}20141126T170000Z" "out2o2.tmp" \
1.88 && echo "Success" \
1.89 || echo "Failed"
1.90
1.91 @@ -98,21 +107,32 @@
1.92 | "$SHOWMAIL" \
1.93 > out3.tmp
1.94
1.95 - ! [ -e "$FBSENDEROTHERFILE" ] \
1.96 -|| ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBSENDEROTHERFILE" \
1.97 - && ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "$FBSENDEROTHERFILE" ) \
1.98 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "freebusy_other" "$USER" \
1.99 +> out3f.tmp
1.100 +
1.101 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out3f.tmp" \
1.102 +&& ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "out3f.tmp" \
1.103 && echo "Success" \
1.104 || echo "Failed"
1.105
1.106 - grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T160000' "$STORE/$SENDER/objects/event6@example.com" \
1.107 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "object" "event6@example.com" \
1.108 +> out3O.tmp
1.109 +
1.110 + grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T160000' "out3O.tmp" \
1.111 && echo "Success" \
1.112 || echo "Failed"
1.113
1.114 - grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T170000' "$STORE/$SENDER/counters/objects/event6@example.com/$USER" \
1.115 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "countered_object" "event6@example.com" "$USER" \
1.116 +> out3C.tmp
1.117 +
1.118 + grep -q 'DTSTART;TZID=Europe/Oslo.*:20141126T170000' "out3C.tmp" \
1.119 && echo "Success" \
1.120 || echo "Failed"
1.121
1.122 - grep -q 'event6@example.com' "$FBSENDERREQUESTS" \
1.123 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "requests" \
1.124 +> out3R.tmp
1.125 +
1.126 + grep -q 'event6@example.com' "out3R.tmp" \
1.127 && echo "Success" \
1.128 || echo "Failed"
1.129
1.130 @@ -137,11 +157,17 @@
1.131
1.132 "$OUTGOING_SCRIPT" $ARGS < out5.tmp 2>> $ERROR
1.133
1.134 - ! [ -e "$STORE/$SENDER/counters/objects/event6@example.com/$USER" ] \
1.135 + "$LIST_SCRIPT" $LIST_ARGS "$SENDER" "countered_object" "event6@example.com" "$USER" \
1.136 +> out5C.tmp
1.137 +
1.138 + ! grep -q 'event6@example.com' "out5C.tmp" \
1.139 && echo "Success" \
1.140 || echo "Failed"
1.141
1.142 - ! grep -q 'event6@example.com' "$FBSENDERREQUESTS" \
1.143 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "requests" \
1.144 +> out5R.tmp
1.145 +
1.146 + ! grep -q 'event6@example.com' "out5R.tmp" \
1.147 && echo "Success" \
1.148 || echo "Failed"
1.149
1.150 @@ -149,13 +175,18 @@
1.151 | "$SHOWMAIL" \
1.152 > out6.tmp
1.153
1.154 - ! [ -e "$FBFILE" ] \
1.155 -|| ( ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
1.156 - && ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "$FBFILE" ) \
1.157 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy" \
1.158 +> out6f.tmp
1.159 +
1.160 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out6f.tmp" \
1.161 +&& ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "out6f.tmp" \
1.162 && echo "Success" \
1.163 || echo "Failed"
1.164
1.165 - ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBOFFERFILE" \
1.166 -&& ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "$FBOFFERFILE" \
1.167 + "$LIST_SCRIPT" $LIST_ARGS "$USER" "freebusy_offers" \
1.168 +> out6o.tmp
1.169 +
1.170 + ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "out6o.tmp" \
1.171 +&& ! grep -q "^20141126T160000Z${TAB}20141126T170000Z" "out6o.tmp" \
1.172 && echo "Success" \
1.173 || echo "Failed"