# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1522358912 -7200
# Node ID 977b3f6d785acd631e4dec759ec1113e165a579a
# Parent  f3e78bbc8fb8df3a7b87a9faaf9e5dbfb9ca67a9
Introduced resource_script and freebusy_request functions.
Added missing error stream redirection for the showmail function, also adding an
optional messages-to-skip parameter.
Reformatted some commands.

diff -r f3e78bbc8fb8 -r 977b3f6d785a tests/common.sh
--- a/tests/common.sh	Thu Mar 29 17:30:13 2018 +0200
+++ b/tests/common.sh	Thu Mar 29 23:28:32 2018 +0200
@@ -56,6 +56,8 @@
     echo "Success"
 }
 
+# Output testing.
+
 have_occurrences() {
     # <string> <number> [ <filename> ]
     if [ "$3" ]; then
@@ -83,6 +85,22 @@
     fi
 }
 
+# Specific operations.
+
+freebusy_request() {
+    # <filename> <scope> [ resource ]
+    if [ "$2" ]; then
+        SCOPE="-$2"
+    else
+        SCOPE=
+    fi
+    if [ "$3" = 'resource' ]; then
+        resource_script "$TEMPLATES/fb-request$SCOPE.txt" "$1"
+    else
+        person_script "$TEMPLATES/fb-request-person$SCOPE.txt" "$1"
+    fi
+}
+
 list_script() {
     # <filename> <arg>...
     FILENAME=$1
@@ -108,9 +126,18 @@
     > "$2"
 }
 
+resource_script() {
+    # <filename> <output filename> [ <raw output filename> ]
+    OUTFILE="$3"
+      "$RESOURCE_SCRIPT" $ARGS < "$1" 2>> $ERROR \
+    | tee $OUTFILE \
+    | "$SHOWMAIL" \
+    > "$2"
+}
+
 showmail() {
-    # <filename>
-    "$SHOWMAIL" < "$1"
+    # <filename> [ <messages to skip> ]
+    "$SHOWMAIL" $2 < "$1" 2>> $ERROR
 }
 
 test_freebusy() {
@@ -127,9 +154,9 @@
     # <user> <command filename> [ <event filename> ]
     LOG=`basename "$2" .tmp`_log.tmp
     if [ "$3" ]; then
-          "$TEXT_CLIENT" $ARGS -u "$1" -f "$3" --echo < "$2" > "$LOG"
+        "$TEXT_CLIENT" $ARGS -u "$1" -f "$3" --echo < "$2" > "$LOG"
     else
-          "$TEXT_CLIENT" $ARGS -u "$1" --echo < "$2" > "$LOG"
+        "$TEXT_CLIENT" $ARGS -u "$1" --echo < "$2" > "$LOG"
     fi
 }
 
@@ -137,14 +164,15 @@
     # <user> <command filename> <uid> [ <recurrence-id> ]
     LOG=`basename "$2" .tmp`_log.tmp
     if [ "$4" ]; then
-          "$TEXT_CLIENT" $ARGS -u "$1" --uid "$3" --recurrence-id "$4" --echo < "$2" > "$LOG"
+        "$TEXT_CLIENT" $ARGS -u "$1" --uid "$3" --recurrence-id "$4" --echo < "$2" > "$LOG"
     else
-          "$TEXT_CLIENT" $ARGS -u "$1" --uid "$3" --echo < "$2" > "$LOG"
+        "$TEXT_CLIENT" $ARGS -u "$1" --uid "$3" --echo < "$2" > "$LOG"
     fi
 }
 
 test_initial_freebusy() {
-    person_script "$TEMPLATES/fb-request-person-all.txt" "init_fb.tmp"
+    # [ resource ]
+    freebusy_request "init_fb.tmp" 'all' "$1"
 
     # Expect a reply with no periods.
 
@@ -154,7 +182,8 @@
 }
 
 test_initial_freebusy_limited() {
-    person_script "$TEMPLATES/fb-request-person.txt" "init_fb_limited.tmp"
+    # [ resource ]
+    freebusy_request "init_fb_limited.tmp" '' "$1"
 
     # Expect a reply with no periods.