This commit was generated by cvs2svn to compensate for changes in r9415,

which included commits to RCS files with non-trunk default branches.

svn path=/trunk/; revision=9416

1 files changed, 21 insertions, 15 deletions

diff --git a/libical/test-data/recur.txt b/libical/test-data/recur.txt
index 2020331993..f158a2a96b 100644
--- a/libical/test-data/recur.txt
+++ b/libical/test-data/recur.txt
@@ -95,7 +95,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970902T090000
 RRULE
- :FREQ=WEEKLY;INTERVAL=2
+ :FREQ=WEEKLY;INTERVAL=2;COUNT=10
 END:VEVENT
 
 BEGIN:VEVENT
@@ -154,7 +154,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970905T090000
 RRULE
- :FREQ=MONTHLY;UNTIL=19971224T000000Z;INTERVAL=1;BYDAY=FR
+ :FREQ=MONTHLY;UNTIL=19971224T000000Z;INTERVAL=1;BYDAY=1FR
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -163,8 +163,8 @@ DESCRIPTION
 DTSTART
  ;TZID=US-Eastern
  :19970907T090000
-RULE
- :FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=1SU,-1SU'
+RRULE
+ :FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=1SU,-1SU
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -173,7 +173,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970922T090000
 RRULE
- :FREQ=MONTHLY;COUNT=6;INTERVAL=1;BYDAY=MO
+ :FREQ=MONTHLY;COUNT=6;INTERVAL=1;BYDAY=-2MO
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -182,7 +182,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970928T090000
 RRULE
- :FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=-3
+ :FREQ=MONTHLY;INTERVAL=1;COUNT=10;BYMONTHDAY=-3
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -218,7 +218,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970902T090000
 RRULE
- :FREQ=MONTHLY;INTERVAL=2;BYDAY=TH
+ :FREQ=MONTHLY;INTERVAL=2;COUNT=10;BYDAY=TU
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -254,7 +254,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970519T090000
 RRULE
- :FREQ=YEARLY;INTERVAL=1;BYDAY=MO
+ :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=20MO
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -264,7 +264,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970512T090000
 RRULE
- :FREQ=YEARLY;INTERVAL=1;BYDAY=MO;BYWEEKNO=20
+ :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=MO;BYWEEKNO=20
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -273,7 +273,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970313T090000
 RRULE
- :FREQ=YEARLY;INTERVAL=1;BYDAY=TH;BYMONTH=3
+ :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=TH;BYMONTH=3
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -282,8 +282,9 @@ DTSTART
  ;TZID=US-Eastern
  :19970605T090000
 RRULE
- :FREQ=YEARLY;INTERVAL=1;BYDAY=TH;BYMONTH=6,7,8
+ :FREQ=YEARLY;INTERVAL=1;COUNT=10;BYDAY=TH;BYMONTH=6,7,8
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Every Friday the 13th\, forever:
@@ -291,8 +292,9 @@ DTSTART
  ;TZID=US-Eastern
  :19970902T090000
 RRULE
- :FREQ=MONTHLY;INTERVAL=1;BYDAY=FR;BYMONTHDAY=13
+ :FREQ=MONTHLY;INTERVAL=1;COUNT=10;BYDAY=FR;BYMONTHDAY=13
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :The first Saturday that follows the first Sunday of the month\,
@@ -300,8 +302,9 @@ DTSTART
  ;TZID=US-Eastern
  :19970913T090000
 RRULE
- :FREQ=MONTHLY;INTERVAL=1;BYDAY=SA;BYMONTHDAY=7,8,9,10,11,12,13
+ :FREQ=MONTHLY;INTERVAL=1;COUNT=10;BYDAY=SA;BYMONTHDAY=7,8,9,10,11,12,13
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :Every four years\, the first Tuesday after a Monday in November\, 
@@ -310,8 +313,9 @@ DTSTART
  ;TZID=US-Eastern
  :19961105T090000
 RRULE
- :FREQ=YEARLY;INTERVAL=4;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8;BYMONTH=11
+ :FREQ=YEARLY;INTERVAL=4;COUNT=10;BYDAY=TU;BYMONTHDAY=2,3,4,5,6,7,8;BYMONTH=11
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :The 3rd instance into the month of one of Tuesday\, Wednesday or 
@@ -322,6 +326,7 @@ DTSTART
 RRULE
  :FREQ=MONTHLY;COUNT=3;INTERVAL=1;BYDAY=TU,WE,TH;BYSETPOS=3
 END:VEVENT
+
 BEGIN:VEVENT
 DESCRIPTION
  :The 2nd to last weekday of the month:
@@ -329,7 +334,7 @@ DTSTART
  ;TZID=US-Eastern
  :19970929T090000
 RRULE
- :FREQ=MONTHLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-2
+ :FREQ=MONTHLY;INTERVAL=1;COUNT=10;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=-2
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION
@@ -396,3 +401,4 @@ DTSTART
 RRULE
  :FREQ=WEEKLY;COUNT=4;INTERVAL=2;BYDAY=TU,SU
 END:VEVENT
+