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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59252: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      59196: Merged DEV to V4.2-BUG-FIX (4.2.1)
         58963 : MNT-10006: SPP: NPE occurs for recurrent event which occurs monthly/yearly on any weekday/weekend day
            - Support of day/weekday/weekend recurrence pattern was implemented
            - Unit tests are added.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62116 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 01:16:36 +00:00
parent 92d096ffe8
commit efca2709c9
3 changed files with 1036 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
source/test-java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelperTest.java
View File

@@ -18,12 +18,13 @@
*/
package org.alfresco.service.cmr.calendar;
import static org.junit.Assert.*;
import org.junit.Test;
import java.util.HashMap;
import java.util.Map;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;
/**
* Tests for the {@link CalendarRecurrenceHelper} class.
@@ -69,7 +70,43 @@ public class CalendarRecurrenceHelperTest
// Double check we're not just comparing in with itself.
assertNotSame(in, out);
}
// MNT-10006 fix. Validates the patterns 'weekday', 'weekend day', 'day'
@Test
public void fixOutLookRecurrenceQuirks_weekdayRecurrenceRule()
{
Map<String, String> recurrenceRule = Params.fromKVPs("FREQ=MONTHLY", "BYDAY=MO,TU,WE,TH,FR", "INTERVAL=1", "BYSETPOS=1");
Map<String, String> fixedRecurrenceRule = CalendarRecurrenceHelper.fixOutlookRecurrenceQuirks(Params.fromMap(recurrenceRule));
assertEquals(null, fixedRecurrenceRule.get("BYDAY"));
assertEquals(null, fixedRecurrenceRule.get("BYSETPOS"));
assertEquals("1", fixedRecurrenceRule.get("BYWEEKDAY"));
assertEquals("MO,TU,WE,TH,FR", fixedRecurrenceRule.get("WEEKDAYS"));
}
@Test
public void fixOutLookRecurrenceQuirks_weekendDayRecurrenceRule()
{
Map<String, String> recurrenceRule = Params.fromKVPs("FREQ=MONTHLY", "BYDAY=SU,SA", "INTERVAL=1", "BYSETPOS=1");
Map<String, String> fixedRecurrenceRule = CalendarRecurrenceHelper.fixOutlookRecurrenceQuirks(Params.fromMap(recurrenceRule));
assertEquals(null, fixedRecurrenceRule.get("BYDAY"));
assertEquals(null, fixedRecurrenceRule.get("BYSETPOS"));
assertEquals("1", fixedRecurrenceRule.get("BYWEEKENDDAY"));
assertEquals("SU,SA", fixedRecurrenceRule.get("WEEKENDS"));
}
@Test
public void fixOutLookRecurrenceQuirks_dayRecurrenceRule()
{
Map<String, String> recurrenceRule = Params.fromKVPs("FREQ=MONTHLY", "BYDAY=SU,MO,TU,WE,TH,FR,SA", "INTERVAL=1", "BYSETPOS=1");
Map<String, String> fixedRecurrenceRule = CalendarRecurrenceHelper.fixOutlookRecurrenceQuirks(Params.fromMap(recurrenceRule));
assertEquals("1", fixedRecurrenceRule.get("BYANYDAY"));
assertEquals(null, fixedRecurrenceRule.get("BYSETPOS"));
assertEquals(null, fixedRecurrenceRule.get("BYMONTHDAY"));
assertEquals("SU,MO,TU,WE,TH,FR,SA", fixedRecurrenceRule.get("DAY"));
}
/**
* Inner class just here to make the tests more readable.