Monotone-Parent: 18a37cc2e34898697d26aa8ab49aaab61673a465
Monotone-Revision: 434dee0cc13fa6e16a52014e292f0e769e821680 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2010-04-22T14:49:46 Monotone-Branch: ca.inverse.sogomaint-2.0.2
Francis Lachapelle
parent
ed80559b05
commit
f2439aa90d
|
|
@ -233,7 +233,8 @@
|
|||
if (byMonth)
|
||||
{
|
||||
// Restore the repeat count and interval
|
||||
[rrule setRepeatCount: repeatCount];
|
||||
if (repeatCount > 0)
|
||||
[rrule setRepeatCount: repeatCount];
|
||||
[rrule setRepeatInterval: interval];
|
||||
}
|
||||
return ranges;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,274 @@
|
|||
/* TestiCalRecurrenceCalculator.m - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2010 Inverse inc.
|
||||
*
|
||||
* Author: Francis Lachapelle <flachapelle@inverse.ca>
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This file 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 General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import <Foundation/NSString.h>
|
||||
#import <Foundation/NSArray.h>
|
||||
#import <Foundation/NSEnumerator.h>
|
||||
#import <Foundation/NSCalendarDate.h>
|
||||
|
||||
#import <NGCards/iCalRecurrenceRule.h>
|
||||
#import <NGCards/iCalRecurrenceCalculator.h>
|
||||
#import <NGCards/NSString+NGCards.h>
|
||||
|
||||
#import <NGExtensions/NGCalendarDateRange.h>
|
||||
#import <NGExtensions/NSCalendarDate+misc.h>
|
||||
|
||||
#import "SOGoTest.h"
|
||||
|
||||
@interface TestiCalRecurrenceCalculator : SOGoTest
|
||||
@end
|
||||
|
||||
@implementation TestiCalRecurrenceCalculator
|
||||
|
||||
- (void) test_recurrenceRangesWithinCalendarDateRange_
|
||||
{
|
||||
NSArray *rules = [NSArray arrayWithObjects:
|
||||
// Every other week on Monday, Wednesday and Friday until December 24,
|
||||
// 1997, but starting on Tuesday, September 2, 1997
|
||||
[NSArray arrayWithObjects: @"19970902T090000Z",
|
||||
@"FREQ=WEEKLY;INTERVAL=2;UNTIL=19971224T000000Z;WKST=SU;BYDAY=MO,WE,FR",
|
||||
@"19970902T090000Z",
|
||||
@"19970903T090000Z",
|
||||
@"19970905T090000Z",
|
||||
@"19970915T090000Z",
|
||||
@"19970917T090000Z",
|
||||
@"19970919T090000Z",
|
||||
@"19970929T090000Z",
|
||||
@"19971001T090000Z",
|
||||
@"19971003T090000Z",
|
||||
@"19971013T090000Z",
|
||||
@"19971015T090000Z",
|
||||
@"19971017T090000Z",
|
||||
@"19971027T090000Z",
|
||||
@"19971029T090000Z",
|
||||
@"19971031T090000Z",
|
||||
@"19971110T090000Z",
|
||||
@"19971112T090000Z",
|
||||
@"19971114T090000Z",
|
||||
@"19971124T090000Z",
|
||||
@"19971126T090000Z",
|
||||
@"19971128T090000Z",
|
||||
@"19971208T090000Z",
|
||||
@"19971210T090000Z",
|
||||
@"19971212T090000Z",
|
||||
@"19971222T090000Z",
|
||||
nil],
|
||||
// Monthly on the 1st Friday for ten occurrences
|
||||
[NSArray arrayWithObjects: @"19970905T090000Z",
|
||||
@"FREQ=MONTHLY;COUNT=10;BYDAY=1FR",
|
||||
@"19970905T090000Z",
|
||||
@"19971003T090000Z",
|
||||
@"19971107T090000Z",
|
||||
@"19971205T090000Z",
|
||||
@"19980102T090000Z",
|
||||
@"19980206T090000Z",
|
||||
@"19980306T090000Z",
|
||||
@"19980403T090000Z",
|
||||
@"19980501T090000Z",
|
||||
@"19980605T090000Z",
|
||||
nil],
|
||||
// Every other month on the 1st and last Sunday of the month for 10
|
||||
// occurrences
|
||||
[NSArray arrayWithObjects: @"19970907T090000Z",
|
||||
@"FREQ=MONTHLY;INTERVAL=2;COUNT=4;BYDAY=1SU,-1SU",
|
||||
@"19970907T090000Z",
|
||||
@"19970928T090000Z",
|
||||
@"19971102T090000Z",
|
||||
@"19971130T090000Z",
|
||||
nil],
|
||||
// Monthly on the third to the last day of the month, until Feb 26 1998
|
||||
[NSArray arrayWithObjects: @"19970928T090000Z",
|
||||
@"FREQ=MONTHLY;BYMONTHDAY=-3;UNTIL=19980226T090000Z",
|
||||
@"19970928T090000Z",
|
||||
@"19971029T090000Z",
|
||||
@"19971128T090000Z",
|
||||
@"19971229T090000Z",
|
||||
@"19980129T090000Z",
|
||||
@"19980226T090000Z",
|
||||
nil],
|
||||
// Every other year on January, February, and March for 10 occurrences
|
||||
[NSArray arrayWithObjects: @"19970310T090000Z",
|
||||
@"FREQ=YEARLY;INTERVAL=2;COUNT=10;BYMONTH=1,2,3",
|
||||
@"19970310T090000Z",
|
||||
@"19990110T090000Z",
|
||||
@"19990210T090000Z",
|
||||
@"19990310T090000Z",
|
||||
@"20010110T090000Z",
|
||||
@"20010210T090000Z",
|
||||
@"20010310T090000Z",
|
||||
@"20030110T090000Z",
|
||||
@"20030210T090000Z",
|
||||
@"20030310T090000Z",
|
||||
nil],
|
||||
// Everyday in January, for 3 years
|
||||
[NSArray arrayWithObjects: @"19980101T090000Z",
|
||||
@"FREQ=YEARLY;UNTIL=20000131T090000Z;BYMONTH=1;BYDAY=SU,MO,TU,WE,TH,FR,SA",
|
||||
// RRULE:FREQ=DAILY;UNTIL=20000131T090000Z;BYMONTH=1
|
||||
@"19980101T090000Z",
|
||||
@"19980102T090000Z",
|
||||
@"19980103T090000Z",
|
||||
@"19980104T090000Z",
|
||||
@"19980105T090000Z",
|
||||
@"19980106T090000Z",
|
||||
@"19980107T090000Z",
|
||||
@"19980108T090000Z",
|
||||
@"19980109T090000Z",
|
||||
@"19980110T090000Z",
|
||||
@"19980111T090000Z",
|
||||
@"19980112T090000Z",
|
||||
@"19980113T090000Z",
|
||||
@"19980114T090000Z",
|
||||
@"19980115T090000Z",
|
||||
@"19980116T090000Z",
|
||||
@"19980117T090000Z",
|
||||
@"19980118T090000Z",
|
||||
@"19980119T090000Z",
|
||||
@"19980120T090000Z",
|
||||
@"19980121T090000Z",
|
||||
@"19980122T090000Z",
|
||||
@"19980123T090000Z",
|
||||
@"19980124T090000Z",
|
||||
@"19980125T090000Z",
|
||||
@"19980126T090000Z",
|
||||
@"19980127T090000Z",
|
||||
@"19980128T090000Z",
|
||||
@"19980129T090000Z",
|
||||
@"19980130T090000Z",
|
||||
@"19980131T090000Z",
|
||||
@"19990101T090000Z",
|
||||
@"19990102T090000Z",
|
||||
@"19990103T090000Z",
|
||||
@"19990104T090000Z",
|
||||
@"19990105T090000Z",
|
||||
@"19990106T090000Z",
|
||||
@"19990107T090000Z",
|
||||
@"19990108T090000Z",
|
||||
@"19990109T090000Z",
|
||||
@"19990110T090000Z",
|
||||
@"19990111T090000Z",
|
||||
@"19990112T090000Z",
|
||||
@"19990113T090000Z",
|
||||
@"19990114T090000Z",
|
||||
@"19990115T090000Z",
|
||||
@"19990116T090000Z",
|
||||
@"19990117T090000Z",
|
||||
@"19990118T090000Z",
|
||||
@"19990119T090000Z",
|
||||
@"19990120T090000Z",
|
||||
@"19990121T090000Z",
|
||||
@"19990122T090000Z",
|
||||
@"19990123T090000Z",
|
||||
@"19990124T090000Z",
|
||||
@"19990125T090000Z",
|
||||
@"19990126T090000Z",
|
||||
@"19990127T090000Z",
|
||||
@"19990128T090000Z",
|
||||
@"19990129T090000Z",
|
||||
@"19990130T090000Z",
|
||||
@"19990131T090000Z",
|
||||
@"20000101T090000Z",
|
||||
@"20000102T090000Z",
|
||||
@"20000103T090000Z",
|
||||
@"20000104T090000Z",
|
||||
@"20000105T090000Z",
|
||||
@"20000106T090000Z",
|
||||
@"20000107T090000Z",
|
||||
@"20000108T090000Z",
|
||||
@"20000109T090000Z",
|
||||
@"20000110T090000Z",
|
||||
@"20000111T090000Z",
|
||||
@"20000112T090000Z",
|
||||
@"20000113T090000Z",
|
||||
@"20000114T090000Z",
|
||||
@"20000115T090000Z",
|
||||
@"20000116T090000Z",
|
||||
@"20000117T090000Z",
|
||||
@"20000118T090000Z",
|
||||
@"20000119T090000Z",
|
||||
@"20000120T090000Z",
|
||||
@"20000121T090000Z",
|
||||
@"20000122T090000Z",
|
||||
@"20000123T090000Z",
|
||||
@"20000124T090000Z",
|
||||
@"20000125T090000Z",
|
||||
@"20000126T090000Z",
|
||||
@"20000127T090000Z",
|
||||
@"20000128T090000Z",
|
||||
@"20000129T090000Z",
|
||||
@"20000130T090000Z",
|
||||
@"20000131T090000Z",
|
||||
nil],
|
||||
nil];
|
||||
|
||||
NSString *dateFormat = @"%a %Y-%m-%d %H:%M";
|
||||
NSString *error;
|
||||
NGCalendarDateRange *firRange, *range;
|
||||
NSEnumerator *rulesList;
|
||||
NSArray *currentRule, *occurrences;
|
||||
int i, j;
|
||||
NSCalendarDate *startDate, *endDate, *currentOccurrence;
|
||||
iCalRecurrenceRule *recurrenceRule;
|
||||
iCalRecurrenceCalculator *calculator;
|
||||
|
||||
rulesList = [rules objectEnumerator];
|
||||
while ((currentRule = [rulesList nextObject]))
|
||||
{
|
||||
startDate = [[currentRule objectAtIndex: 0] asCalendarDate];
|
||||
endDate = [startDate dateByAddingYears: 0 months: 0 days: 0 hours: 1 minutes: 0 seconds: 0];
|
||||
recurrenceRule = [iCalRecurrenceRule recurrenceRuleWithICalRepresentation: [currentRule objectAtIndex: 1]];
|
||||
// NSLog(@"%@: %@", startDate, recurrenceRule);
|
||||
|
||||
firRange = [NGCalendarDateRange calendarDateRangeWithStartDate: startDate
|
||||
endDate: endDate];
|
||||
calculator = [iCalRecurrenceCalculator recurrenceCalculatorForRecurrenceRule: recurrenceRule
|
||||
withFirstInstanceCalendarDateRange: firRange];
|
||||
range = [NGCalendarDateRange calendarDateRangeWithStartDate: startDate
|
||||
endDate: [NSCalendarDate distantFuture]];
|
||||
occurrences = [calculator recurrenceRangesWithinCalendarDateRange: range];
|
||||
for (i = 2, j = 0; i < [currentRule count] && j < [occurrences count]; i++, j++)
|
||||
{
|
||||
currentOccurrence = [[currentRule objectAtIndex: i] asCalendarDate];
|
||||
error = [NSString stringWithFormat: @"Invalid occurrence for recurrence rule %@: %@ (expected date was %@)",
|
||||
[currentRule objectAtIndex: 1],
|
||||
[[[occurrences objectAtIndex: j] startDate] descriptionWithCalendarFormat: dateFormat],
|
||||
[currentOccurrence descriptionWithCalendarFormat: dateFormat]];
|
||||
testWithMessage([currentOccurrence isDateOnSameDay: [[occurrences objectAtIndex: j] startDate]], error);
|
||||
// if ([currentOccurrence compare: [[occurrences objectAtIndex: j] startDate]] != NSOrderedSame)
|
||||
// NSLog(@"Expected: %@ Obtained: %@", [currentOccurrence descriptionWithCalendarFormat: dateFormat],
|
||||
// [[[occurrences objectAtIndex: j] startDate] descriptionWithCalendarFormat: dateFormat]);
|
||||
// else
|
||||
// NSLog(@" %@ Matched: %@", [currentOccurrence descriptionWithCalendarFormat: dateFormat],
|
||||
// [[[occurrences objectAtIndex: j] startDate] descriptionWithCalendarFormat: dateFormat]);
|
||||
}
|
||||
error = [NSString stringWithFormat: @"Unexpected number of occurrences for recurrence rule %@ (found %i, expected %i)",
|
||||
[currentRule objectAtIndex: 1],
|
||||
[occurrences count],
|
||||
[currentRule count] - 2];
|
||||
testWithMessage([currentRule count] - [occurrences count] == 2, error);
|
||||
// for (; i < [currentRule count]; i++)
|
||||
// NSLog(@"Expected additional date : %@", [[currentRule objectAtIndex: i] asCalendarDate]);
|
||||
// for (; j < [occurrences count]; j++)
|
||||
// NSLog(@"Found additional date : %@", [[occurrences objectAtIndex: j] startDate]);
|
||||
}
|
||||
}
|
||||
|
||||
@end
|
||||
Loading…
Reference in New Issue