relax comparison of RRULE BYDAY, modified task test case to always use its own VTIMEZONE

git-svn-id: https://zeitsenke.de/svn/SyncEvolution/trunk@159 15ad00c4-1369-45f4-8270-35d70d36bdcd

src/normalize_vcard.pl

@@ -76,6 +76,8 @@ sub Normalize {
     if (s/^PHOTO;.*?ENCODING=(b|B|BASE64).*?:\s*/PHOTO;ENCODING=B: /mgi) {
       while (s/^PHOTO(.*?): (\S+)[\t ]+(\S+)/PHOTO$1: $2$3/mg) {}
     }
+    # ignore extra day factor in front of weekday
+    s/^RRULE:(.*)BYDAY=\+?1(\D)/RRULE:$1BYDAY=$2/mg;
 
     # remove fields which may differ
     s/^(PRODID|CREATED|LAST-MODIFIED):.*\r?\n?//gm;

src/testTask.ics

@@ -3,22 +3,21 @@ PRODID:-//Ximian//NONSGML Evolution Calendar//EN
 VERSION:2.0
 METHOD:PUBLISH
 BEGIN:VTIMEZONE
-TZID:/softwarestudio.org/Olson_20011030_5/Europe/Berlin
-X-LIC-LOCATION:Europe/Berlin
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-TZOFFSETTO:+0200
-TZNAME:CEST
-DTSTART:19700329T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=3
-END:DAYLIGHT
+TZID:New York
 BEGIN:STANDARD
-TZOFFSETFROM:+0200
-TZOFFSETTO:+0100
-TZNAME:CET
-DTSTART:19701025T030000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+TZNAME:EST
+DTSTART:19701025T020000
 RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=-1SU;BYMONTH=10
 END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+TZNAME:EDT
+DTSTART:19700405T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=4
+END:DAYLIGHT
 END:VTIMEZONE
 BEGIN:VTODO
 UID:20060417T174205Z-4360-727-1-2731@gollum
@@ -28,10 +27,8 @@ PRIORITY:5
 CREATED:20060417T174205
 LAST-MODIFIED:20060417T174205
 DESCRIPTION:test description
-DUE;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
- 20060422T140000
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Berlin:
- 20060410T163000
+DUE;TZID=New York:20060422T140000
+DTSTART;TZID=New York:20060410T163000
 CLASS:PRIVATE
 CATEGORIES:Business\,Waiting
 PERCENT-COMPLETE:50