# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1432140169 -7200
# Node ID 2c9904fe94b2427fec8cf4fa061d1df36e34e506
# Parent  4553e6a14c4bb70ebb6ff561caf8112e3fd80a63
Added testing of the person handler, employing a special program to accept
requests and emit a response that can be processed using the outgoing handler.
Fixed quoting in the different test scripts.

diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/templates/event-cancel-person.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/templates/event-cancel-person.txt	Wed May 20 18:42:49 2015 +0200
@@ -0,0 +1,38 @@
+Content-Type: multipart/alternative; boundary="===============0047278175=="
+MIME-Version: 1.0
+From: paul.boddie@example.com
+To: vincent.vole@example.com
+Subject: Cancellation!
+
+Cancel the event for vincent.vole and paul.boddie. The free/busy details for
+the recipients should be updated, even those employing the person handler.
+
+--===============0047278175==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+This message contains an event.
+--===============0047278175==
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Content-Type: text/calendar; charset="us-ascii"; method="CANCEL"
+
+BEGIN:VCALENDAR
+PRODID:-//imip-agent/test//EN
+METHOD:CANCEL
+VERSION:2.0
+BEGIN:VEVENT
+ORGANIZER:mailto:paul.boddie@example.com
+ATTENDEE;RSVP=TRUE:mailto:vincent.vole@example.com
+ATTENDEE;RSVP=TRUE:mailto:paul.boddie@example.com
+DTSTAMP:20141125T004600Z
+DTSTART;TZID=Europe/Oslo:20141126T160000
+DTEND;TZID=Europe/Oslo:20141126T170000
+SUMMARY:Meeting at 4pm
+UID:event6@example.com
+SEQUENCE:2
+END:VEVENT
+END:VCALENDAR
+
+--===============0047278175==--
diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/templates/event-request-person.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/templates/event-request-person.txt	Wed May 20 18:42:49 2015 +0200
@@ -0,0 +1,36 @@
+Content-Type: multipart/alternative; boundary="===============0047278175=="
+MIME-Version: 1.0
+From: paul.boddie@example.com
+To: vincent.vole@example.com
+Subject: Invitation!
+
+Test invitation of people, checking their status afterwards.
+
+--===============0047278175==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+This message contains an event.
+--===============0047278175==
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Content-Type: text/calendar; charset="us-ascii"; method="REQUEST"
+
+BEGIN:VCALENDAR
+PRODID:-//imip-agent/test//EN
+METHOD:REQUEST
+VERSION:2.0
+BEGIN:VEVENT
+ORGANIZER:mailto:paul.boddie@example.com
+ATTENDEE;ROLE=CHAIR:mailto:paul.boddie@example.com
+ATTENDEE;RSVP=TRUE:mailto:vincent.vole@example.com
+DTSTAMP:20141125T004600Z
+DTSTART;TZID=Europe/Oslo:20141126T160000
+DTEND;TZID=Europe/Oslo:20141126T170000
+SUMMARY:Meeting at 4pm
+UID:event6@example.com
+END:VEVENT
+END:VCALENDAR
+
+--===============0047278175==--
diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/templates/fb-request-person-all.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/templates/fb-request-person-all.txt	Wed May 20 18:42:49 2015 +0200
@@ -0,0 +1,29 @@
+Content-Type: multipart/alternative; boundary="===============0945993647=="
+MIME-Version: 1.0
+From: paul.boddie@example.com
+To: vincent.vole@example.com
+
+--===============0945993647==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+This message contains a free/busy request.
+--===============0945993647==
+Content-Type: text/calendar; charset="us-ascii"; method="REQUEST"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+BEGIN:VCALENDAR
+PRODID:-//imip-agent/test//EN
+METHOD:REQUEST
+VERSION:2.0
+BEGIN:VFREEBUSY
+ORGANIZER:mailto:paul.boddie@example.com
+ATTENDEE:mailto:vincent.vole@example.com
+DTSTAMP:20141125T164400Z
+UID:fb5@example.com
+END:VFREEBUSY
+END:VCALENDAR
+
+--===============0945993647==--
diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/templates/fb-request-person.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/templates/fb-request-person.txt	Wed May 20 18:42:49 2015 +0200
@@ -0,0 +1,31 @@
+Content-Type: multipart/alternative; boundary="===============0945993647=="
+MIME-Version: 1.0
+From: paul.boddie@example.com
+To: vincent.vole@example.com
+
+--===============0945993647==
+Content-Type: text/plain; charset="us-ascii"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+This message contains a free/busy request.
+--===============0945993647==
+Content-Type: text/calendar; charset="us-ascii"; method="REQUEST"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+BEGIN:VCALENDAR
+PRODID:-//imip-agent/test//EN
+METHOD:REQUEST
+VERSION:2.0
+BEGIN:VFREEBUSY
+ORGANIZER:mailto:paul.boddie@example.com
+ATTENDEE:mailto:vincent.vole@example.com
+DTSTAMP:20141125T164400Z
+DTSTART:20141126T150000Z
+DTEND:20141126T180000Z
+UID:fb4@example.com
+END:VFREEBUSY
+END:VCALENDAR
+
+--===============0945993647==--
diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/test_accept.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_accept.py	Wed May 20 18:42:49 2015 +0200
@@ -0,0 +1,101 @@
+#!/usr/bin/env python
+
+"""
+A handler to help with testing.
+
+Copyright (C) 2014, 2015 Paul Boddie <paul@boddie.org.uk>
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 3 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details.
+
+You should have received a copy of the GNU General Public License along with
+this program.  If not, see <http://www.gnu.org/licenses/>.
+"""
+
+from imiptools.client import Client
+from imiptools.data import Object, get_address
+from imiptools.handlers import Handler
+from imiptools.mail import Messenger
+import imip_store
+import sys
+
+class TestHandler(Handler):
+
+    """
+    A content handler for use in testing, as opposed to operating within the
+    mail processing pipeline.
+    """
+
+    def __init__(self, obj, user, messenger):
+        Handler.__init__(self, messenger=messenger)
+        Client.__init__(self, user) # this redefines the Handler initialisation
+
+        self.set_object(obj)
+
+    # Action methods.
+
+    def accept_request(self):
+
+        """
+        Process the current request for the current user. Return whether any
+        action was taken.
+        """
+
+        # Reply only on behalf of this user.
+
+        attendee_attr = self.update_participation(self.obj, "ACCEPTED")
+
+        if not attendee_attr:
+            return None
+
+        # NOTE: This is a simpler form of the code in imipweb.handler.
+
+        organiser = get_address(self.obj.get_value("ORGANIZER"))
+
+        self.obj["ATTENDEE"] = [(self.user, attendee_attr)]
+        self.update_dtstamp()
+        self.set_sequence(False)
+
+        message = self.messenger.make_outgoing_message(
+            [self.obj.to_part("REPLY")],
+            [organiser],
+            outgoing_bcc=get_address(self.user)
+            )
+
+        return message.as_string()
+
+# A simple main program that attempts to accept a stored request, writing the
+# response message to standard output.
+
+if __name__ == "__main__":
+    try:
+        store_dir, user, uid, recurrenceid = (sys.argv[1:5] + [None])[:4]
+    except ValueError:
+        print >>sys.stderr, "Need a store directory, user URI, event UID and optional RECURRENCE-ID."
+        sys.exit(1)
+
+    store = imip_store.FileStore(store_dir)
+    fragment = store.get_event(user, uid, recurrenceid)
+
+    if not fragment:
+        print >>sys.stderr, "No such event:", uid, recurrenceid
+        sys.exit(1)
+
+    obj = Object(fragment)
+    handler = TestHandler(obj, user, Messenger())
+    response = handler.accept_request()
+
+    if response:
+        store.dequeue_request(user, uid, recurrenceid)
+        print response
+    else:
+        sys.exit(1)
+
+# vim: tabstop=4 expandtab shiftwidth=4
diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/test_multiple_invitation.sh
--- a/tests/test_multiple_invitation.sh	Wed May 20 18:39:06 2015 +0200
+++ b/tests/test_multiple_invitation.sh	Wed May 20 18:42:49 2015 +0200
@@ -2,9 +2,9 @@
 
 THIS_DIR=`dirname $0`
 
-TEMPLATES=$THIS_DIR/templates
-RESOURCE_SCRIPT=$THIS_DIR/../imip_resource.py
-SHOWMAIL=$THIS_DIR/../tools/showmail.py
+TEMPLATES="$THIS_DIR/templates"
+RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py"
+SHOWMAIL="$THIS_DIR/../tools/showmail.py"
 STORE=/tmp/store
 STATIC=/tmp/static
 ARGS="-S $STORE -P $STATIC -d"
@@ -12,8 +12,8 @@
 rm -r $STORE
 rm -r $STATIC
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
+| "$SHOWMAIL" \
 > out0.tmp
 
    grep -q 'METHOD:REPLY' out0.tmp \
@@ -21,8 +21,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
+| "$SHOWMAIL" \
 > out1.tmp
 
    grep -q 'METHOD:REPLY' out1.tmp \
@@ -30,8 +30,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS -o 'resource-room-confroom@example.com' < $TEMPLATES/event-request-multiple.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/event-request-multiple.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out2.tmp
 
    grep -q 'METHOD:REPLY' out2.tmp \
@@ -39,8 +39,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS -o 'resource-car-porsche911@example.com' < $TEMPLATES/event-request-multiple.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/event-request-multiple.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out3.tmp
 
    grep -q 'METHOD:REPLY' out3.tmp \
@@ -48,8 +48,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS -o 'resource-room-confroom@example.com' < $TEMPLATES/fb-request.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/fb-request.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out4.tmp
 
    grep -q 'METHOD:REPLY' out4.tmp \
@@ -57,8 +57,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS -o 'resource-car-porsche911@example.com' < $TEMPLATES/fb-request-car.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/fb-request-car.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out5.tmp
 
    grep -q 'METHOD:REPLY' out5.tmp \
@@ -66,11 +66,11 @@
 && echo "Success" \
 || echo "Failed"
 
-$RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel-multiple-attendee.txt 2> /dev/null
+"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-multiple-attendee.txt" 2> /dev/null
 echo "Cancel..."
 
-  $RESOURCE_SCRIPT $ARGS -o 'resource-room-confroom@example.com' < $TEMPLATES/fb-request.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS -o 'resource-room-confroom@example.com' < "$TEMPLATES/fb-request.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out6.tmp
 
    grep -q 'METHOD:REPLY' out6.tmp \
@@ -78,8 +78,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS -o 'resource-car-porsche911@example.com' < $TEMPLATES/fb-request-car.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS -o 'resource-car-porsche911@example.com' < "$TEMPLATES/fb-request-car.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out7.tmp
 
    grep -q 'METHOD:REPLY' out7.tmp \
diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/test_outgoing_invitation.sh
--- a/tests/test_outgoing_invitation.sh	Wed May 20 18:39:06 2015 +0200
+++ b/tests/test_outgoing_invitation.sh	Wed May 20 18:42:49 2015 +0200
@@ -2,9 +2,9 @@
 
 THIS_DIR=`dirname $0`
 
-TEMPLATES=$THIS_DIR/templates
-OUTGOING_SCRIPT=$THIS_DIR/../imip_person_outgoing.py
-SHOWMAIL=$THIS_DIR/../tools/showmail.py
+TEMPLATES="$THIS_DIR/templates"
+OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py"
+SHOWMAIL="$THIS_DIR/../tools/showmail.py"
 STORE=/tmp/store
 STATIC=/tmp/static
 ARGS="-S $STORE -P $STATIC -d"
@@ -15,14 +15,14 @@
 rm -r $STORE
 rm -r $STATIC
 
-$OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-request.txt 2> /dev/null
+"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2> /dev/null
 cp "$FBFILE" out1.tmp
 
    grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
 && echo "Success" \
 || echo "Failed"
 
-$OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-cancel.txt 2> /dev/null
+"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2> /dev/null
 echo "Cancel..."
 cp "$FBFILE" out2.tmp
 
@@ -30,7 +30,7 @@
 && echo "Success" \
 || echo "Failed"
 
-$OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-request-recurring.txt 2> /dev/null
+"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring.txt" 2> /dev/null
 cp "$FBFILE" out3.tmp
 
    [ `cat "$FBFILE" | wc -l` = '3' ] \
@@ -38,7 +38,7 @@
 && echo "Success" \
 || echo "Failed"
 
-$OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-cancel-recurring-instance.txt 2> /dev/null
+"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring-instance.txt" 2> /dev/null
 cp "$FBFILE" out4.tmp
 
    [ `cat "$FBFILE" | wc -l` = '2' ] \
@@ -46,7 +46,7 @@
 && echo "Success" \
 || echo "Failed"
 
-$OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-request-recurring-reschedule-instance.txt 2> /dev/null
+"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-reschedule-instance.txt" 2> /dev/null
 cp "$FBFILE" out5.tmp
 
    grep -q "^20141011T080000Z${TAB}20141011T090000Z" "$FBFILE" \
@@ -54,14 +54,14 @@
 && echo "Success" \
 || echo "Failed"
 
-$OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-cancel-recurring.txt 2> /dev/null
+"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring.txt" 2> /dev/null
 cp "$FBFILE" out6.tmp
 
    ! grep -q '^2' "$FBFILE" \
 && echo "Success" \
 || echo "Failed"
 
-$OUTGOING_SCRIPT $ARGS < $TEMPLATES/event-request-recurring-day.txt 2> /dev/null
+"$OUTGOING_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-day.txt" 2> /dev/null
 cp "$FBFILE" out7.tmp
 
    [ `cat "$FBFILE" | wc -l` = '3' ] \
diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/test_person_invitation.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test_person_invitation.sh	Wed May 20 18:42:49 2015 +0200
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+THIS_DIR=`dirname $0`
+
+TEMPLATES="$THIS_DIR/templates"
+PERSON_SCRIPT="$THIS_DIR/../imip_person.py"
+SHOWMAIL="$THIS_DIR/../tools/showmail.py"
+STORE=/tmp/store
+STATIC=/tmp/static
+ARGS="-S $STORE -P $STATIC -d"
+USER="mailto:vincent.vole@example.com"
+SENDER="mailto:paul.boddie@example.com"
+FBFILE="$STORE/$USER/freebusy"
+FBOTHERFILE="$STORE/$USER/freebusy-other/$SENDER"
+TAB=`printf '\t'`
+
+OUTGOING_SCRIPT="$THIS_DIR/../imip_person_outgoing.py"
+
+PYTHONPATH="$THIS_DIR/.."
+export PYTHONPATH
+
+ACCEPT_SCRIPT="$THIS_DIR/test_accept.py"
+ACCEPT_ARGS="$STORE"
+
+rm -r $STORE
+rm -r $STATIC
+
+  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person-all.txt" 2> /dev/null \
+| "$SHOWMAIL" \
+> out0.tmp
+
+   grep -q 'METHOD:REPLY' out0.tmp \
+&& ! grep -q '^FREEBUSY' out0.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/fb-request-person.txt" 2> /dev/null \
+| "$SHOWMAIL" \
+> out1.tmp
+
+   grep -q 'METHOD:REPLY' out1.tmp \
+&& ! grep -q '^FREEBUSY' out1.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+  "$PERSON_SCRIPT" $ARGS < "$TEMPLATES/event-request-person.txt" 2> /dev/null \
+| "$SHOWMAIL" \
+> out2.tmp
+
+   ! grep -q 'METHOD:REPLY' out2.tmp \
+&& echo "Success" \
+|| echo "Failed"
+
+   ! grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
+&& echo "Success" \
+|| echo "Failed"
+
+   grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBOTHERFILE" \
+&& echo "Success" \
+|| echo "Failed"
+
+  "$ACCEPT_SCRIPT" $ACCEPT_ARGS "$USER" "event6@example.com" \
+| tee out3.tmp \
+| "$OUTGOING_SCRIPT" $ARGS
+
+   grep -q "^20141126T150000Z${TAB}20141126T160000Z" "$FBFILE" \
+&& echo "Success" \
+|| echo "Failed"
diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/test_resource_invitation.sh
--- a/tests/test_resource_invitation.sh	Wed May 20 18:39:06 2015 +0200
+++ b/tests/test_resource_invitation.sh	Wed May 20 18:42:49 2015 +0200
@@ -2,9 +2,9 @@
 
 THIS_DIR=`dirname $0`
 
-TEMPLATES=$THIS_DIR/templates
-RESOURCE_SCRIPT=$THIS_DIR/../imip_resource.py
-SHOWMAIL=$THIS_DIR/../tools/showmail.py
+TEMPLATES="$THIS_DIR/templates"
+RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py"
+SHOWMAIL="$THIS_DIR/../tools/showmail.py"
 STORE=/tmp/store
 STATIC=/tmp/static
 ARGS="-S $STORE -P $STATIC -d"
@@ -12,8 +12,8 @@
 rm -r $STORE
 rm -r $STATIC
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out0.tmp
 
    grep -q 'METHOD:REPLY' out0.tmp \
@@ -21,8 +21,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out1.tmp
 
    grep -q 'METHOD:REPLY' out1.tmp \
@@ -30,8 +30,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out2.tmp
 
    grep -q 'METHOD:REPLY' out2.tmp \
@@ -39,8 +39,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out3.tmp
 
    grep -q 'METHOD:REPLY' out3.tmp \
@@ -48,8 +48,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-conflict.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-conflict.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out4.tmp
 
    grep -q 'METHOD:REPLY' out4.tmp \
@@ -57,8 +57,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out5.tmp
 
    grep -q 'METHOD:REPLY' out5.tmp \
@@ -67,11 +67,11 @@
 && echo "Success" \
 || echo "Failed"
 
-$RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel.txt 2> /dev/null
+"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel.txt" 2> /dev/null
 echo "Cancel..."
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out6.tmp
 
    grep -q 'METHOD:REPLY' out6.tmp \
@@ -79,11 +79,11 @@
 && echo "Success" \
 || echo "Failed"
 
-$RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-spoofed.txt 2> /dev/null
+"$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-spoofed.txt" 2> /dev/null
 echo "Spoof..."
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out7.tmp
 
    grep -q 'METHOD:REPLY' out7.tmp \
diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/test_resource_invitation_recurring.sh
--- a/tests/test_resource_invitation_recurring.sh	Wed May 20 18:39:06 2015 +0200
+++ b/tests/test_resource_invitation_recurring.sh	Wed May 20 18:42:49 2015 +0200
@@ -2,9 +2,9 @@
 
 THIS_DIR=`dirname $0`
 
-TEMPLATES=$THIS_DIR/templates
-RESOURCE_SCRIPT=$THIS_DIR/../imip_resource.py
-SHOWMAIL=$THIS_DIR/../tools/showmail.py
+TEMPLATES="$THIS_DIR/templates"
+RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py"
+SHOWMAIL="$THIS_DIR/../tools/showmail.py"
 STORE=/tmp/store
 STATIC=/tmp/static
 ARGS="-S $STORE -P $STATIC -d"
@@ -12,8 +12,8 @@
 rm -r $STORE
 rm -r $STATIC
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out0.tmp
 
    grep -q 'METHOD:REPLY' out0.tmp \
@@ -21,8 +21,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-recurring.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out2.tmp
 
    grep -q 'METHOD:REPLY' out2.tmp \
@@ -30,8 +30,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out3.tmp
 
    grep -q 'METHOD:REPLY' out3.tmp \
@@ -40,11 +40,11 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel-recurring-instance.txt 2> /dev/null
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring-instance.txt" 2> /dev/null
 echo "Cancel..."
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out4.tmp
 
    grep -q 'METHOD:REPLY' out4.tmp \
@@ -53,8 +53,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-recurring-reschedule-instance.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-reschedule-instance.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out5.tmp
 
    grep -q 'METHOD:REPLY' out5.tmp \
@@ -62,8 +62,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out6.tmp
 
    grep -q 'METHOD:REPLY' out6.tmp \
@@ -72,11 +72,11 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-cancel-recurring.txt 2> /dev/null
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-cancel-recurring.txt" 2> /dev/null
 echo "Cancel..."
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out7.tmp
 
    grep -q 'METHOD:REPLY' out7.tmp \
diff -r 4553e6a14c4b -r 2c9904fe94b2 tests/test_resource_invitation_recurring_day.sh
--- a/tests/test_resource_invitation_recurring_day.sh	Wed May 20 18:39:06 2015 +0200
+++ b/tests/test_resource_invitation_recurring_day.sh	Wed May 20 18:42:49 2015 +0200
@@ -2,9 +2,9 @@
 
 THIS_DIR=`dirname $0`
 
-TEMPLATES=$THIS_DIR/templates
-RESOURCE_SCRIPT=$THIS_DIR/../imip_resource.py
-SHOWMAIL=$THIS_DIR/../tools/showmail.py
+TEMPLATES="$THIS_DIR/templates"
+RESOURCE_SCRIPT="$THIS_DIR/../imip_resource.py"
+SHOWMAIL="$THIS_DIR/../tools/showmail.py"
 STORE=/tmp/store
 STATIC=/tmp/static
 ARGS="-S $STORE -P $STATIC -d"
@@ -12,8 +12,8 @@
 rm -r $STORE
 rm -r $STATIC
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out0.tmp
 
    grep -q 'METHOD:REPLY' out0.tmp \
@@ -21,8 +21,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/event-request-recurring-day.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/event-request-recurring-day.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out1.tmp
 
    grep -q 'METHOD:REPLY' out1.tmp \
@@ -30,8 +30,8 @@
 && echo "Success" \
 || echo "Failed"
 
-  $RESOURCE_SCRIPT $ARGS < $TEMPLATES/fb-request-all.txt 2> /dev/null \
-| $SHOWMAIL \
+  "$RESOURCE_SCRIPT" $ARGS < "$TEMPLATES/fb-request-all.txt" 2> /dev/null \
+| "$SHOWMAIL" \
 > out2.tmp
 
    grep -q 'METHOD:REPLY' out2.tmp \