Skip to content

Bugfix: Corrected the conversion of nanoseconds to milliseconds in DateComponents #101

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

Merged
marcprux merged 1 commit into from
Mar 12, 2026
Merged

Bugfix: Corrected the conversion of nanoseconds to milliseconds in DateComponents #101

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
2 changes: 1 addition & 1 deletion Sources/SkipFoundation/DateComponents.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ public struct DateComponents : Codable, Hashable, CustomStringConvertible {
cal.set(java.util.Calendar.SECOND, second)
}
if let nanosecond = self.nanosecond {
cal.set(java.util.Calendar.MILLISECOND, nanosecond * 1_000_000)
cal.set(java.util.Calendar.MILLISECOND, nanosecond / 1_000_000)
}

return cal
Expand Down
8 changes: 6 additions & 2 deletions Tests/SkipFoundationTests/DateTime/TestCalendar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,13 +307,17 @@ class TestCalendar: XCTestCase {

func test_addingComponents() {
let calendar = Calendar(identifier: Calendar.Identifier.gregorian)
let thisDay = calendar.date(from: DateComponents(year: 2016, month: 10, day: 4))!
let thisDay = calendar.date(from: DateComponents(year: 2016, month: 10, day: 4, hour: 1, minute: 2, second: 3, nanosecond: 4))!
let dayAfter = calendar.date(byAdding: .day, value: 1, to: thisDay)

let dayAfterComponents = calendar.dateComponents(Set([Calendar.Component.year, Calendar.Component.month, Calendar.Component.day]), from: dayAfter!)
let dayAfterComponents = calendar.dateComponents(Set([Calendar.Component.year, Calendar.Component.month, Calendar.Component.day, Calendar.Component.hour, Calendar.Component.minute, Calendar.Component.second, Calendar.Component.nanosecond]), from: dayAfter!)
XCTAssertEqual(dayAfterComponents.year, 2016)
XCTAssertEqual(dayAfterComponents.month, 10)
XCTAssertEqual(dayAfterComponents.day, 5)
XCTAssertEqual(dayAfterComponents.hour, 1)
XCTAssertEqual(dayAfterComponents.minute, 2)
XCTAssertEqual(dayAfterComponents.second, 3)
XCTAssertEqual(dayAfterComponents.nanosecond, 0)
}

func test_matchesComponents() {
Expand Down
Loading