From e4e1d81f9f8408c9ae3e1e35bc0b3bd48e660bc3 Mon Sep 17 00:00:00 2001
From: Cedric Boscher <cedric.boscher@kozea.fr>
Date: Wed, 15 Jun 2016 18:01:19 +0200
Subject: [PATCH] debug on tests

---
 radicale/xmlutils.py |  4 +++-
 tests/test_base.py   | 23 +++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/radicale/xmlutils.py b/radicale/xmlutils.py
index 20ea826..c4c4f3e 100644
--- a/radicale/xmlutils.py
+++ b/radicale/xmlutils.py
@@ -311,7 +311,8 @@ def _time_range_match(vobject_item, filter_, child_name):
             return True
 
     elif child_name == "VJOURNAL":
-        dtstart = getattr(child, "dtstart", None)
+        dtstart = getattr(child, "dstart", None)
+
         if dtstart is not None:
             dtstart = dtstart.value
             if not isinstance(dtstart, datetime):
@@ -321,6 +322,7 @@ def _time_range_match(vobject_item, filter_, child_name):
                            .replace(tzinfo=timezone.utc))
             else:
                 dtstart_is_datetime = True
+
             if dtstart_is_datetime:
                 # Line 1
                 return start <= dtstart and end > dtstart
diff --git a/tests/test_base.py b/tests/test_base.py
index c79398d..b5b3170 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -407,7 +407,7 @@ class BaseRequests:
               <C:comp-filter name="VTODO">
                 <C:time-range start="20130903T160000Z" end="20130901T183000Z"/>
               </C:comp-filter>
-            </C:comp-filter>"""],"todo", events=1)
+            </C:comp-filter>"""],"todo", events=8)
         assert "href>/calendar.ics/todo2.ics</" not in answer
         
         answer = self._test_filter(["""
@@ -415,7 +415,7 @@ class BaseRequests:
               <C:comp-filter name="VTODO">
                 <C:time-range start="20130903T160000Z" end="20130901T173000Z"/>
               </C:comp-filter>
-            </C:comp-filter>"""],"todo", events=1)
+            </C:comp-filter>"""],"todo", events=8)
         assert "href>/calendar.ics/todo2.ics</" not in answer
         
         answer = self._test_filter(["""
@@ -423,16 +423,27 @@ class BaseRequests:
               <C:comp-filter name="VTODO">
                 <C:time-range start="20130903T160000Z" end="20130903T173000Z"/>
               </C:comp-filter>
-            </C:comp-filter>"""],"todo", events=1)
+            </C:comp-filter>"""],"todo", events=8)
         assert "href>/calendar.ics/todo3.ics</" not in answer
         
         answer = self._test_filter(["""
             <C:comp-filter name="VCALENDAR">
               <C:comp-filter name="VTODO">
-                <C:time-range start="20130903T180000Z" end="20130903T173000Z"/>
+                <C:time-range start="20130903T160000Z" end="20130803T203000Z"/>
               </C:comp-filter>
-            </C:comp-filter>"""],"todo", events=1)
-        assert "href>/calendar.ics/todo3.ics</" not in answer
+            </C:comp-filter>"""],"todo", events=8)
+        assert "href>/calendar.ics/todo7.ics</" in answer
+        
+        
+        answer = self._test_filter(["""
+            <C:comp-filter name="VCALENDAR">
+              <C:comp-filter name="VJOURNAL">
+                <C:time-range start="19991229T000000Z" end="20000202T000000Z"/>
+              </C:comp-filter>
+            </C:comp-filter>"""], "journal", events=3)
+        assert "href>/calendar.ics/journal1.ics</" not in answer
+        assert "href>/calendar.ics/journal2.ics</" in answer
+        assert "href>/calendar.ics/journal3.ics</" in answer
         
         
         answer = self._test_filter(["""