Move files from python code directories to their new location in share/tests/

2 files changed, 19 insertions, 18 deletions

diff --git a/pykolab/tests/kaddress-contact.tpl b/share/tests/kaddress-contact.tpl
index f4fa7bb..f4fa7bb 100644
--- a/pykolab/tests/kaddress-contact.tpl
+++ b/share/tests/kaddress-contact.tpl
diff --git a/pykolab/tests/kcal-event.tpl b/share/tests/kcal-event.tpl
index 7eadb80..2c9dc2c 100644
--- a/pykolab/tests/kcal-event.tpl
+++ b/share/tests/kcal-event.tpl
@@ -1,10 +1,11 @@
-From: @@user@@ von Test <@@user_email@@>
-Subject: libkcal-@@uid@@
-Date: Thu, 21 Oct 2010 14:40:32 +0100
+From: %(from_name_str)s <%(from_email_str)s>
+To: %(to_name_str)s <%(to_email_str)s>
+Subject: libkcal-%(uid)s
+Date: %(rfc_2822_sent_date)s
 MIME-Version: 1.0
 X-Kolab-Type: application/x-vnd.kolab.event
 Content-Type: Multipart/Mixed;
-  boundary="Boundary-00=@@uid@@"
+  boundary="Boundary-00=%(uid)s"
 Status: RO
 X-Status: OT
 X-KMail-EncryptionState:
@@ -12,7 +13,7 @@ X-KMail-SignatureState:
 X-KMail-MDN-Sent:
 X-UID: 0
 
---Boundary-00=@@uid@@
+--Boundary-00=%(uid)s
 Content-Type: Text/Plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
@@ -22,7 +23,7 @@ This is a Kolab Groupware object.
 To view this object you will need an email client that can understand the Kolab Groupware format.
 For a list of such email clients please visit
 http://www.kolab.org/kolab2-clients.html
---Boundary-00=@@uid@@
+--Boundary-00=%(uid)s
 Content-Type: application/x-vnd.kolab.event;
   name="kolab.xml"
 Content-Transfer-Encoding: 7bit
@@ -32,25 +33,25 @@ Content-Disposition: attachment;
 <?xml version="1.0" encoding="UTF-8"?>
 <event version="1.0">
  <product-id>KOrganizer 4.4.5, Kolab resource</product-id>
- <uid>libkcal-@@uid@@</uid>
- <creation-date>2010-10-21T13:40:32Z</creation-date>
+ <uid>libkcal-%(uid)s</uid>
+ <creation-date>%(kolab_event_date_creation)s</creation-date>
  <last-modification-date>2010-10-21T13:42:14+00:00</last-modification-date>
  <sensitivity>public</sensitivity>
- <start-date>@@date_start@@T@@time_start@@:00:00Z</start-date>
- <summary>test event</summary>
- <location>somewhere else</location>
+ <start-date>%(kolab_event_date_start)s</start-date>
+ <summary>%(event_summary)s</summary>
+ <location>%(event_location)s</location>
  <organizer>
-  <display-name>@@user@@ von Test</display-name>
-  <smtp-address>@@user_email@@</smtp-address>
+  <display-name>%(from_name_str)s</display-name>
+  <smtp-address>%(from_email_str)s</smtp-address>
  </organizer>
  <attendee>
-  <display-name>@@user@@ von Test</display-name>
-  <smtp-address>@@user_email@@</smtp-address>
+  <display-name>%(to_name_str)s</display-name>
+  <smtp-address>%(to_email_str)s</smtp-address>
   <status>accepted</status>
   <request-response>false</request-response>
   <invitation-sent>false</invitation-sent>
   <role>required</role>
- </attendee>@@recurrence@@
+ </attendee>%(event_recurrence)s
  <alarm>15</alarm>
  <advanced-alarms>
   <alarm type="display">
@@ -60,7 +61,7 @@ Content-Disposition: attachment;
  </advanced-alarms>
  <revision>0</revision>
  <show-time-as>busy</show-time-as>
- <end-date>@@date_end@@T@@time_end@@:00:00Z</end-date>
+ <end-date>%(kolab_event_date_end)s</end-date>
 </event>
 
---Boundary-00=@@uid@@--
+--Boundary-00=%(uid)s--