Skip to content
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

Attachments! #770

Merged
merged 17 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
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
17 changes: 17 additions & 0 deletions Sources/Testing/ABI/EntryPoints/EntryPoint.swift
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,9 @@ public struct __CommandLineArguments_v0: Sendable {

/// The value of the `--repeat-until` argument.
public var repeatUntil: String?

/// The value of the `--experimental-attachment-path` argument.
public var experimentalAttachmentPath: String?
grynspan marked this conversation as resolved.
Show resolved Hide resolved
}

extension __CommandLineArguments_v0: Codable {
Expand All @@ -295,6 +298,7 @@ extension __CommandLineArguments_v0: Codable {
case skip
case repetitions
case repeatUntil
case experimentalAttachmentPath
grynspan marked this conversation as resolved.
Show resolved Hide resolved
}
}

Expand Down Expand Up @@ -355,6 +359,11 @@ func parseCommandLineArguments(from args: [String]) throws -> __CommandLineArgum
if let xunitOutputIndex = args.firstIndex(of: "--xunit-output"), !isLastArgument(at: xunitOutputIndex) {
result.xunitOutput = args[args.index(after: xunitOutputIndex)]
}

// Attachment output
if let attachmentPathIndex = args.firstIndex(of: "--experimental-attachment-path"), !isLastArgument(at: attachmentPathIndex) {
result.experimentalAttachmentPath = args[args.index(after: attachmentPathIndex)]
}
#endif

if args.contains("--list-tests") {
Expand Down Expand Up @@ -464,6 +473,14 @@ public func configurationForEntryPoint(from args: __CommandLineArguments_v0) thr
}
}

// Attachment output.
if let attachmentPath = args.experimentalAttachmentPath {
guard fileExists(atPath: attachmentPath) else {
throw _EntryPointError.invalidArgument("--experimental-attachment-path", value: attachmentPath)
}
configuration.attachmentDirectoryPath = attachmentPath
}

#if canImport(Foundation)
// Event stream output (experimental)
if let eventStreamOutputPath = args.eventStreamOutputPath {
Expand Down
32 changes: 32 additions & 0 deletions Sources/Testing/ABI/v0/Encoded/ABIv0.EncodedAttachment.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2024 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

extension ABIv0 {
/// A type implementing the JSON encoding of ``Test/Attachment`` for the ABI
/// entry point and event stream output.
///
/// This type is not part of the public interface of the testing library. It
/// assists in converting values to JSON; clients that consume this JSON are
/// expected to write their own decoders.
///
/// - Warning: Attachments are not yet part of the JSON schema.
struct EncodedAttachment: Sendable {
/// The path where the attachment was written.
var path: String?

init(encoding attachment: borrowing Test.Attachment, in eventContext: borrowing Event.Context) {
path = attachment.fileSystemPath
}
}
}

// MARK: - Codable

extension ABIv0.EncodedAttachment: Codable {}
12 changes: 12 additions & 0 deletions Sources/Testing/ABI/v0/Encoded/ABIv0.EncodedEvent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ extension ABIv0 {
case testStarted
case testCaseStarted
case issueRecorded
case valueAttached = "_valueAttached"
case testCaseEnded
case testEnded
case testSkipped
Expand All @@ -45,6 +46,14 @@ extension ABIv0 {
/// ``kind-swift.property`` property is ``Kind-swift.enum/issueRecorded``.
var issue: EncodedIssue?

/// The value that was attached, if any.
///
/// The value of this property is `nil` unless the value of the
/// ``kind-swift.property`` property is ``Kind-swift.enum/valueAttached``.
///
/// - Warning: Attachments are not yet part of the JSON schema.
var _attachment: EncodedAttachment?

/// Human-readable messages associated with this event that can be presented
/// to the user.
var messages: [EncodedMessage]
Expand All @@ -71,6 +80,9 @@ extension ABIv0 {
case let .issueRecorded(recordedIssue):
kind = .issueRecorded
issue = EncodedIssue(encoding: recordedIssue, in: eventContext)
case let .valueAttached(attachment):
kind = .valueAttached
_attachment = EncodedAttachment(encoding: attachment, in: eventContext)
case .testCaseEnded:
if eventContext.test?.isParameterized == false {
return nil
Expand Down
3 changes: 3 additions & 0 deletions Sources/Testing/ABI/v0/Encoded/ABIv0.EncodedMessage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ extension ABIv0 {
case difference
case warning
case details
case attachment = "_attachment"

init(encoding symbol: Event.Symbol) {
self = switch symbol {
Expand All @@ -51,6 +52,8 @@ extension ABIv0 {
.warning
case .details:
.details
case .attachment:
.attachment
}
}
}
Expand Down
171 changes: 171 additions & 0 deletions Sources/Testing/Attachments/Test.Attachable.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2024 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
// See https://swift.org/CONTRIBUTORS.txt for Swift project authors
//

@_spi(Experimental)
extension Test {
/// A protocol describing a type that can be attached to a test report or
/// written to disk when a test is run.
///
/// To attach an attachable value to a test report or test run output, use it
/// to initialize a new instance of ``Test/Attachment``, then call
/// ``Test/Attachment/attach()``. An attachment can only be attached once.
///
/// The testing library provides default conformances to this protocol for a
/// variety of standard library types. Most user-defined types do not need to
/// conform to this protocol.
///
/// A type should conform to this protocol if it can be represented as a
/// sequence of bytes that would be diagnostically useful if a test fails.
public protocol Attachable: ~Copyable {
/// An estimate of the number of bytes of memory needed to store this value
/// as an attachment.
///
/// The testing library uses this property to determine if an attachment
/// should be held in memory or should be immediately persisted to storage.
/// Larger attachments are more likely to be persisted, but the algorithm
/// the testing library uses is an implementation detail and is subject to
/// change.
///
/// The value of this property is approximately equal to the number of bytes
/// that will actually be needed, or `nil` if the value cannot be computed
/// efficiently. The default implementation of this property returns `nil`.
///
/// - Complexity: O(1) unless `Self` conforms to `Collection`, in which case
/// up to O(_n_) where _n_ is the length of the collection.
var estimatedAttachmentByteCount: Int? { get }
grynspan marked this conversation as resolved.
Show resolved Hide resolved

/// Call a function and pass a buffer representing this instance to it.
///
/// - Parameters:
/// - attachment: The attachment that is requesting a buffer (that is, the
/// attachment containing this instance.)
/// - body: A function to call. A temporary buffer containing a data
/// representation of this instance is passed to it.
///
/// - Returns: Whatever is returned by `body`.
///
/// - Throws: Whatever is thrown by `body`, or any error that prevented the
/// creation of the buffer.
///
/// The testing library uses this function when writing an attachment to a
/// test report or to a file on disk. The format of the buffer is
/// implementation-defined, but should be "idiomatic" for this type: for
/// example, if this type represents an image, it would be appropriate for
/// the buffer to contain an image in PNG format, JPEG format, etc., but it
/// would not be idiomatic for the buffer to contain a textual description
/// of the image.
borrowing func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R
}
}

// MARK: - Default implementations

extension Test.Attachable where Self: ~Copyable {
public var estimatedAttachmentByteCount: Int? {
nil
}
}

extension Test.Attachable where Self: Collection, Element == UInt8 {
public var estimatedAttachmentByteCount: Int? {
count
}

// We do not provide an implementation of withUnsafeBufferPointer(for:_:) here
// because there is no way in the standard library to statically detect if a
// collection can provide contiguous storage (_HasContiguousBytes is not API.)
// If withContiguousBytesIfAvailable(_:) fails, we don't want to make a
// (potentially expensive!) copy of the collection.
//
// The planned Foundation cross-import overlay can provide a default
// implementation for collection types that conform to Foundation's
// ContiguousBytes protocol.
}

extension Test.Attachable where Self: StringProtocol {
public var estimatedAttachmentByteCount: Int? {
// NOTE: utf8.count may be O(n) for foreign strings.
// SEE: https://github.com/swiftlang/swift/blob/main/stdlib/public/core/StringUTF8View.swift
utf8.count
}
}

// MARK: - Default conformances

// Implement the protocol requirements for byte arrays and buffers so that
// developers can attach raw data when needed.
@_spi(Experimental)
extension Array<UInt8>: Test.Attachable {
public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
try withUnsafeBytes(body)
}
}

@_spi(Experimental)
extension ContiguousArray<UInt8>: Test.Attachable {
public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
try withUnsafeBytes(body)
}
}

@_spi(Experimental)
extension ArraySlice<UInt8>: Test.Attachable {
public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
try withUnsafeBytes(body)
}
}

@_spi(Experimental)
extension UnsafeBufferPointer<UInt8>: Test.Attachable {
public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
try body(.init(self))
}
}

@_spi(Experimental)
extension UnsafeMutableBufferPointer<UInt8>: Test.Attachable {
public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
try body(.init(self))
}
}

@_spi(Experimental)
extension UnsafeRawBufferPointer: Test.Attachable {
public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
try body(self)
}
}

@_spi(Experimental)
extension UnsafeMutableRawBufferPointer: Test.Attachable {
public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
try body(.init(self))
}
}

@_spi(Experimental)
extension String: Test.Attachable {
public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
var selfCopy = self
return try selfCopy.withUTF8 { utf8 in
try body(UnsafeRawBufferPointer(utf8))
}
}
}

@_spi(Experimental)
extension Substring: Test.Attachable {
public func withUnsafeBufferPointer<R>(for attachment: borrowing Test.Attachment, _ body: (UnsafeRawBufferPointer) throws -> R) throws -> R {
var selfCopy = self
return try selfCopy.withUTF8 { utf8 in
try body(UnsafeRawBufferPointer(utf8))
}
}
}
Loading