1.1 --- a/tests/common.sh Thu Mar 29 17:30:13 2018 +0200
1.2 +++ b/tests/common.sh Thu Mar 29 23:28:32 2018 +0200
1.3 @@ -56,6 +56,8 @@
1.4 echo "Success"
1.5 }
1.6
1.7 +# Output testing.
1.8 +
1.9 have_occurrences() {
1.10 # <string> <number> [ <filename> ]
1.11 if [ "$3" ]; then
1.12 @@ -83,6 +85,22 @@
1.13 fi
1.14 }
1.15
1.16 +# Specific operations.
1.17 +
1.18 +freebusy_request() {
1.19 + # <filename> <scope> [ resource ]
1.20 + if [ "$2" ]; then
1.21 + SCOPE="-$2"
1.22 + else
1.23 + SCOPE=
1.24 + fi
1.25 + if [ "$3" = 'resource' ]; then
1.26 + resource_script "$TEMPLATES/fb-request$SCOPE.txt" "$1"
1.27 + else
1.28 + person_script "$TEMPLATES/fb-request-person$SCOPE.txt" "$1"
1.29 + fi
1.30 +}
1.31 +
1.32 list_script() {
1.33 # <filename> <arg>...
1.34 FILENAME=$1
1.35 @@ -108,9 +126,18 @@
1.36 > "$2"
1.37 }
1.38
1.39 +resource_script() {
1.40 + # <filename> <output filename> [ <raw output filename> ]
1.41 + OUTFILE="$3"
1.42 + "$RESOURCE_SCRIPT" $ARGS < "$1" 2>> $ERROR \
1.43 + | tee $OUTFILE \
1.44 + | "$SHOWMAIL" \
1.45 + > "$2"
1.46 +}
1.47 +
1.48 showmail() {
1.49 - # <filename>
1.50 - "$SHOWMAIL" < "$1"
1.51 + # <filename> [ <messages to skip> ]
1.52 + "$SHOWMAIL" $2 < "$1" 2>> $ERROR
1.53 }
1.54
1.55 test_freebusy() {
1.56 @@ -127,9 +154,9 @@
1.57 # <user> <command filename> [ <event filename> ]
1.58 LOG=`basename "$2" .tmp`_log.tmp
1.59 if [ "$3" ]; then
1.60 - "$TEXT_CLIENT" $ARGS -u "$1" -f "$3" --echo < "$2" > "$LOG"
1.61 + "$TEXT_CLIENT" $ARGS -u "$1" -f "$3" --echo < "$2" > "$LOG"
1.62 else
1.63 - "$TEXT_CLIENT" $ARGS -u "$1" --echo < "$2" > "$LOG"
1.64 + "$TEXT_CLIENT" $ARGS -u "$1" --echo < "$2" > "$LOG"
1.65 fi
1.66 }
1.67
1.68 @@ -137,14 +164,15 @@
1.69 # <user> <command filename> <uid> [ <recurrence-id> ]
1.70 LOG=`basename "$2" .tmp`_log.tmp
1.71 if [ "$4" ]; then
1.72 - "$TEXT_CLIENT" $ARGS -u "$1" --uid "$3" --recurrence-id "$4" --echo < "$2" > "$LOG"
1.73 + "$TEXT_CLIENT" $ARGS -u "$1" --uid "$3" --recurrence-id "$4" --echo < "$2" > "$LOG"
1.74 else
1.75 - "$TEXT_CLIENT" $ARGS -u "$1" --uid "$3" --echo < "$2" > "$LOG"
1.76 + "$TEXT_CLIENT" $ARGS -u "$1" --uid "$3" --echo < "$2" > "$LOG"
1.77 fi
1.78 }
1.79
1.80 test_initial_freebusy() {
1.81 - person_script "$TEMPLATES/fb-request-person-all.txt" "init_fb.tmp"
1.82 + # [ resource ]
1.83 + freebusy_request "init_fb.tmp" 'all' "$1"
1.84
1.85 # Expect a reply with no periods.
1.86
1.87 @@ -154,7 +182,8 @@
1.88 }
1.89
1.90 test_initial_freebusy_limited() {
1.91 - person_script "$TEMPLATES/fb-request-person.txt" "init_fb_limited.tmp"
1.92 + # [ resource ]
1.93 + freebusy_request "init_fb_limited.tmp" '' "$1"
1.94
1.95 # Expect a reply with no periods.
1.96