Monotone-Parent: 5626a85621c5f1c132d788ea29e164c8fc44cfdf
Monotone-Revision: cd39fe0df424d1e5afd5dcfa4b1c94ad707fed24 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-04-23T21:19:08maint-2.0.2
parent
b8930b7bd0
commit
f9d34ea6ec
|
@ -90,7 +90,6 @@
|
|||
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];
|
||||
|
@ -107,22 +106,12 @@
|
|||
[[[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]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -221,22 +210,12 @@
|
|||
[[[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]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -380,7 +359,6 @@
|
|||
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];
|
||||
|
@ -397,22 +375,12 @@
|
|||
[[[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]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue