-
Notifications
You must be signed in to change notification settings - Fork 3
fix: encode RFC 3339 UTC offset as "Z" instead of "+0000" #27
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.
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
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
528f639
fix: encode RFC 3339 UTC offset as "Z" instead of "+0000"
ElonPark e2c10d0
test: cover RFC 3339 decode of legacy +0000 / +00:00 / Z offsets
ElonPark 5727b7f
test: migrate RFC3339StrategyTests to Swift Testing
ElonPark 18808b4
test: expand RFC3339Strategy coverage as BDD suites
ElonPark File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
99 changes: 99 additions & 0 deletions
99
Tests/KarrotCodableKitTests/BetterCodable/DateValue/RFC3339StrategyTests.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| // | ||
| // RFC3339StrategyTests.swift | ||
| // KarrotCodableKit | ||
| // | ||
| // Created by Elon on 7/13/26. | ||
| // | ||
|
|
||
| import Foundation | ||
| import Testing | ||
|
|
||
| import KarrotCodableKit | ||
|
|
||
| @Suite("RFC3339Strategy") | ||
| struct RFC3339StrategyTests { | ||
|
|
||
| private struct Fixture: Codable { | ||
| @DateValue<RFC3339Strategy> var date: Date | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Encoding a Date | ||
|
|
||
| extension RFC3339StrategyTests { | ||
|
|
||
| @Test | ||
| func encodesUTCDateWithZOffsetInsteadOfRFC822Offset() { | ||
| // given | ||
| let date = Date(timeIntervalSince1970: 1715082540) // 2024-05-07T11:49:00 UTC | ||
|
|
||
| // when | ||
| let result = RFC3339Strategy.encode(date) | ||
|
|
||
| // then | ||
| // RFC 3339 allows only "Z" or "+00:00" for UTC, never the colon-less "+0000". | ||
| #expect(result == "2024-05-07T11:49:00Z") | ||
| } | ||
|
|
||
| @Test | ||
| func serializesUTCDateWithZOffsetViaJSONEncoder() throws { | ||
| // given | ||
| let date = Date(timeIntervalSince1970: 1715082540) // 2024-05-07T11:49:00 UTC | ||
| let fixture = Fixture(date: date) | ||
|
|
||
| // when | ||
| let data = try JSONEncoder().encode(fixture) | ||
| let json = try #require(String(bytes: data, encoding: .utf8)) | ||
|
|
||
| // then | ||
| #expect(json.contains("\"2024-05-07T11:49:00Z\"")) | ||
| #expect(!json.contains("+0000")) | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Decoding an RFC 3339 string | ||
|
|
||
| extension RFC3339StrategyTests { | ||
|
|
||
| @Test(arguments: [ | ||
| "2024-05-07T11:49:00Z", | ||
| "2024-05-07T11:49:00+00:00", | ||
| "2024-05-07T11:49:00+0000" | ||
| ]) | ||
| func decodesEveryUTCOffsetFormToSameInstant(input: String) throws { | ||
| // when | ||
| let date = try RFC3339Strategy.decode(input) | ||
|
|
||
| // then | ||
| // "ZZZZZ" still parses every offset form the old "Z" pattern accepted. | ||
| #expect(date == Date(timeIntervalSince1970: 1715082540)) | ||
| } | ||
|
|
||
| @Test(arguments: [ | ||
| "1996-12-19T16:39:57-08:00", | ||
| "1996-12-19T16:39:57-0800" | ||
| ]) | ||
| func decodesNonUTCOffsetsWithOrWithoutColon(input: String) throws { | ||
| // when | ||
| let date = try RFC3339Strategy.decode(input) | ||
|
|
||
| // then | ||
| #expect(date == Date(timeIntervalSince1970: 851042397)) | ||
| } | ||
|
ElonPark marked this conversation as resolved.
|
||
| } | ||
|
|
||
| // MARK: - Decoding a malformed string | ||
|
|
||
| extension RFC3339StrategyTests { | ||
|
|
||
| @Test | ||
| func throwsDataCorruptedErrorForMalformedString() { | ||
| // when / then | ||
| #expect { | ||
| try RFC3339Strategy.decode("not-a-valid-date") | ||
| } throws: { error in | ||
| guard case DecodingError.dataCorrupted = error else { return false } | ||
| return true | ||
| } | ||
|
ElonPark marked this conversation as resolved.
|
||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.