Fix a crash when describing a confirmation failure with a range. (#806)

I was using `relative(to:)` to convert any arbitrary `RangeExpression` to one with an upper and lower bound, but that function may produce invalid ranges for expressions like `1...` that cause crashes. This PR switches to a different, somewhat sillier implementation that should not run into this issue. Resolves #805. Resolves rdar://139222774. ### Checklist: - [x] Code and documentation should follow the style of the [Style Guide](https://github.com/apple/swift-testing/blob/main/Documentation/StyleGuide.md). - [x] If public symbols are renamed or modified, DocC references should be updated.

Author: grynspan

Sources/Testing/Issues/Issue.swift

@@ -175,11 +175,9 @@ extension Issue: CustomStringConvertible, CustomDebugStringConvertible {
 /// In the future, when our minimum deployment target supports casting a value
 /// to a constrained existential type ([SE-0353](https://github.com/swiftlang/swift-evolution/blob/main/proposals/0353-constrained-existential-types.md#effect-on-abi-stability)),
 /// we can remove this protocol and cast to `RangeExpression<Int>` instead.
-private protocol _RangeExpressionOverIntValues: RangeExpression where Bound == Int {}
+private protocol _RangeExpressionOverIntValues: RangeExpression & Sequence where Bound == Int, Element == Int {}
 extension ClosedRange<Int>: _RangeExpressionOverIntValues {}
 extension PartialRangeFrom<Int>: _RangeExpressionOverIntValues {}
-extension PartialRangeThrough<Int>: _RangeExpressionOverIntValues {}
-extension PartialRangeUpTo<Int>: _RangeExpressionOverIntValues {}
 extension Range<Int>: _RangeExpressionOverIntValues {}
 
 extension Issue.Kind: CustomStringConvertible {
@@ -200,9 +198,15 @@ extension Issue.Kind: CustomStringConvertible {
  }
  case let .confirmationMiscounted(actual: actual, expected: expected):
  if let expected = expected as? any _RangeExpressionOverIntValues {
- let expected = expected.relative(to: [])
- if expected.upperBound > expected.lowerBound && expected.lowerBound == expected.upperBound - 1 {
- return "Confirmation was confirmed \(actual.counting("time")), but expected to be confirmed \(expected.lowerBound.counting("time"))"
+ let lowerBound = expected.first { _ in true }
+ if let lowerBound {
+ // Not actually an upper bound, just "any value greater than the lower
+ // bound." That's sufficient for us to determine if the range contains
+ // a single value.
+ let upperBound = expected.first { $0 > lowerBound }
+ if let upperBound, upperBound > lowerBound && lowerBound == upperBound - 1 {
+ return "Confirmation was confirmed \(actual.counting("time")), but expected to be confirmed \(lowerBound.counting("time"))"
+ }
  }
  }
  return "Confirmation was confirmed \(actual.counting("time")), but expected to be confirmed \(String(describingForTest: expected)) time(s)"

Tests/TestingTests/ConfirmationTests.swift

@@ -47,6 +47,19 @@ struct ConfirmationTests {
  }
  }
 
+ @Test func confirmationFailureCanBeDescribed() async {
+ var configuration = Configuration()
+ configuration.eventHandler = { event, _ in
+ if case let .issueRecorded(issue) = event.kind {
+ #expect(String(describing: issue) != "")
+ }
+ }
+
+ await Test {
+ await confirmation(expectedCount: 1...) { _ in }
+ }.run(configuration: configuration)
+ }
+
 #if !SWT_NO_EXIT_TESTS
  @Test("Confirmation requires positive count")
  func positiveCount() async {