mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-07 18:25:23 +00:00
4e7a0f6ef0
33757: Merged BRANCHES/DEV/THOR1_SPRINTS to BRANCHES/DEV/V4.0-BUG-FIX
33755: Latest Spring Surf libs:
- Updates to convert FreeMarker directives for processing directives Spring Beans to allow their behaviour to be customized.
- Changed Extensibility model objects to use a non-blocking GUID generator to avoid thread contention (small amount noticed with 1000 concurrent user test)
- Removed old machine gun code to generate Object GUIDs, which weren't even valid GUIDs ironically.
- Replaced with new non-blocking fast GUID generator in webscripts package.
- Added Reentrant ReadWriteLock around resources in singleton Spring beans that are manipulated by multiple threads.
- Added Reentrant ReadWriteLock around Advanced Component internal resources.
- Surf performance improvements from Thor high load profiling in Jmeter/Jprofiler
- Removed lock around ModelWriter (which is only used by a single request thread at a time)
- Replaced StringBuffer with StringBuilder for Writer usage in extensibility framework to remove locking.
- Performance improvements around retrieval of RemoteClient instance
- avoid expensive Spring prototype bean retrieval, use a threadlocal clone of a base RemoteClient bean instead.
- Concurrency fixes around CRUD operations on shared ModelObjects instances.
- Surf ModelObjects are shared between all users in the model object caches - but the original machine gun code has no locking what-so-ever around CRUD operations - which meant that it was possible for incorrect property values to be received from a ModelObject in a heavily multi-threaded scenario on initialisation of a Surf application.
- was causing nonsense warnings such as:
WARN [extensions.webscripts.WebTemplateProcessor] [http-8081-exec-10] Unable to find a valid template path for uri: freemarker
- Modified default web-tier server response codes for read timeout and connect timeout to return more sensible codes to client browsers.
- Fix for concurrency issue resolving SpringMVC View objects found during heavy thread testing on web-tier startup.
- Improved caching strategy for WebScripts View Resolver - move techniques from Surf down to WebScripts layer.
- Improved general View Resolver strategy by caching failed view requests.
- WebScript resource bundle extension module application thread safety modifications
Merged BRANCHES/DEV/V3.4-BUG-FIX to BRANCHES/DEV/V4.0-BUG-FIX
33684: Fixes for ALF-12628, ALF-12639 - timeout handling for READ_TIMEOUT from web-tier to Alfresco
33771: ALF-12488 - CIFS error occurs if Hazelcast Config is enabled
33773: ALF-12437 Switching from Lucene to Solr caused subsystems to be in inconsistent state and repository to hang
- filter to include only updateable properties at persistence and start up time
33775: ALF-11870 Handle the odd way that Outlook requests yearly repeating events, and add unit tests for the yearly recurrence cases
33776: ALF-12569: org.postgresql.util.PSQLException Invalid ESCAPE on customizing alfresco share site dashboard
Added backwards compatible PostgreSQL-specific ESCAPE fragment - fixes for PostgreSQL 9.1.2.
33784: Fixes: ALF-12111 - Publishing Error when authenticating Facebook channels using IE8. Required an update to stand-alone-auth-return.html.
33787: Fix for ALF-12337 Remove patch.siteLoadPatch.swsdp from being run for upgrades
- only add the sample site for new installs and not upgrades
33794: ITALIAN: Translation updates based on EN r33523
33807: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
33717: (RECORD ONLY) ALF-12632 Move the Site Service permissions to public-services-security-context.xml, to mirror the behaviour on 4.0, and add a (commented out) example of how to restrict site creation permissions with it
33806: Merged V3.4 to V3.4-BUG-FIX
33728: ALF-10976 Excel files bigger than 2mb cause soffice.exe to take 100% of one CPU for more than 2 minutes in previews.
- Added configuration to limit older excel format 'xls' from Excel 5.0/95 and Excel 97-2003
Already had configuration for xlsx Microsoft Office 2007
33743: ALF-12724: Merge HEAD to V3.4 (3.4.8)
Issue found while fixing ALF-9899 and again by QA when testing ALF-9899
32941: ALF-11300:
- fix locking issues
33772: Merged DEV to V3.4
33768: ALF-12685 : Search isn't working correctly
Index delete events were not getting fired for the entire tree of affected nodes when a node was archive
Added a deletion of child nodes from indexes in DbNodeServiceImpl.pullNodeChildrenToSameStore() method.
33803: ALF-12724: Merged V4.0-BUG-FIX to V3.4 (Reverts previous revision and changes an error message to debug)
33137: Activities feed generator: change info log messages to debug log messages
33452: Fix for ALF-12536
33536: Fix for ALF-12536: hopefully this will be the final fix.
33805: ALF-12624: Fix regression introduced by ALF-9514
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@33808 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
1252 lines
47 KiB
Java
1252 lines
47 KiB
Java
/*
|
|
* Copyright (C) 2005-2011 Alfresco Software Limited.
|
|
*
|
|
* This file is part of Alfresco
|
|
*
|
|
* Alfresco is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published by
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* Alfresco is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public License
|
|
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
package org.alfresco.repo.calendar;
|
|
|
|
import static org.junit.Assert.assertEquals;
|
|
import static org.junit.Assert.assertFalse;
|
|
import static org.junit.Assert.assertTrue;
|
|
import static org.junit.Assert.assertNotNull;
|
|
|
|
import java.text.SimpleDateFormat;
|
|
import java.util.ArrayList;
|
|
import java.util.Calendar;
|
|
import java.util.Date;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.SimpleTimeZone;
|
|
import java.util.TimeZone;
|
|
|
|
import org.alfresco.service.cmr.calendar.CalendarEntryDTO;
|
|
import org.alfresco.service.cmr.calendar.CalendarRecurrenceHelper;
|
|
import org.alfresco.service.cmr.calendar.CalendarService;
|
|
import org.alfresco.service.cmr.calendar.CalendarTimezoneHelper;
|
|
import org.junit.Test;
|
|
|
|
/**
|
|
* Test cases for the helpers relating to the {@link CalendarService},
|
|
* but which don't need a full repo
|
|
*
|
|
* @author Nick Burch
|
|
* @since 4.0
|
|
*/
|
|
public class CalendarHelpersTest
|
|
{
|
|
private static SimpleDateFormat dateFmt = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
|
/**
|
|
* UTC+10, no daylight savings
|
|
*/
|
|
private static final String ICAL_TZ_BRISBANE =
|
|
"BEGIN:VTIMEZONE\n" +
|
|
"TZID:Brisbane\n" +
|
|
"BEGIN:STANDARD\n" +
|
|
"DTSTART:16010101T000000\n" +
|
|
"TZOFFSETFROM:+1100\n" +
|
|
"TZOFFSETTO:+1000\n" +
|
|
"END:STANDARD\n" +
|
|
"END:VTIMEZONE\n";
|
|
/**
|
|
* UTC+10 April-October, Daylight UTC+11 October-April
|
|
*/
|
|
private static final String ICAL_TZ_SYDNEY =
|
|
"BEGIN:VTIMEZONE\n" +
|
|
"TZID:Canberra\\, Melbourne\\, Sydney\n" +
|
|
"BEGIN:STANDARD\n" +
|
|
"DTSTART:16010401T030000\n" +
|
|
"RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4\n" +
|
|
"TZOFFSETFROM:+1100\n" +
|
|
"TZOFFSETTO:+1000\n" +
|
|
"END:STANDARD\n" +
|
|
"BEGIN:DAYLIGHT\n" +
|
|
"DTSTART:16011007T020000\n" +
|
|
"RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10\n" +
|
|
"TZOFFSETFROM:+1000\n" +
|
|
"TZOFFSETTO:+1100\n" +
|
|
"END:DAYLIGHT\n" +
|
|
"END:VTIMEZONE\n";
|
|
/**
|
|
* UTC October-March, Daylight UTC+1 March-October
|
|
*/
|
|
private static final String ICAL_TZ_LONDON =
|
|
"BEGIN:VTIMEZONE\n" +
|
|
"TZID:Europe/London\n" +
|
|
"X-LIC-LOCATION:Europe/London\n" +
|
|
"BEGIN:DAYLIGHT\n" +
|
|
"TZOFFSETFROM:+0000\n" +
|
|
"TZOFFSETTO:+0100\n" +
|
|
"TZNAME:BST\n" +
|
|
"DTSTART:19700329T010000\n" +
|
|
"RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3\n" +
|
|
"END:DAYLIGHT\n" +
|
|
"BEGIN:STANDARD\n" +
|
|
"TZOFFSETFROM:+0100\n" +
|
|
"TZOFFSETTO:+0000\n" +
|
|
"TZNAME:GMT\n" +
|
|
"DTSTART:19701025T020000\n" +
|
|
"RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10\n" +
|
|
"END:STANDARD\n" +
|
|
"END:VTIMEZONE\n";
|
|
|
|
|
|
@Test public void allDayDetection()
|
|
{
|
|
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();
|
|
|
|
|
|
// First up, do tests in the default locale with all the times in UTC
|
|
// (We now create all-day events against UTC)
|
|
|
|
// Start and end at the same midnight
|
|
entry.setStart(c20110719_0000.getTime());
|
|
entry.setEnd( c20110719_0000.getTime());
|
|
assertTrue(CalendarEntryDTO.isAllDay(entry));
|
|
|
|
// Start and end at the next midnight
|
|
entry.setStart(c20110719_0000.getTime());
|
|
entry.setEnd( c20110720_0000.getTime());
|
|
assertTrue(CalendarEntryDTO.isAllDay(entry));
|
|
|
|
// Start and end at the midnight after
|
|
entry.setStart(c20110719_0000.getTime());
|
|
entry.setEnd( c20110721_0000.getTime());
|
|
assertTrue(CalendarEntryDTO.isAllDay(entry));
|
|
|
|
// One is midnight, one not
|
|
entry.setStart(c20110719_0000.getTime());
|
|
entry.setEnd( c20110719_1000.getTime());
|
|
assertFalse(CalendarEntryDTO.isAllDay(entry));
|
|
|
|
entry.setStart(c20110719_1000.getTime());
|
|
entry.setEnd( c20110720_0000.getTime());
|
|
assertFalse(CalendarEntryDTO.isAllDay(entry));
|
|
|
|
// Neither midnight
|
|
entry.setStart(c20110719_1000.getTime());
|
|
entry.setEnd( c20110719_1000.getTime());
|
|
assertFalse(CalendarEntryDTO.isAllDay(entry));
|
|
|
|
|
|
// Switch the timezone of the machine to elsewhere
|
|
// Ensure that we still accept UTC dates for all-day
|
|
// Also check that local ones are OK for backwards compatibility
|
|
|
|
// Switch the timezone
|
|
TimeZone defaultTimezone = TimeZone.getDefault();
|
|
TimeZone.setDefault(NewYork);
|
|
|
|
// In another timezone, local midnight is OK
|
|
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));
|
|
|
|
// UTC midnight is still accepted
|
|
entry.setStart(c20110719_0000.getTime());
|
|
entry.setEnd( c20110719_0000.getTime());
|
|
assertTrue(CalendarEntryDTO.isAllDay(entry));
|
|
|
|
// But UTC non-midnight still isn't (unless it happened to be local midnight!)
|
|
entry.setStart(c20110719_0000.getTime());
|
|
entry.setEnd( c20110719_1000.getTime());
|
|
assertFalse(CalendarEntryDTO.isAllDay(entry));
|
|
|
|
|
|
// Put things back
|
|
TimeZone.setDefault(defaultTimezone);
|
|
}
|
|
|
|
@Test public void dailyRecurrenceDates()
|
|
{
|
|
List<Date> dates = new ArrayList<Date>();
|
|
Calendar currentDate = Calendar.getInstance();
|
|
|
|
|
|
// Dates in the past, get nothing
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, null,
|
|
date(2011,7,10), date(2011,7,15),
|
|
true, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, null,
|
|
date(2011,7,10), date(2011,7,15),
|
|
false, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
|
|
// From today
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, null,
|
|
date(2011,7,19), date(2011,7,25),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-19", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, null,
|
|
date(2011,7,19), date(2011,7,25),
|
|
false, 1);
|
|
assertEquals(6, dates.size());
|
|
assertEquals("2011-07-19", dateFmt.format(dates.get(0)));
|
|
assertEquals("2011-07-24", dateFmt.format(dates.get(5)));
|
|
|
|
|
|
// Dates in the future, goes from then
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, null,
|
|
date(2011,7,20), date(2011,7,30),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-20", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, null,
|
|
date(2011,7,20), date(2011,7,30),
|
|
false, 1);
|
|
assertEquals(10, dates.size());
|
|
assertEquals("2011-07-20", dateFmt.format(dates.get(0)));
|
|
assertEquals("2011-07-29", dateFmt.format(dates.get(9)));
|
|
|
|
|
|
// From before today, full time set
|
|
dates.clear();
|
|
currentDate.set(2011,11-1,24,10,30);
|
|
RecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, null,
|
|
date(2011,11,22,12,30), date(2011,11,27,12,30),
|
|
false, 1);
|
|
assertEquals(4, dates.size());
|
|
assertEquals("2011-11-24", dateFmt.format(dates.get(0))); // Thu
|
|
assertEquals("2011-11-25", dateFmt.format(dates.get(1))); // Fri
|
|
assertEquals("2011-11-26", dateFmt.format(dates.get(2))); // Sat
|
|
assertEquals("2011-11-27", dateFmt.format(dates.get(3))); // Sun
|
|
|
|
// From before today, with an interval
|
|
// Repeats are 24th, 27th, (30th - too far)
|
|
dates.clear();
|
|
currentDate.set(2011,11-1,24,10,30);
|
|
RecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, null,
|
|
date(2011,11,22,12,30), date(2011,11,27,12,30),
|
|
false, 3);
|
|
assertEquals(2, dates.size());
|
|
assertEquals("2011-11-24", dateFmt.format(dates.get(0))); // Thu
|
|
assertEquals("2011-11-27", dateFmt.format(dates.get(1))); // Sun
|
|
|
|
|
|
// With no end date but only first, check it behaves
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, null,
|
|
date(2011,7,19), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-19", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, null,
|
|
date(2011,7,20), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-20", dateFmt.format(dates.get(0)));
|
|
}
|
|
|
|
@Test public void weeklyRecurrenceDates()
|
|
{
|
|
List<Date> dates = new ArrayList<Date>();
|
|
Calendar currentDate = Calendar.getInstance();
|
|
|
|
Map<String,String> params = new HashMap<String, String>();
|
|
params.put("BYDAY", "MO,TH");
|
|
|
|
|
|
// Dates in the past, get nothing
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,10), date(2011,7,15),
|
|
true, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,10), date(2011,7,15),
|
|
false, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
|
|
// Just before today
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,17), date(2011,7,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-21", dateFmt.format(dates.get(0))); // Thursday
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), date(2011,7,26),
|
|
false, 1);
|
|
assertEquals(2, dates.size());
|
|
assertEquals("2011-07-21", dateFmt.format(dates.get(0))); // Thu
|
|
assertEquals("2011-07-25", dateFmt.format(dates.get(1))); // Mon
|
|
|
|
|
|
// Just before today, full time set
|
|
dates.clear();
|
|
currentDate.set(2011,11-1,24,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,11,22,12,30), date(2011,11,25,12,30),
|
|
false, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-11-24", dateFmt.format(dates.get(0))); // Thu
|
|
|
|
|
|
// From today
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), date(2011,7,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-21", dateFmt.format(dates.get(0))); // Thursday
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), date(2011,7,26),
|
|
false, 1);
|
|
assertEquals(2, dates.size());
|
|
assertEquals("2011-07-21", dateFmt.format(dates.get(0))); // Thu
|
|
assertEquals("2011-07-25", dateFmt.format(dates.get(1))); // Mon
|
|
|
|
|
|
// Dates in the future, goes from then
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,20), date(2011,7,30),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-21", dateFmt.format(dates.get(0))); // Thu
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,20), date(2011,7,30),
|
|
false, 1);
|
|
assertEquals(3, dates.size());
|
|
assertEquals("2011-07-21", dateFmt.format(dates.get(0)));
|
|
assertEquals("2011-07-25", dateFmt.format(dates.get(1)));
|
|
assertEquals("2011-07-28", dateFmt.format(dates.get(2)));
|
|
|
|
|
|
// Multi-week skip
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,20), date(2011,8,30),
|
|
true, 3);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-21", dateFmt.format(dates.get(0))); // Thu
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,20), date(2011,8,30),
|
|
false, 3);
|
|
assertEquals(4, dates.size());
|
|
assertEquals("2011-07-21", dateFmt.format(dates.get(0)));
|
|
// Not the 25th or 28th
|
|
// Not the 1st or the 4th
|
|
assertEquals("2011-08-08", dateFmt.format(dates.get(1)));
|
|
assertEquals("2011-08-11", dateFmt.format(dates.get(2)));
|
|
// Not the 15th or 18th
|
|
// Not the 22nd or 25th
|
|
assertEquals("2011-08-29", dateFmt.format(dates.get(3)));
|
|
|
|
|
|
// With no end date but only first, check it behaves
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-21", dateFmt.format(dates.get(0))); // Thu
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,22), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-25", dateFmt.format(dates.get(0)));
|
|
}
|
|
|
|
/**
|
|
* eg on the 2nd of the month
|
|
*/
|
|
@Test public void monthlyRecurrenceByDateInMonth()
|
|
{
|
|
List<Date> dates = new ArrayList<Date>();
|
|
Calendar currentDate = Calendar.getInstance();
|
|
|
|
Map<String,String> params = new HashMap<String, String>();
|
|
params.put("BYMONTHDAY", "2");
|
|
|
|
|
|
// Dates in the past, get nothing
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,10), date(2011,7,15),
|
|
true, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,10), date(2011,7,15),
|
|
false, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
|
|
// With this month
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,1,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,1), date(2011,7,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-02", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,1,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,1), date(2011,7,26),
|
|
false, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-02", dateFmt.format(dates.get(0)));
|
|
|
|
|
|
// From the day of the month
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,2,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,2), date(2011,7,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-02", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,2,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,2), date(2011,7,26),
|
|
false, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-02", dateFmt.format(dates.get(0)));
|
|
|
|
|
|
// Dates in the future, goes from then
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,20), date(2011,9,20),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-08-02", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,20), date(2011,9,20),
|
|
false, 1);
|
|
assertEquals(2, dates.size());
|
|
assertEquals("2011-08-02", dateFmt.format(dates.get(0)));
|
|
assertEquals("2011-09-02", dateFmt.format(dates.get(1)));
|
|
|
|
|
|
// Now with a recurrence interval of only every 2 months
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,20), date(2011,9,20),
|
|
false, 2);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-09-02", dateFmt.format(dates.get(0)));
|
|
|
|
|
|
// With no end date but only first, check it behaves
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,2,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,1), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-02", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-08-02", dateFmt.format(dates.get(0)));
|
|
}
|
|
|
|
/**
|
|
* on the 1st Tuesday of the month
|
|
*/
|
|
@Test public void monthlyRecurrenceByDayOfWeek()
|
|
{
|
|
List<Date> dates = new ArrayList<Date>();
|
|
Calendar currentDate = Calendar.getInstance();
|
|
|
|
Map<String,String> params = new HashMap<String, String>();
|
|
params.put("BYSETPOS", "TU");
|
|
|
|
|
|
// Dates in the past, get nothing
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,10), date(2011,7,15),
|
|
true, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,10), date(2011,7,15),
|
|
false, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
|
|
// With this month
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,1,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,1), date(2011,7,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-05", dateFmt.format(dates.get(0))); // Tuesday 5th
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,1,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,1), date(2011,7,26),
|
|
false, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-05", dateFmt.format(dates.get(0))); // Tuesday 5th
|
|
|
|
|
|
// From the day of the month
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,2,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,2), date(2011,7,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-05", dateFmt.format(dates.get(0))); // Tuesday 5th
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,2,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,2), date(2011,7,26),
|
|
false, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-05", dateFmt.format(dates.get(0))); // Tuesday 5th
|
|
|
|
|
|
// Dates in the future, goes from then
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,20), date(2011,9,20),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-08-02", dateFmt.format(dates.get(0))); // Tuesday 2nd
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,20), date(2011,9,20),
|
|
false, 1);
|
|
assertEquals(2, dates.size());
|
|
assertEquals("2011-08-02", dateFmt.format(dates.get(0))); // Tuesday 2nd
|
|
assertEquals("2011-09-06", dateFmt.format(dates.get(1))); // Tuesday 6th
|
|
|
|
|
|
// With no end date but only first, check it behaves
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,2,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,1), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-07-05", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2011-08-02", dateFmt.format(dates.get(0)));
|
|
|
|
|
|
// Alternate format, used by Outlook 2010 etc
|
|
// 1st Monday of the Month
|
|
params.clear();
|
|
params.put("FREQ", "MONTHLY"); // Implied in call
|
|
params.put("COUNT", "10"); // Implied in call
|
|
params.put("INTERVAL", "1"); // Implied in call
|
|
params.put("BYDAY", "MO");
|
|
params.put("BYSETPOS", "1");
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), date(2012,1,5),
|
|
false, 1);
|
|
assertEquals(6, dates.size());
|
|
assertEquals("2011-08-01", dateFmt.format(dates.get(0)));
|
|
assertEquals("2011-09-05", dateFmt.format(dates.get(1)));
|
|
assertEquals("2011-10-03", dateFmt.format(dates.get(2)));
|
|
assertEquals("2011-11-07", dateFmt.format(dates.get(3)));
|
|
assertEquals("2011-12-05", dateFmt.format(dates.get(4)));
|
|
assertEquals("2012-01-02", dateFmt.format(dates.get(5)));
|
|
|
|
|
|
// 3rd Friday of the Month
|
|
params.clear();
|
|
params.put("FREQ", "MONTHLY"); // Implied in call
|
|
params.put("COUNT", "10"); // Implied in call
|
|
params.put("INTERVAL", "1"); // Implied in call
|
|
params.put("BYDAY", "FR");
|
|
params.put("BYSETPOS", "3");
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), date(2012,1,25),
|
|
false, 1);
|
|
assertEquals(6, dates.size());
|
|
assertEquals("2011-08-19", dateFmt.format(dates.get(0)));
|
|
assertEquals("2011-09-16", dateFmt.format(dates.get(1)));
|
|
assertEquals("2011-10-21", dateFmt.format(dates.get(2)));
|
|
assertEquals("2011-11-18", dateFmt.format(dates.get(3)));
|
|
assertEquals("2011-12-16", dateFmt.format(dates.get(4)));
|
|
assertEquals("2012-01-20", dateFmt.format(dates.get(5)));
|
|
|
|
|
|
// 3rd Friday of the Month, of every 3 months
|
|
params.clear();
|
|
params.put("FREQ", "MONTHLY"); // Implied in call
|
|
params.put("COUNT", "10"); // Implied in call
|
|
params.put("INTERVAL", "3"); // Implied in call
|
|
params.put("BYDAY", "FR");
|
|
params.put("BYSETPOS", "3");
|
|
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,19,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), date(2012,1,25),
|
|
false, 3);
|
|
assertEquals(2, dates.size());
|
|
assertEquals("2011-10-21", dateFmt.format(dates.get(0)));
|
|
assertEquals("2012-01-20", dateFmt.format(dates.get(1)));
|
|
|
|
|
|
// The third friday falls within the range for this month
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,14,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,14), date(2012,1,25),
|
|
false, 1);
|
|
assertEquals(7, dates.size());
|
|
assertEquals("2011-07-15", dateFmt.format(dates.get(0)));
|
|
assertEquals("2011-08-19", dateFmt.format(dates.get(1)));
|
|
assertEquals("2011-09-16", dateFmt.format(dates.get(2)));
|
|
assertEquals("2011-10-21", dateFmt.format(dates.get(3)));
|
|
assertEquals("2011-11-18", dateFmt.format(dates.get(4)));
|
|
assertEquals("2011-12-16", dateFmt.format(dates.get(5)));
|
|
assertEquals("2012-01-20", dateFmt.format(dates.get(6)));
|
|
|
|
|
|
// The third friday falls within the range for this month, every 3 months
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,14,10,30);
|
|
RecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,14), date(2012,1,25),
|
|
false, 3);
|
|
assertEquals(3, dates.size());
|
|
assertEquals("2011-07-15", dateFmt.format(dates.get(0)));
|
|
assertEquals("2011-10-21", dateFmt.format(dates.get(1)));
|
|
assertEquals("2012-01-20", dateFmt.format(dates.get(2)));
|
|
}
|
|
|
|
/**
|
|
* eg every 21st of February
|
|
*/
|
|
@Test public void yearlyRecurrenceByDateInMonth()
|
|
{
|
|
List<Date> dates = new ArrayList<Date>();
|
|
Calendar currentDate = Calendar.getInstance();
|
|
|
|
// How Outlook ought to do it
|
|
Map<String,String> params = new HashMap<String, String>();
|
|
params.put("COUNT", "10");
|
|
params.put("BYMONTH", "2");
|
|
params.put("BYMONTHDAY", "21");
|
|
|
|
// How many Outlook versions do do it...
|
|
// FREQ=MONTHLY;COUNT=10;BYMONTH=2;INTERVAL=1;BYSETPOS=17;BYDAY=SU,MO,TU,WE,TH,FR,SA;
|
|
Map<String,String> paramsOUTLOOK = new HashMap<String, String>();
|
|
paramsOUTLOOK.put("FREQ", "MONTHLY");
|
|
paramsOUTLOOK.put("COUNT", "10");
|
|
paramsOUTLOOK.put("BYMONTH", "2");
|
|
paramsOUTLOOK.put("INTERVAL", "1");
|
|
paramsOUTLOOK.put("BYSETPOS", "21");
|
|
paramsOUTLOOK.put("BYDAY", "SU,MO,TU,WE,TH,FR,SA");
|
|
|
|
// Check that the outlook crazy version gets fixed
|
|
Map<String,String> paramsFIXED = RecurrenceHelper.fixOutlookRecurrenceQuirks(paramsOUTLOOK);
|
|
assertEquals("YEARLY", paramsFIXED.get("FREQ"));
|
|
assertEquals("2", paramsFIXED.get("BYMONTH"));
|
|
assertEquals("21", paramsFIXED.get("BYMONTHDAY"));
|
|
assertEquals("10", paramsFIXED.get("COUNT"));
|
|
assertEquals("1", paramsFIXED.get("INTERVAL"));
|
|
assertEquals(null, paramsFIXED.get("BYDAY"));
|
|
assertEquals(null, paramsFIXED.get("BYSETPOS"));
|
|
|
|
|
|
// Dates in the past, get nothing
|
|
dates.clear();
|
|
currentDate.set(2012,1-1,19,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,10), date(2012,2,15),
|
|
true, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
dates.clear();
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,10), date(2012,2,15),
|
|
false, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
|
|
// With the month that contains it
|
|
dates.clear();
|
|
currentDate.set(2012,2-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,1), date(2012,2,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2012-02-21", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2012,2-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,1), date(2012,2,26),
|
|
false, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2012-02-21", dateFmt.format(dates.get(0)));
|
|
|
|
|
|
// In the next month
|
|
dates.clear();
|
|
currentDate.set(2012,3-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,3,1), date(2012,3,26),
|
|
true, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
dates.clear();
|
|
currentDate.set(2012,3-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,3,1), date(2012,3,26),
|
|
false, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
|
|
// From before, into the next year
|
|
dates.clear();
|
|
currentDate.set(2012,2-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,1), date(2013,3,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2012-02-21", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2012,2-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,1), date(2013,3,26),
|
|
false, 1);
|
|
assertEquals(2, dates.size());
|
|
assertEquals("2012-02-21", dateFmt.format(dates.get(0)));
|
|
assertEquals("2013-02-21", dateFmt.format(dates.get(1)));
|
|
|
|
|
|
// From next month, into the next year
|
|
dates.clear();
|
|
currentDate.set(2012,3-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,3,1), date(2013,2,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2013-02-21", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2012,3-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,3,1), date(2013,3,26),
|
|
false, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2013-02-21", dateFmt.format(dates.get(0)));
|
|
|
|
|
|
// With no end date but only first, check it behaves
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,2,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,1), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2012-02-21", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2012,7-1,19,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2013-02-21", dateFmt.format(dates.get(0)));
|
|
}
|
|
|
|
/**
|
|
* eg the 2nd Thursday in every March
|
|
*/
|
|
@Test public void yearlyRecurrenceByDayOfWeekInMonth()
|
|
{
|
|
List<Date> dates = new ArrayList<Date>();
|
|
Calendar currentDate = Calendar.getInstance();
|
|
|
|
// How Outlook ought to do it
|
|
Map<String,String> params = new HashMap<String, String>();
|
|
params.put("COUNT", "7");
|
|
params.put("BYMONTH", "2");
|
|
params.put("BYDAY", "SA");
|
|
params.put("BYSETPOS", "2");
|
|
|
|
// 2nd Saturday in February is 11th Feb 2012, 9th Feb 2013
|
|
|
|
// Note - outlook seems to like to set these as monthly...
|
|
// FREQ=MONTHLY;COUNT=7;BYDAY=SA;BYMONTH=2;BYSETPOS=2;INTERVAL=1
|
|
// This is right except for the FREQ!
|
|
Map<String,String> paramsOUTLOOK = new HashMap<String, String>();
|
|
paramsOUTLOOK.put("FREQ", "MONTHLY");
|
|
paramsOUTLOOK.put("COUNT", "7");
|
|
paramsOUTLOOK.put("BYMONTH", "2");
|
|
paramsOUTLOOK.put("BYDAY", "SA");
|
|
paramsOUTLOOK.put("BYSETPOS", "2");
|
|
paramsOUTLOOK.put("INTERVAL", "1");
|
|
|
|
// Check that the outlook crazy version gets fixed
|
|
Map<String,String> paramsFIXED = RecurrenceHelper.fixOutlookRecurrenceQuirks(paramsOUTLOOK);
|
|
assertEquals("YEARLY", paramsFIXED.get("FREQ"));
|
|
assertEquals("2", paramsFIXED.get("BYMONTH"));
|
|
assertEquals("SA", paramsFIXED.get("BYDAY"));
|
|
assertEquals("2", paramsFIXED.get("BYSETPOS"));
|
|
assertEquals("7", paramsFIXED.get("COUNT"));
|
|
assertEquals("1", paramsFIXED.get("INTERVAL"));
|
|
assertEquals(null, paramsFIXED.get("BYMONTHDAY"));
|
|
|
|
|
|
|
|
|
|
// Dates in the past, get nothing
|
|
dates.clear();
|
|
currentDate.set(2012,1-1,19,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,4), date(2012,2,5),
|
|
true, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
dates.clear();
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,4), date(2012,2,5),
|
|
false, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
|
|
// With the month that contains it
|
|
dates.clear();
|
|
currentDate.set(2012,2-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,1), date(2012,2,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2012-02-11", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2012,2-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,1), date(2012,2,26),
|
|
false, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2012-02-11", dateFmt.format(dates.get(0)));
|
|
|
|
|
|
// In the next month
|
|
dates.clear();
|
|
currentDate.set(2012,3-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,3,1), date(2012,3,26),
|
|
true, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
dates.clear();
|
|
currentDate.set(2012,3-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,3,1), date(2012,3,26),
|
|
false, 1);
|
|
assertEquals(0, dates.size());
|
|
|
|
|
|
// From before, into the next year
|
|
dates.clear();
|
|
currentDate.set(2012,2-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,1), date(2013,3,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2012-02-11", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2012,2-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,2,1), date(2013,3,26),
|
|
false, 1);
|
|
assertEquals(2, dates.size());
|
|
assertEquals("2012-02-11", dateFmt.format(dates.get(0)));
|
|
assertEquals("2013-02-09", dateFmt.format(dates.get(1)));
|
|
|
|
|
|
// From next month, into the next year
|
|
dates.clear();
|
|
currentDate.set(2012,3-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,3,1), date(2013,2,26),
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2013-02-09", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2012,3-1,1,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2012,3,1), date(2013,3,26),
|
|
false, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2013-02-09", dateFmt.format(dates.get(0)));
|
|
|
|
|
|
// With no end date but only first, check it behaves
|
|
dates.clear();
|
|
currentDate.set(2011,7-1,2,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,1), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2012-02-11", dateFmt.format(dates.get(0)));
|
|
|
|
dates.clear();
|
|
currentDate.set(2012,7-1,19,10,30);
|
|
RecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params,
|
|
date(2011,7,19), null,
|
|
true, 1);
|
|
assertEquals(1, dates.size());
|
|
assertEquals("2013-02-09", dateFmt.format(dates.get(0)));
|
|
}
|
|
|
|
/**
|
|
* Checks we correctly build the Timezone for somewhere
|
|
* that doesn't have DST (eg Brisbane)
|
|
*/
|
|
@Test public void simpleTimeZoneNoDST()
|
|
{
|
|
SimpleTimeZone tz = CalendarTimezoneHelper.buildTimeZone(ICAL_TZ_BRISBANE);
|
|
|
|
assertNotNull(tz);
|
|
assertEquals("Brisbane", tz.getID());
|
|
|
|
// Doesn't do DST
|
|
assertEquals(false, tz.useDaylightTime());
|
|
|
|
// Always 10 hours ahead
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2011,3,1).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2011,9,1).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2011,11,1).getTime()));
|
|
}
|
|
|
|
/**
|
|
* Checks we correctly build the Timezone for somewhere
|
|
* in the northern hemisphere with DST (eg London)
|
|
*/
|
|
@Test public void simpleTimeZoneNorthern()
|
|
{
|
|
SimpleTimeZone tz = CalendarTimezoneHelper.buildTimeZone(ICAL_TZ_LONDON);
|
|
|
|
assertNotNull(tz);
|
|
assertEquals("Europe/London", tz.getID());
|
|
|
|
// Does do DST
|
|
assertEquals(true, tz.useDaylightTime());
|
|
|
|
// In 2003, DST was 30th March - 26th October
|
|
assertEquals(0*60*60*1000, tz.getOffset(date(2003,3,1).getTime()));
|
|
assertEquals(1*60*60*1000, tz.getOffset(date(2003,3,31).getTime()));
|
|
assertEquals(1*60*60*1000, tz.getOffset(date(2003,9,1).getTime()));
|
|
assertEquals(1*60*60*1000, tz.getOffset(date(2003,10,25).getTime()));
|
|
assertEquals(0*60*60*1000, tz.getOffset(date(2003,11,1).getTime()));
|
|
|
|
// In 2007, DST was 25th March - 28th October
|
|
assertEquals(0*60*60*1000, tz.getOffset(date(2007,3,1).getTime()));
|
|
assertEquals(1*60*60*1000, tz.getOffset(date(2007,3,26).getTime()));
|
|
assertEquals(1*60*60*1000, tz.getOffset(date(2007,3,31).getTime()));
|
|
assertEquals(1*60*60*1000, tz.getOffset(date(2007,9,1).getTime()));
|
|
assertEquals(1*60*60*1000, tz.getOffset(date(2007,10,28).getTime()));
|
|
assertEquals(0*60*60*1000, tz.getOffset(date(2007,10,29).getTime()));
|
|
assertEquals(0*60*60*1000, tz.getOffset(date(2007,11,1).getTime()));
|
|
|
|
// In 2011, DST was 27th March - 30th October
|
|
assertEquals(0*60*60*1000, tz.getOffset(date(2011,3,1).getTime()));
|
|
assertEquals(1*60*60*1000, tz.getOffset(date(2011,3,31).getTime()));
|
|
assertEquals(1*60*60*1000, tz.getOffset(date(2011,9,1).getTime()));
|
|
assertEquals(1*60*60*1000, tz.getOffset(date(2011,10,25).getTime()));
|
|
assertEquals(0*60*60*1000, tz.getOffset(date(2011,11,1).getTime()));
|
|
}
|
|
|
|
/**
|
|
* Checks we correctly build the Timezone for somewhere
|
|
* in the southern hemisphere with DST (eg Sydney)
|
|
* Note - Sydney is GMT+11 in December, GMT+10 in June
|
|
*/
|
|
@Test public void simpleTimeZoneSouthern()
|
|
{
|
|
SimpleTimeZone tz = CalendarTimezoneHelper.buildTimeZone(ICAL_TZ_SYDNEY);
|
|
|
|
assertNotNull(tz);
|
|
assertEquals("Canberra, Melbourne, Sydney", tz.getID());
|
|
|
|
// Does do DST
|
|
assertEquals(true, tz.useDaylightTime());
|
|
|
|
// Note - things changed in 2008!
|
|
// In 2002-2003, DST was 27th October 2002 - 30th March 2003
|
|
// In 2005-2006, DST was 30th October 2005 - 2nd April 2006
|
|
// In 2007-2008, DST was 28th October 2007 - 6th April 2008
|
|
|
|
// In 2008-2009, DST was 5th October 2008 - 5th April 2009
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2008,6,1).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2008,10,1).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2008,10,6).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2008,12,1).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2009,1,5).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2009,4,4).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2009,4,6).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2009,5,1).getTime()));
|
|
|
|
// In 2009-2010, DST was 4th October 2009 - 4th April 2010
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2009,6,1).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2009,10,1).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2009,10,6).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2009,12,1).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2010,1,5).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2010,4,3).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2010,4,5).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2010,5,1).getTime()));
|
|
|
|
// In 2010-2011, DST was 3rd Oct 2010 - 3rd April 2011
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2010,6,1).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2010,10,1).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2010,10,6).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2010,12,1).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2011,1,5).getTime()));
|
|
assertEquals(11*60*60*1000, tz.getOffset(date(2011,4,2).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2011,4,4).getTime()));
|
|
assertEquals(10*60*60*1000, tz.getOffset(date(2011,5,1).getTime()));
|
|
}
|
|
|
|
private static class RecurrenceHelper extends CalendarRecurrenceHelper
|
|
{
|
|
protected static void buildDailyRecurrences(Calendar currentDate, List<Date> dates,
|
|
Map<String,String> params, Date onOrAfter, Date until, boolean firstOnly, int interval)
|
|
{
|
|
CalendarRecurrenceHelper.buildDailyRecurrences(
|
|
currentDate, dates, params, onOrAfter, until, firstOnly, interval);
|
|
}
|
|
|
|
protected static void buildWeeklyRecurrences(Calendar currentDate, List<Date> dates,
|
|
Map<String,String> params, Date onOrAfter, Date until, boolean firstOnly, int interval)
|
|
{
|
|
CalendarRecurrenceHelper.buildWeeklyRecurrences(
|
|
currentDate, dates, params, onOrAfter, until, firstOnly, interval);
|
|
}
|
|
|
|
protected static void buildMonthlyRecurrences(Calendar currentDate, List<Date> dates,
|
|
Map<String,String> params, Date onOrAfter, Date until, boolean firstOnly, int interval)
|
|
{
|
|
CalendarRecurrenceHelper.buildMonthlyRecurrences(
|
|
currentDate, dates, params, onOrAfter, until, firstOnly, interval);
|
|
}
|
|
|
|
protected static void buildYearlyRecurrences(Calendar currentDate, List<Date> dates,
|
|
Map<String,String> params, Date onOrAfter, Date until, boolean firstOnly, int interval)
|
|
{
|
|
CalendarRecurrenceHelper.buildYearlyRecurrences(
|
|
currentDate, dates, params, onOrAfter, until, firstOnly, interval);
|
|
}
|
|
|
|
protected static Map<String,String> fixOutlookRecurrenceQuirks(Map<String,String> params)
|
|
{
|
|
return CalendarRecurrenceHelper.fixOutlookRecurrenceQuirks(params);
|
|
}
|
|
}
|
|
|
|
private static Date date(int year, int month, int day)
|
|
{
|
|
return date(year, month, day, 0, 0);
|
|
}
|
|
|
|
private static Date date(int year, int month, int day, int hour, int minute)
|
|
{
|
|
Calendar c = Calendar.getInstance();
|
|
c.set(year, month-1, day, hour, minute, 0);
|
|
c.set(Calendar.MILLISECOND, 0);
|
|
return c.getTime();
|
|
}
|
|
}
|