Skip to content

Make value capture of optionals more robust. #277

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
grynspan merged 1 commit into from
Mar 11, 2024
Merged

Make value capture of optionals more robust. #277

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: 2 additions & 2 deletions Sources/Testing/Expectations/ExpectationChecking+Macro.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ public func __checkPropertyAccess<T, U>(
return __checkValue(
optionalValue,
expression: expression,
expressionWithCapturedRuntimeValues: expression.capturingRuntimeValues(lhs, optionalValue),
expressionWithCapturedRuntimeValues: expression.capturingRuntimeValues(lhs, optionalValue as U??),
comments: comments(),
isRequired: isRequired,
sourceLocation: sourceLocation
Expand Down Expand Up @@ -731,7 +731,7 @@ public func __checkBinaryOperation<T>(
return __checkValue(
optionalValue,
expression: expression,
expressionWithCapturedRuntimeValues: expression.capturingRuntimeValues(lhs, rhs),
expressionWithCapturedRuntimeValues: expression.capturingRuntimeValues(lhs as T??, rhs as T??),
comments: comments(),
isRequired: isRequired,
sourceLocation: sourceLocation
Expand Down
22 changes: 22 additions & 0 deletions Tests/TestingTests/IssueTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,6 +1161,28 @@ final class IssueTests: XCTestCase {
await fulfillment(of: [rhsCalled], timeout: 0.0)
}

func testRequireOptionalMemberAccessEvaluatesToNil() async {
var configuration = Configuration()
configuration.eventHandler = { event, _ in
guard case let .issueRecorded(issue) = event.kind else {
return
}
XCTAssertFalse(issue.isKnown)
guard case let .expectationFailed(expectation) = issue.kind else {
XCTFail("Unexpected issue kind \(issue.kind)")
return
}
let expression = expectation.evaluatedExpression
XCTAssertTrue(expression.expandedDescription().contains("nil"))
XCTAssertFalse(expression.expandedDescription().contains("<not evaluated>"))
}

await Test {
let array = [String]()
_ = try #require(array.first)
}.run(configuration: configuration)
}

func testOptionalOperand() async {
let expectationFailed = expectation(description: "Expectation failed")

Expand Down