Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Properly adjust invalid dates in RecurrenceRule enumeration #1077

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −2
Open

Properly adjust invalid dates in RecurrenceRule enumeration #1077

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Sources/FoundationEssentials/Calendar/Calendar_Recurrence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,8 @@ extension Calendar {
}

let results = try unadjustedMatchDates.map { date, components in
(try _adjustedDate(date, startingAfter: start, allowStartDate: true, matching: components, adjustedMatchingComponents: components , matchingPolicy: matchingPolicy, repeatedTimePolicy: repeatedTimePolicy, direction: .forward, inSearchingDate: start, previouslyReturnedMatchDate: nil), components)
let adjustedComponents = _adjustedComponents(components, date: start, direction: .forward)
return (try _adjustedDate(date, startingAfter: start, allowStartDate: true, matching: components, adjustedMatchingComponents: adjustedComponents, matchingPolicy: matchingPolicy, repeatedTimePolicy: repeatedTimePolicy, direction: .forward, inSearchingDate: start, previouslyReturnedMatchDate: nil), components)
}

var foundDates: [Date] = []
Expand Down
25 changes: 24 additions & 1 deletion Tests/FoundationEssentialsTests/GregorianCalendarRecurrenceRuleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,29 @@ final class GregorianCalendarRecurrenceRuleTests: XCTestCase {
]
XCTAssertEqual(results, expectedResults)
}

func testYearlyRecurrenceMovingToFeb29() {
/// Rule for an event that repeats on February 29th of each year, or closest date after
var rule = Calendar.RecurrenceRule(calendar: gregorian, frequency: .yearly, matchingPolicy: .nextTimePreservingSmallerComponents)
rule.months = [2]
rule.daysOfTheMonth = [29]

let rangeStart = Date(timeIntervalSince1970: 946684800.0) // 2000-01-01T00:00:00-0000
let rangeEnd = Date(timeIntervalSince1970: 1262304000.0) // 2010-01-01T00:00:00-0000
var birthdays = rule.recurrences(of: rangeStart, in: rangeStart..<rangeEnd).makeIterator()
// ^ The initial date here does not matter, since the rule will change the month and day
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought the initial date does matter in a sense -- it does affect hour, minute and second of the results. Perhaps rephrase this comment to clarify that the initial date does not affect specifically the month and day of the results?


XCTAssertEqual(birthdays.next(), Date(timeIntervalSince1970: 951782400.0)) // 2000-02-29T00:00:00-0000
XCTAssertEqual(birthdays.next(), Date(timeIntervalSince1970: 983404800.0)) // 2001-03-01T00:00:00-0000
XCTAssertEqual(birthdays.next(), Date(timeIntervalSince1970: 1014940800.0)) // 2002-03-01T00:00:00-0000
XCTAssertEqual(birthdays.next(), Date(timeIntervalSince1970: 1046476800.0)) // 2003-03-01T00:00:00-0000
XCTAssertEqual(birthdays.next(), Date(timeIntervalSince1970: 1078012800.0)) // 2004-02-29T00:00:00-0000
XCTAssertEqual(birthdays.next(), Date(timeIntervalSince1970: 1109635200.0)) // 2005-03-01T00:00:00-0000
XCTAssertEqual(birthdays.next(), Date(timeIntervalSince1970: 1141171200.0)) // 2006-03-01T00:00:00-0000
XCTAssertEqual(birthdays.next(), Date(timeIntervalSince1970: 1172707200.0)) // 2007-03-01T00:00:00-0000
XCTAssertEqual(birthdays.next(), Date(timeIntervalSince1970: 1204243200.0)) // 2008-02-29T00:00:00-0000
XCTAssertEqual(birthdays.next(), Date(timeIntervalSince1970: 1235865600.0)) // 2009-03-01T00:00:00-0000
}

func testYearlyRecurrenceWithMonthExpansion() {
let start = Date(timeIntervalSince1970: 1285027200.0) // 2010-09-21T00:00:00-0000
Expand Down Expand Up @@ -780,5 +803,5 @@ final class GregorianCalendarRecurrenceRuleTests: XCTestCase {
Date(timeIntervalSince1970: 1695304800.0), // 2023-09-21T14:00:00-0000
]
XCTAssertEqual(results, expectedResults)
}
}
}