Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
2025-08-07 17:49:17 +00:00 · 2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
--- a/source/test-java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelperTest.java
+++ b/source/test-java/org/alfresco/service/cmr/calendar/CalendarRecurrenceHelperTest.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2005-2013 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.service.cmr.calendar;
+
+import static org.junit.Assert.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+/**
+ * Tests for the {@link CalendarRecurrenceHelper} class.
+ * 
+ * @author Matt Ward
+ */
+public class CalendarRecurrenceHelperTest
+{
+    @Test
+    public void fixOutlookRecurrenceQuirks_GenuineMonthlyRecurrenceParamsLeftAsIs()
+    {
+        Map<String, String> in = Params.fromKVPs("BYMONTHDAY=24", "FREQ=MONTHLY", "INTERVAL=1");
+        Map<String, String> out = CalendarRecurrenceHelper.fixOutlookRecurrenceQuirks(Params.fromMap(in));
+        
+        // A monthly recurring event specified correctly, will remain untouched.
+        assertEquals(in, out);
+        // Double check we're not just comparing in with itself.
+        assertNotSame(in, out);
+    }
+    
+    /**
+     * ALF-18928: Yearly recurring event specified incorrectly (as monthly) by outlook.
+     */
+    @Test
+    public void fixOutlookRecurrenceQuirks_MonthlyRecurrenceThatShouldBeYearly()
+    {
+        Map<String, String> in = Params.fromKVPs("BYMONTHDAY=25", "FREQ=MONTHLY", "INTERVAL=24", "BYMONTH=7");
+        Map<String, String> out = CalendarRecurrenceHelper.fixOutlookRecurrenceQuirks(Params.fromMap(in));
+        
+        // A yearly recurring event that has been incorrectly specified as monthly, is fixed up.
+        // Note FREQ and INTERVAL have been corrected.
+        assertEquals(Params.fromKVPs("BYMONTHDAY=25", "FREQ=YEARLY", "INTERVAL=2", "BYMONTH=7"), out);
+    }
+    
+    @Test
+    public void fixOutlookRecurrenceQuirks_YearlyRecurrenceParamsLeftAsIs()
+    {
+        Map<String, String> in = Params.fromKVPs("BYMONTHDAY=25", "FREQ=YEARLY", "INTERVAL=2", "BYMONTH=7");
+        Map<String, String> out = CalendarRecurrenceHelper.fixOutlookRecurrenceQuirks(Params.fromMap(in));
+        
+        // A yearly recurring event specified correctly, will remain untouched.
+        assertEquals(in, out);
+        // Double check we're not just comparing in with itself.
+        assertNotSame(in, out);
+    }
+    
+
+    /**
+     * Inner class just here to make the tests more readable.
+     */
+    private static class Params extends HashMap<String, String>
+    {
+        private static final long serialVersionUID = 1648766671461600951L;
+
+        private Params()
+        {
+        }
+        
+        private Params(Map<String, String> params)
+        {
+            super(params);
+        }
+        
+        private static Params fromMap(Map<String, String> params)
+        {
+            return new Params(params);
+        }
+        
+        private static Params fromKVPs(String... keyValuePairs)
+        {
+            Params params = new Params();
+            for (String kvp : keyValuePairs)
+            {
+                String[] split = kvp.split("=");
+                assertEquals("Key/value pair is not valid: " + kvp, 2, split.length);
+                params.put(split[0], split[1]);
+            }
+            return params;
+        }
+    }
+}