LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

s/occurence/occurrence/g

pull/2/merge
Wolfgang Sourdeau 2012-10-20 13:27:24 -04:00
parent 3cd249f231
commit 948bafd2bf
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SOPE/NGCards/iCalTimeZonePeriod.h
View File

@ -34,7 +34,7 @@
- (NSCalendarDate *) startDate;
- (iCalRecurrenceRule *) recurrenceRule;
- (NSCalendarDate *) occurenceForDate: (NSCalendarDate *) refDate;
- (NSCalendarDate *) occurrenceForDate: (NSCalendarDate *) refDate;
- (int) secondsOffsetFromGMT;
- (NSComparisonResult) compare: (iCalTimeZonePeriod *) otherPeriod;

8
SOPE/NGCards/iCalTimeZonePeriod.m
View File

@ -120,8 +120,8 @@
* We assume that a RRULE for a timezone will always be YEARLY with a BYMONTH
* and a BYDAY rule.
*/
- (NSCalendarDate *) _occurenceForDate: (NSCalendarDate *) refDate
byRRule: (iCalRecurrenceRule *) rrule
- (NSCalendarDate *) _occurrenceForDate: (NSCalendarDate *) refDate
byRRule: (iCalRecurrenceRule *) rrule
{
NSCalendarDate *tmpDate;
iCalByDayMask *byDayMask;
@ -169,7 +169,7 @@
return tmpDate;
}
- (NSCalendarDate *) occurenceForDate: (NSCalendarDate *) refDate;
- (NSCalendarDate *) occurrenceForDate: (NSCalendarDate *) refDate;
{
NSCalendarDate *tmpDate;
iCalRecurrenceRule *rrule;
@ -181,7 +181,7 @@
tmpDate
= [(iCalDateTime *) [self uniqueChildWithTag: @"dtstart"] dateTime];
else if ([rrule untilDate] == nil || [refDate compare: [rrule untilDate]] == NSOrderedAscending)
tmpDate = [self _occurenceForDate: refDate byRRule: rrule];
tmpDate = [self _occurrenceForDate: refDate byRRule: rrule];
return tmpDate;
}

18
Tests/Unit/TestiCalTimeZonePeriod.m
View File

@ -32,8 +32,8 @@
@interface iCalTimeZonePeriod (private)
- (NSCalendarDate *) _occurenceForDate: (NSCalendarDate *) refDate
byRRule: (iCalRecurrenceRule *) rrule;
- (NSCalendarDate *) _occurrenceForDate: (NSCalendarDate *) refDate
byRRule: (iCalRecurrenceRule *) rrule;
@end
@ -42,9 +42,9 @@
@implementation TestiCalTimeZonePeriod
/* TODO: this test fails for obscure reasons, but test__occurenceForDate_byRRule_ does not, which
/* TODO: this test fails for obscure reasons, but test__occurrenceForDate_byRRule_ does not, which
is a good sign */
- (void) test_occurenceForDate_
- (void) test_occurrenceForDate_
{
NSString *periods[] = { (@"BEGIN:DAYLIGHT\r\n"
@"TZOFFSETFROM:-0500\r\n"
@ -75,17 +75,17 @@
for (count = 0; count < 2; count++)
{
period = [iCalTimeZonePeriod parseSingleFromSource: periods[count]];
testDate = [period occurenceForDate: [dateStrings[count] asCalendarDate]];
testDate = [period occurrenceForDate: [dateStrings[count] asCalendarDate]];
delta = (NSInteger) [testDate timeIntervalSince1970] - occurrenceSeconds[count];
testWithMessage ((NSInteger) [testDate timeIntervalSince1970]
== occurrenceSeconds[count],
([NSString stringWithFormat:
@"test %d: seconds do not match:"
@"test %d: seconds do not match:"
@" delta = %d", count, delta]));
}
}
- (void) test__occurenceForDate_byRRule_
- (void) test__occurrenceForDate_byRRule_
{
/* all rules are happening on 2010-03-14 */
NSString *periods[] = { @"20100307T120000Z",
@ -144,8 +144,8 @@
while (*currentDate)
{
testDate = [*currentDate asCalendarDate];
resultDate = [testPeriod _occurenceForDate: testDate
byRRule: (iCalRecurrenceRule *) [testPeriod uniqueChildWithTag: @"rrule"]];
resultDate = [testPeriod _occurrenceForDate: testDate
byRRule: (iCalRecurrenceRule *) [testPeriod uniqueChildWithTag: @"rrule"]];
error = [NSString stringWithFormat: @"time change date for date '%@' does not occur on expected date (result: %@, exp.: %@)",
*currentDate, resultDate, timeChangeDate];