inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix whole-day calendar detection test, and expand it to handle a few more cases too

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30453 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-09-13 08:50:10 +00:00
parent c68e748438
commit a22263ccd4
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/java/org/alfresco/repo/calendar/CalendarHelpersTest.java
View File

@@ -29,6 +29,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
import org.alfresco.service.cmr.calendar.CalendarRecurrenceHelper;
@@ -48,15 +49,23 @@ public class CalendarHelpersTest
@Test public void allDayDetection()
{
Calendar c20110719_0000 = Calendar.getInstance();
Calendar c20110719_1000 = Calendar.getInstance();
Calendar c20110720_0000 = Calendar.getInstance();
Calendar c20110721_0000 = Calendar.getInstance();
TimeZone UTC = TimeZone.getTimeZone("UTC");
TimeZone NewYork = TimeZone.getTimeZone("America/New_York");
Calendar c20110719_0000 = Calendar.getInstance(UTC);
Calendar c20110719_1000 = Calendar.getInstance(UTC);
Calendar c20110720_0000 = Calendar.getInstance(UTC);
Calendar c20110721_0000 = Calendar.getInstance(UTC);
c20110719_0000.set(2011, 07, 19, 0, 0, 0);
c20110719_1000.set(2011, 07, 19, 1, 0, 0);
c20110720_0000.set(2011, 07, 20, 0, 0, 0);
c20110721_0000.set(2011, 07, 21, 0, 0, 0);
Calendar c20110721_0000ny = Calendar.getInstance(NewYork);
Calendar c20110721_2000ny = Calendar.getInstance(NewYork);
c20110721_0000ny.set(2011, 07, 21, 0, 0, 0);
c20110721_2000ny.set(2011, 07, 21, 2, 0, 0);
CalendarEntryDTO entry = new CalendarEntryDTO();
// Start and end at the same midnight
@@ -87,6 +96,22 @@ public class CalendarHelpersTest
entry.setStart(c20110719_1000.getTime());
entry.setEnd( c20110719_1000.getTime());
assertFalse(CalendarEntryDTO.isAllDay(entry));
// In another timezone, local midnight is OK
TimeZone defaultTimezone = TimeZone.getDefault();
TimeZone.setDefault(NewYork);
entry.setStart( c20110721_0000ny.getTime());
entry.setEnd( c20110721_0000ny.getTime());
assertTrue(CalendarEntryDTO.isAllDay(entry));
// But non midnight isn't
entry.setStart( c20110721_2000ny.getTime());
entry.setEnd( c20110721_2000ny.getTime());
assertFalse(CalendarEntryDTO.isAllDay(entry));
TimeZone.setDefault(defaultTimezone);
}
@Test public void dailyRecurrenceDates()

2
source/java/org/alfresco/service/cmr/calendar/CalendarEntryDTO.java
View File

@@ -303,7 +303,7 @@ public class CalendarEntryDTO implements CalendarEntry, Serializable
startLocal.setTime(entry.getStart());
endLocal.setTime(entry.getEnd());
// Check for midnight, first in UTC then again in Local time
// Check for midnight, first in UTC then again in Server Local Time
Calendar[] starts = new Calendar[] { startUTC, startLocal };
Calendar[] ends = new Calendar[] { endUTC, endLocal };
for(int i=0; i<starts.length; i++)