Skip to content

Clean up for #1074 #1128

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 1 commit into from
Jan 22, 2025
Merged

Clean up for #1074 #1128

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
14 changes: 7 additions & 7 deletions Tests/FoundationInternationalizationTests/Formatting/NumberFormatStyleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ final class NumberFormatStyleTests: XCTestCase {
XCTAssertEqual((-3.14159 as Decimal).formatted(.currency(code:"USD")), currencyStyle.format(-3.14159))
XCTAssertEqual((-3000.14159 as Decimal).formatted(.currency(code:"USD")), currencyStyle.format(-3000.14159))
}

#if FOUNDATION_FRAMEWORK
func test_autoupdatingCurrentChangesFormatResults() {
let locale = Locale.autoupdatingCurrent
Expand All @@ -450,7 +450,7 @@ final class NumberFormatStyleTests: XCTestCase {
let currency = Decimal(123.45)
let percent = 54.32
let bytes = 1_234_567_890

// Get a formatted result from es-ES
var prefs = LocalePreferences()
prefs.languages = ["es-ES"]
Expand All @@ -463,7 +463,7 @@ final class NumberFormatStyleTests: XCTestCase {
let formattedSpanishCurrency = currency.formatted(.currency(code: "USD").locale(locale))
let formattedSpanishPercent = percent.formatted(.percent.locale(locale))
let formattedSpanishBytes = bytes.formatted(.byteCount(style: .decimal).locale(locale))

// Get a formatted result from en-US
prefs.languages = ["en-US"]
prefs.locale = "en_US"
Expand All @@ -475,7 +475,7 @@ final class NumberFormatStyleTests: XCTestCase {
let formattedEnglishCurrency = currency.formatted(.currency(code: "USD").locale(locale))
let formattedEnglishPercent = percent.formatted(.percent.locale(locale))
let formattedEnglishBytes = bytes.formatted(.byteCount(style: .decimal).locale(locale))

// Reset to current preferences before any possibility of failing this test
LocaleCache.cache.reset()

Expand Down Expand Up @@ -598,7 +598,7 @@ final class NumberFormatStyleTests: XCTestCase {
func testCurrency_Codable() throws {
let gbpInUS = Decimal.FormatStyle.Currency(code: "GBP", locale: enUSLocale)
let encoded = try JSONEncoder().encode(gbpInUS)
let json_gbp = String(data: encoded, encoding: String.Encoding.utf8)!
// Valid JSON presentation of the format style
let previouslyEncoded = """
{
"collection":
Expand All @@ -615,14 +615,14 @@ final class NumberFormatStyleTests: XCTestCase {
"identifier": "en_US"
}
}
""".data(using: .utf8)
""".data(using: .utf8)

guard let previouslyEncoded else {
XCTFail()
return
}

let decoded = try JSONDecoder().decode(Decimal.FormatStyle.Currency, from: previouslyEncoded)
let decoded = try JSONDecoder().decode(Decimal.FormatStyle.Currency.self, from: previouslyEncoded)
XCTAssertEqual(decoded, gbpInUS)
}

Expand Down