Skip to content

Merge release/6.2 into main #1446

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
merged 2 commits into from
Jul 21, 2025
Merged

Merge release/6.2 into main #1446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfecd11
Disable `nsICUNumberFormatterCache` test (#1443)
itingliu Jul 18, 2025
1d9f578
Update current preference-using Date.RelativeFormatStyle tests (#1444)
jmschonfeld Jul 19, 2025
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
43 changes: 27 additions & 16 deletions Tests/FoundationInternationalizationTests/Formatting/DateRelativeFormatStyleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,20 @@ private struct DateRelativeFormatStyleTests {
#expect(style.format(Date(timeIntervalSinceNow: oneHour * 1.5)) == "in 2 hours")
}

@Test func dateRelativeFormatConvenience() throws {
let now = Date()
let tomorrow = Date(timeInterval: oneDay + oneHour * 2, since: now)
let future = Date(timeInterval: oneDay * 14 + oneHour * 3, since: now)
let past = Date(timeInterval: -(oneDay * 14 + oneHour * 2), since: now)

#expect(past.formatted(.relative(presentation: .named).locale(enUSLocale)) == Date.RelativeFormatStyle(presentation: .named, unitsStyle: .wide).locale(enUSLocale).format(past))
#expect(tomorrow.formatted(.relative(presentation: .numeric).locale(enUSLocale)) == Date.RelativeFormatStyle(presentation: .numeric, unitsStyle: .wide).locale(enUSLocale).format(tomorrow))
#expect(tomorrow.formatted(Date.RelativeFormatStyle(presentation: .named).locale(enUSLocale)) == Date.RelativeFormatStyle(presentation: .named).locale(enUSLocale).format(tomorrow))

#expect(past.formatted(Date.RelativeFormatStyle(unitsStyle: .spellOut, capitalizationContext: .beginningOfSentence).locale(enUSLocale)) == Date.RelativeFormatStyle(unitsStyle: .spellOut, capitalizationContext: .beginningOfSentence).locale(enUSLocale).format(past))
#expect(future.formatted(.relative(presentation: .numeric, unitsStyle: .abbreviated).locale(enUSLocale)) == Date.RelativeFormatStyle(unitsStyle: .abbreviated).locale(enUSLocale).format(future))
@Test func dateRelativeFormatConvenience() async {
await usingCurrentInternationalizationPreferences {
let now = Date()
let tomorrow = Date(timeInterval: oneDay + oneHour * 2, since: now)
let future = Date(timeInterval: oneDay * 14 + oneHour * 3, since: now)
let past = Date(timeInterval: -(oneDay * 14 + oneHour * 2), since: now)

#expect(past.formatted(.relative(presentation: .named).locale(enUSLocale)) == Date.RelativeFormatStyle(presentation: .named, unitsStyle: .wide).locale(enUSLocale).format(past))
#expect(tomorrow.formatted(.relative(presentation: .numeric).locale(enUSLocale)) == Date.RelativeFormatStyle(presentation: .numeric, unitsStyle: .wide).locale(enUSLocale).format(tomorrow))
#expect(tomorrow.formatted(Date.RelativeFormatStyle(presentation: .named).locale(enUSLocale)) == Date.RelativeFormatStyle(presentation: .named).locale(enUSLocale).format(tomorrow))

#expect(past.formatted(Date.RelativeFormatStyle(unitsStyle: .spellOut, capitalizationContext: .beginningOfSentence).locale(enUSLocale)) == Date.RelativeFormatStyle(unitsStyle: .spellOut, capitalizationContext: .beginningOfSentence).locale(enUSLocale).format(past))
#expect(future.formatted(.relative(presentation: .numeric, unitsStyle: .abbreviated).locale(enUSLocale)) == Date.RelativeFormatStyle(unitsStyle: .abbreviated).locale(enUSLocale).format(future))
}
}

@Test func namedStyleRounding() throws {
Expand Down Expand Up @@ -332,8 +334,8 @@ private struct DateRelativeFormatStyleTests {
var named = Date.RelativeFormatStyle(presentation: .named, locale: enUSLocale, calendar: calendar)

func _verifyStyle(_ dateStr: String, relativeTo: String, expected: String, sourceLocation: SourceLocation = #_sourceLocation) {
let date = try! Date.ISO8601FormatStyle().parse(dateStr)
let refDate = try! Date.ISO8601FormatStyle().parse(relativeTo)
let date = try! Date.ISO8601FormatStyle(timeZone: .gmt).parse(dateStr)
let refDate = try! Date.ISO8601FormatStyle(timeZone: .gmt).parse(relativeTo)
let formatted = named._format(date, refDate: refDate)
#expect(formatted == expected, sourceLocation: sourceLocation)
}
Expand Down Expand Up @@ -408,7 +410,7 @@ private struct TestDateAnchoredRelativeDiscreteConformance {

@Test func examples() throws {
var now = Date.now
var style = Date.AnchoredRelativeFormatStyle(anchor: now)
var style = Date.AnchoredRelativeFormatStyle(anchor: now, calendar: calendar)
.locale(enUSLocale)

#expect(style.discreteInput(after: now.addingTimeInterval(1)) == now.addingTimeInterval(1.5))
Expand Down Expand Up @@ -868,28 +870,32 @@ private struct TestDateAnchoredRelativeDiscreteConformance {
now = Date(timeIntervalSinceReferenceDate: 724685580.417914)
style = .init(anchor: now, allowedFields: [.minute], presentation: .numeric, unitsStyle: .abbreviated)
style.calendar = self.calendar
style.locale = enUSLocale
#expect(try #require(style.discreteInput(after: Date(timeIntervalSinceReferenceDate: 12176601839.415668))) > Date(timeIntervalSinceReferenceDate: 12176601839.415668))


now = Date(timeIntervalSinceReferenceDate: 724686086.706003)
style = .init(anchor: now, allowedFields: [.minute], presentation: .numeric, unitsStyle: .abbreviated)
style.calendar = self.calendar
style.locale = enUSLocale
#expect(try #require(style.discreteInput(before: Date(timeIntervalSinceReferenceDate: -24141834543.08099))) < Date(timeIntervalSinceReferenceDate: -24141834543.08099))

now = Date(timeIntervalSinceReferenceDate: 724688507.315708)
style = .init(anchor: now, allowedFields: [.minute, .second], presentation: .numeric, unitsStyle: .abbreviated)
style.calendar = self.calendar
style.locale = enUSLocale
#expect(try #require(style.discreteInput(after: Date(timeIntervalSinceReferenceDate: 6013270816.926929))) > Date(timeIntervalSinceReferenceDate: 6013270816.926929))

now = Date(timeIntervalSinceReferenceDate: 724689590.234374)
style = .init(anchor: now, allowedFields: [.month, .week], presentation: .numeric, unitsStyle: .abbreviated)
style.calendar = self.calendar
print(style.format(Date(timeIntervalSinceReferenceDate: 722325435.4645464)))
style.locale = enUSLocale
#expect(try #require(style.discreteInput(after: Date(timeIntervalSinceReferenceDate: 722325435.4645464))) > Date(timeIntervalSinceReferenceDate: 722325435.4645464))

now = Date(timeIntervalSinceReferenceDate: 724701229.591328)
style = .init(anchor: now, presentation: .numeric, unitsStyle: .abbreviated)
style.calendar = self.calendar
style.locale = enUSLocale
/// style.discreteInput(before: Date(timeIntervalSinceReferenceDate: -7256167.2374657225)) returned Date(timeIntervalSinceReferenceDate: -31622400.5), but
/// Date(timeIntervalSinceReferenceDate: -31622400.49), which is a valid input, because style.input(after: Date(timeIntervalSinceReferenceDate: -31622400.5)) = Date(timeIntervalSinceReferenceDate: -31622400.49),
/// already produces a different formatted output 'in 24 yr' compared to style.format(Date(timeIntervalSinceReferenceDate: -7256167.2374657225)), which is 'in 23 yr'
Expand All @@ -899,6 +905,7 @@ private struct TestDateAnchoredRelativeDiscreteConformance {
now = Date(timeIntervalSinceReferenceDate: 724707086.436074)
style = .init(anchor: now, presentation: .numeric, unitsStyle: .abbreviated)
style.calendar = self.calendar
style.locale = enUSLocale
/// style.discreteInput(after: Date(timeIntervalSinceReferenceDate: -728.7911686889214)) returned Date(timeIntervalSinceReferenceDate: 0.9360740142747098), but
/// Date(timeIntervalSinceReferenceDate: 0.9260740142747098), which is a valid input, because style.input(before: Date(timeIntervalSinceReferenceDate: 0.9360740142747098)) = Date(timeIntervalSinceReferenceDate: 0.9260740142747098),
/// already produces a different formatted output 'in 22 yr' compared to style.format(Date(timeIntervalSinceReferenceDate: -728.7911686889214)), which is 'in 23 yr'
Expand All @@ -908,11 +915,13 @@ private struct TestDateAnchoredRelativeDiscreteConformance {
now = Date(timeIntervalSinceReferenceDate: 724707983.332096)
style = .init(anchor: now, allowedFields: [.year, .month, .day, .hour, .minute], presentation: .named, unitsStyle: .wide)
style.calendar = self.calendar
style.locale = enUSLocale
#expect(try #require(style.discreteInput(after: Date(timeIntervalSinceReferenceDate: 722086631.228182))) > Date(timeIntervalSinceReferenceDate: 722086631.228182))

now = Date(timeIntervalSinceReferenceDate: 725887340.112405)
style = .init(anchor: now, allowedFields: [.month, .week, .day, .hour], presentation: .numeric, unitsStyle: .abbreviated)
style.calendar = self.calendar
style.locale = enUSLocale
/// style.discreteInput(before: Date(timeIntervalSinceReferenceDate: 728224511.9413433)) returned Date(timeIntervalSinceReferenceDate: 727487999.6124048), but
/// Date(timeIntervalSinceReferenceDate: 727487999.6224048), which is a valid input, because style.input(after: Date(timeIntervalSinceReferenceDate: 727487999.6124048)) = Date(timeIntervalSinceReferenceDate: 727487999.6224048),
/// already produces a different formatted output '3 wk ago' compared to style.format(Date(timeIntervalSinceReferenceDate: 728224511.9413433)), which is '1 mo ago'
Expand All @@ -921,6 +930,7 @@ private struct TestDateAnchoredRelativeDiscreteConformance {
now = Date(timeIntervalSinceReferenceDate: 725895690.016681)
style = .init(anchor: now, presentation: .numeric, unitsStyle: .abbreviated)
style.calendar = self.calendar
style.locale = enUSLocale
/// style.discreteInput(before: Date(timeIntervalSinceReferenceDate: 726561180.513301)) returned Date(timeIntervalSinceReferenceDate: 726364799.5166808), but
/// Date(timeIntervalSinceReferenceDate: 726364799.5266808), which is a valid input, because style.input(after: Date(timeIntervalSinceReferenceDate: 726364799.5166808)) = Date(timeIntervalSinceReferenceDate: 726364799.5266808),
/// already produces a different formatted output '6 days ago' compared to style.format(Date(timeIntervalSinceReferenceDate: 726561180.513301)), which is '1 wk ago'
Expand All @@ -929,6 +939,7 @@ private struct TestDateAnchoredRelativeDiscreteConformance {
now = Date(timeIntervalSinceReferenceDate: 725903036.660503)
style = .init(anchor: now, presentation: .numeric, unitsStyle: .abbreviated)
style.calendar = self.calendar
style.locale = enUSLocale
/// style.discreteInput(after: Date(timeIntervalSinceReferenceDate: 725318223.6599436)) returned Date(timeIntervalSinceReferenceDate: 725414400.1605031), but
/// Date(timeIntervalSinceReferenceDate: 725398549.919868), which is a valid input, because style.input(before: Date(timeIntervalSinceReferenceDate: 725414400.1605031)) = Date(timeIntervalSinceReferenceDate: 725414400.1505032),
/// already produces a different formatted output 'in 6 days' compared to style.format(Date(timeIntervalSinceReferenceDate: 725318223.6599436)), which is 'in 1 wk'
Expand Down
4 changes: 3 additions & 1 deletion Tests/FoundationInternationalizationTests/Formatting/NumberFormatStyleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ private struct NumberFormatStyleTests {
#expect(formatter_long.format(42 as Double) == "0,000,000,000,000,000,000,000,000,000,000,000,000,042")
}

#if !os(watchOS) // 99504292
#if !os(watchOS) && FOUNDATION_FRAMEWORK // 99504292 && 155484008
// This test would fail if the cache is cleared while running the test
// But we still enable it for FOUNDATION_FRAMEWORK because it somehow still passes there
@Test func nsICUNumberFormatterCache() throws {

let intStyle = IntegerFormatStyle<Int64>(locale: Locale(identifier: "en_US"))
Expand Down