From 459b02c9a448dbe905519121ac194c1d9e7f4310 Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub <guillaume.ayoub@kozea.fr>
Date: Fri, 24 Jul 2015 14:23:11 +0200
Subject: [PATCH] Fix some tests

---
 tests/static/{put.ics => event.ics}     |  4 +--
 tests/static/{putvtodo.ics => todo.ics} |  4 +--
 tests/test_base.py                      | 41 +++++++++++++------------
 3 files changed, 25 insertions(+), 24 deletions(-)
 rename tests/static/{put.ics => event.ics} (90%)
 rename tests/static/{putvtodo.ics => todo.ics} (75%)

diff --git a/tests/static/put.ics b/tests/static/event.ics
similarity index 90%
rename from tests/static/put.ics
rename to tests/static/event.ics
index 45f6a97..bbfa8be 100644
--- a/tests/static/put.ics
+++ b/tests/static/event.ics
@@ -23,8 +23,8 @@ BEGIN:VEVENT
 CREATED:20130902T150157Z
 LAST-MODIFIED:20130902T150158Z
 DTSTAMP:20130902T150158Z
-UID:02805f81-4cc2-4d68-8d39-72768ffa02d9
-SUMMARY:Nouvel évènement
+UID:event
+SUMMARY:Event
 DTSTART;TZID=Europe/Paris:20130902T180000
 DTEND;TZID=Europe/Paris:20130902T190000
 END:VEVENT
diff --git a/tests/static/putvtodo.ics b/tests/static/todo.ics
similarity index 75%
rename from tests/static/putvtodo.ics
rename to tests/static/todo.ics
index 8c74fdb..457f763 100644
--- a/tests/static/putvtodo.ics
+++ b/tests/static/todo.ics
@@ -5,7 +5,7 @@ BEGIN:VTODO
 CREATED:20130903T091105Z
 LAST-MODIFIED:20130903T091108Z
 DTSTAMP:20130903T091108Z
-UID:40f8cf9b-0e62-4624-89a2-24c5e68850f5
-SUMMARY:Nouvelle tâche
+UID:todo
+SUMMARY:Todo
 END:VTODO
 END:VCALENDAR
diff --git a/tests/test_base.py b/tests/test_base.py
index cc1fc3d..a88624e 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -36,7 +36,7 @@ class BaseRequests(object):
     """Tests with simple requests."""
 
     def test_root(self):
-        """Test a GET request at "/"."""
+        """GET request at "/"."""
         status, headers, answer = self.request("GET", "/")
         assert status == 200
         assert "Radicale works!" in answer
@@ -47,37 +47,38 @@ class BaseRequests(object):
         assert "END:VCALENDAR" in answer
         assert "PRODID:-//Radicale//NONSGML Radicale Server//EN" in answer
 
-    def test_add_event_todo(self):
-        """Tests the add of an event and todo."""
+    def test_add_event(self):
+        """Add an event."""
         self.request("GET", "/calendar.ics/")
-        #VEVENT test
-        event = get_file_content("put.ics")
-        path = "/calendar.ics/02805f81-4cc2-4d68-8d39-72768ffa02d9.ics"
+        event = get_file_content("event.ics")
+        path = "/calendar.ics/event.ics"
         status, headers, answer = self.request("PUT", path, event)
         assert status == 201
-        assert "ETag" in headers.keys()
         status, headers, answer = self.request("GET", path)
+        assert "ETag" in headers.keys()
         assert status == 200
         assert "VEVENT" in answer
-        assert b"Nouvel \xc3\xa9v\xc3\xa8nement".decode("utf-8") in answer
-        assert "UID:02805f81-4cc2-4d68-8d39-72768ffa02d9" in answer
-        # VTODO test
-        todo = get_file_content("putvtodo.ics")
-        path = "/calendar.ics/40f8cf9b-0e62-4624-89a2-24c5e68850f5.ics"
+        assert "Event" in answer
+        assert "UID:event" in answer
+
+    def test_add_todo(self):
+        """Add a todo."""
+        self.request("GET", "/calendar.ics/")
+        todo = get_file_content("todo.ics")
+        path = "/calendar.ics/todo.ics"
         status, headers, answer = self.request("PUT", path, todo)
         assert status == 201
-        assert "ETag" in headers.keys()
         status, headers, answer = self.request("GET", path)
+        assert "ETag" in headers.keys()
         assert "VTODO" in answer
-        assert b"Nouvelle t\xc3\xa2che".decode("utf-8") in answer
-        assert "UID:40f8cf9b-0e62-4624-89a2-24c5e68850f5" in answer
+        assert "Todo" in answer
+        assert "UID:todo" in answer
 
     def test_delete(self):
-        """Tests the deletion of an event"""
+        """Delete an event."""
         self.request("GET", "/calendar.ics/")
-        # Adds a VEVENT to be deleted
-        event = get_file_content("put.ics")
-        path = "/calendar.ics/02805f81-4cc2-4d68-8d39-72768ffa02d9.ics"
+        event = get_file_content("event.ics")
+        path = "/calendar.ics/event.ics"
         status, headers, answer = self.request("PUT", path, event)
         # Then we send a DELETE request
         status, headers, answer = self.request("DELETE", path)
@@ -154,4 +155,4 @@ class TestCustomStorageSystem(BaseRequests, BaseTest):
 
     def teardown(self):
         """Teardown function for each test."""
-        shutil.rmtree(self.colpath)
\ No newline at end of file
+        shutil.rmtree(self.colpath)