Skip to content

Lower more experimental JSON fields. #1301

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
Sep 8, 2025
Merged

Lower more experimental JSON fields. #1301

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
4 changes: 4 additions & 0 deletions Sources/Testing/ABI/ABI.Record.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ extension ABI {
guard let event = EncodedEvent<V>(encoding: event, in: eventContext, messages: messages) else {
return nil
}
if !V.includesExperimentalFields && event.kind.rawValue.first == "_" {
// Don't encode experimental event kinds.
return nil
}
kind = .event(event)
}
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/Testing/ABI/Encoded/ABI.EncodedAttachment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ extension ABI {
init(encoding attachment: borrowing Attachment<AnyAttachable>, in eventContext: borrowing Event.Context) {
path = attachment.fileSystemPath

if V.versionNumber >= ABI.v6_3.versionNumber {
if V.includesExperimentalFields {
_preferredName = attachment.preferredName

if path == nil {
Expand Down
30 changes: 18 additions & 12 deletions Sources/Testing/ABI/Encoded/ABI.EncodedEvent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,31 +112,22 @@ extension ABI {
case let .issueRecorded(recordedIssue):
kind = .issueRecorded
issue = EncodedIssue(encoding: recordedIssue, in: eventContext)
_comments = recordedIssue.comments.map(\.rawValue)
_sourceLocation = recordedIssue.sourceLocation
case let .valueAttached(attachment):
kind = .valueAttached
self.attachment = EncodedAttachment(encoding: attachment, in: eventContext)
_sourceLocation = attachment.sourceLocation
case .testCaseEnded:
if eventContext.test?.isParameterized == false {
return nil
}
kind = .testCaseEnded
case let .testCaseCancelled(skipInfo):
case .testCaseCancelled:
kind = .testCaseCancelled
_comments = Array(skipInfo.comment).map(\.rawValue)
_sourceLocation = skipInfo.sourceLocation
case .testEnded:
kind = .testEnded
case let .testSkipped(skipInfo):
case .testSkipped:
kind = .testSkipped
_comments = Array(skipInfo.comment).map(\.rawValue)
_sourceLocation = skipInfo.sourceLocation
case let .testCancelled(skipInfo):
case .testCancelled:
kind = .testCancelled
_comments = Array(skipInfo.comment).map(\.rawValue)
_sourceLocation = skipInfo.sourceLocation
case .runEnded:
kind = .runEnded
default:
Expand All @@ -148,6 +139,21 @@ extension ABI {

// Experimental fields
if V.includesExperimentalFields {
switch event.kind {
case let .issueRecorded(recordedIssue):
_comments = recordedIssue.comments.map(\.rawValue)
_sourceLocation = recordedIssue.sourceLocation
case let .valueAttached(attachment):
_sourceLocation = attachment.sourceLocation
case let .testCaseCancelled(skipInfo),
let .testSkipped(skipInfo),
let .testCancelled(skipInfo):
_comments = Array(skipInfo.comment).map(\.rawValue)
_sourceLocation = skipInfo.sourceLocation
default:
break
}

if eventContext.test?.isParameterized == true {
_testCase = eventContext.testCase.map(EncodedTestCase.init)
}
Expand Down