From 9353e2bc63e73e6756d04690631aa197fbfe8318 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Tue, 17 Aug 2010 15:10:19 +0000
Subject: [PATCH] Caldav: return reoccuring events on time-range request

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@1355 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 .../davmail/exchange/ExchangeSession.java     |  3 +-
 src/test/davmail/caldav/TestCaldav.java       | 42 +++++++++----------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index f260761b..c4dcf882 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -2239,8 +2239,7 @@ public abstract class ExchangeSession {
             if (timeRangeEnd != null) {
                 andCondition.add(lte("dtend", formatSearchDate(parser.parse(timeRangeEnd))));
             }
-            andCondition.add(isEqualTo("instancetype", 0));
-            return searchEvents(folderPath, ITEM_PROPERTIES, andCondition);
+            return searchEvents(folderPath, andCondition);
         } catch (ParseException e) {
             throw new IOException(e);
         }
diff --git a/src/test/davmail/caldav/TestCaldav.java b/src/test/davmail/caldav/TestCaldav.java
index 94400923..7d95ff9c 100644
--- a/src/test/davmail/caldav/TestCaldav.java
+++ b/src/test/davmail/caldav/TestCaldav.java
@@ -137,12 +137,13 @@ public class TestCaldav extends AbstractDavMailTestCase {
         buffer.append("<C:comp-filter name=\"VCALENDAR\">");
         buffer.append("<C:comp-filter name=\"VEVENT\">");
         buffer.append("<C:time-range start=\"").append(formatter.format(start)).append("\" end=\"").append(formatter.format(end)).append("\"/>");
+        //buffer.append("<C:time-range start=\"").append(formatter.format(start)).append("\"/>");
         buffer.append("</C:comp-filter>");
         buffer.append("</C:comp-filter>");
         buffer.append("<C:filter>");
         buffer.append("</C:filter>");
         buffer.append("</C:calendar-query>");
-        SearchReportMethod method = new SearchReportMethod("/users/" + session.getEmail() + "/calendar/",buffer.toString());
+        SearchReportMethod method = new SearchReportMethod("/users/" + session.getEmail() + "/calendar/", buffer.toString());
         httpClient.executeMethod(method);
         assertEquals(HttpStatus.SC_MULTI_STATUS, method.getStatusCode());
         MultiStatus multiStatus = method.getResponseBodyAsMultiStatus();
@@ -150,14 +151,11 @@ public class TestCaldav extends AbstractDavMailTestCase {
 
         Set<String> ITEM_PROPERTIES = new HashSet<String>();
         ITEM_PROPERTIES.add("instancetype");
-        List<ExchangeSession.Event> events = session.searchEvents("/users/" + session.getEmail() + "/calendar/", ITEM_PROPERTIES,
+        List<ExchangeSession.Event> events = session.searchEvents("/users/" + session.getEmail() + "/calendar/",
                 session.and(
-                        session.and(
-                                session.gt("dtstart", session.formatSearchDate(start)),
-                                session.lt("dtend", session.formatSearchDate(end))
-                        )
-                        , session.or(session.isEqualTo("instancetype", 1), session.isEqualTo("instancetype", 0))
-                        )
+                        session.gt("dtstart", session.formatSearchDate(start)),
+                        session.lt("dtend", session.formatSearchDate(end))
+                )
         );
 
         assertEquals(events.size(), responses.length);
@@ -165,23 +163,23 @@ public class TestCaldav extends AbstractDavMailTestCase {
 
     public void testCreateCalendar() throws IOException {
         String folderName = "test & accentué";
-        String encodedFolderpath = URIUtil.encodePath("/users/" + session.getEmail() + "/calendar/"+folderName+ '/');
+        String encodedFolderpath = URIUtil.encodePath("/users/" + session.getEmail() + "/calendar/" + folderName + '/');
         // first delete calendar
-        session.deleteFolder("calendar/"+folderName);
+        session.deleteFolder("calendar/" + folderName);
         String body =
                 "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
-                "   <C:mkcalendar xmlns:D=\"DAV:\"\n" +
-                "                 xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\n" +
-                "     <D:set>\n" +
-                "       <D:prop>\n" +
-                "         <D:displayname>"+ StringUtil.xmlEncode(folderName)+"</D:displayname>\n" +
-                "         <C:calendar-description xml:lang=\"en\">Calendar description</C:calendar-description>\n" +
-                "         <C:supported-calendar-component-set>\n" +
-                "           <C:comp name=\"VEVENT\"/>\n" +
-                "         </C:supported-calendar-component-set>\n" +
-                "       </D:prop>\n" +
-                "     </D:set>\n" +
-                "   </C:mkcalendar>";
+                        "   <C:mkcalendar xmlns:D=\"DAV:\"\n" +
+                        "                 xmlns:C=\"urn:ietf:params:xml:ns:caldav\">\n" +
+                        "     <D:set>\n" +
+                        "       <D:prop>\n" +
+                        "         <D:displayname>" + StringUtil.xmlEncode(folderName) + "</D:displayname>\n" +
+                        "         <C:calendar-description xml:lang=\"en\">Calendar description</C:calendar-description>\n" +
+                        "         <C:supported-calendar-component-set>\n" +
+                        "           <C:comp name=\"VEVENT\"/>\n" +
+                        "         </C:supported-calendar-component-set>\n" +
+                        "       </D:prop>\n" +
+                        "     </D:set>\n" +
+                        "   </C:mkcalendar>";
 
         SearchReportMethod method = new SearchReportMethod(encodedFolderpath, body) {
             @Override