Adapt to the iteration parameter in the event context

Author: harlanhaskins

Sources/Testing/ABI/Encoded/ABI.EncodedEvent.swift

@@ -113,9 +113,14 @@ extension ABI {
         kind = .testStarted
       case .testCaseStarted:
         if eventContext.test?.isParameterized == false {
-          return nil
+          if let iteration = eventContext.iteration, iteration > 1 {
+            kind = .testStarted
+          } else {
+            return nil
+          }
+        } else {
+          kind = .testCaseStarted
         }
-        kind = .testCaseStarted
       case let .issueRecorded(recordedIssue):
         kind = .issueRecorded
         issue = EncodedIssue(encoding: recordedIssue, in: eventContext)
@@ -124,9 +129,14 @@ extension ABI {
         self.attachment = EncodedAttachment(encoding: attachment, in: eventContext)
       case .testCaseEnded:
         if eventContext.test?.isParameterized == false {
-          return nil
+          if let iteration = eventContext.iteration, iteration > 1 {
+            kind = .testEnded
+          } else {
+            return nil
+          }
+        } else {
+          kind = .testCaseEnded
         }
-        kind = .testCaseEnded
       case .testCaseCancelled:
         kind = .testCaseCancelled
       case .testEnded:
@@ -159,6 +169,7 @@ extension ABI {
           let .testCancelled(skipInfo):
           _comments = Array(skipInfo.comment).map(\.rawValue)
           _sourceLocation = skipInfo.sourceLocation.map { EncodedSourceLocation(encoding: $0) }
+          _iteration = eventContext.iteration
         default:
           break
         }

Sources/Testing/Running/Runner.swift

@@ -227,10 +227,10 @@ extension Runner {
       // Determine what kind of event to send for this step based on its action.
       switch step.action {
       case .run:
-        Event.post(.testStarted, for: (step.test, nil), iteration: context.iteration, configuration: configuration)
+        Event.post(.testStarted, for: (step.test, nil), iteration: 1, configuration: configuration)
         shouldSendTestEnded = true
       case let .skip(skipInfo):
-        Event.post(.testSkipped(skipInfo), for: (step.test, nil), iteration: context.iteration, configuration: configuration)
+        Event.post(.testSkipped(skipInfo), for: (step.test, nil), iteration: 1, configuration: configuration)
         shouldSendTestEnded = false
       case let .recordIssue(issue):
         // Scope posting the issue recorded event such that issue handling
@@ -254,7 +254,7 @@ extension Runner {
     defer {
       if let step = stepGraph.value {
         if shouldSendTestEnded {
-          Event.post(.testEnded, for: (step.test, nil), iteration: context.iteration, configuration: configuration)
+          Event.post(.testEnded, for: (step.test, nil), iteration: 1, configuration: configuration)
         }
         Event.post(.planStepEnded(step), for: (step.test, nil), configuration: configuration)
       }

Tests/TestingTests/EventIterationTests.swift

@@ -60,17 +60,6 @@ struct EventIterationTests {
     }
   }
 
-  @Test
-  func `testStarted and testEnded events include iteration in context`() async {
-    await verifyIterations(
-      for: [.testStarted, .testEnded],
-      repetitionPolicy: .once,
-      expectedIterations: 1
-    ) { _ in
-      // Do nothing, just pass
-    }
-  }
-
   @Test
   func `testCaseStarted and testCaseEnded events include iteration in context`() async {
     await verifyIterations(

Tests/TestingTests/PlanIterationTests.swift

@@ -22,9 +22,9 @@ struct TestCaseIterationTests {
       await confirmation("1 iteration ended") { ended in
         var configuration = Configuration()
         configuration.eventHandler = { event, _ in
-          if case .testStarted = event.kind {
+          if case .testCaseStarted = event.kind {
             started()
-          } else if case .testEnded = event.kind {
+          } else if case .testCaseEnded = event.kind {
             ended()
           }
         }
@@ -43,9 +43,9 @@ struct TestCaseIterationTests {
       await confirmation("N iterations ended", expectedCount: iterationCount) { ended in
         var configuration = Configuration()
         configuration.eventHandler = { event, _ in
-          if case .testStarted = event.kind {
+          if case .testCaseStarted = event.kind {
             started()
-          } else if case .testEnded = event.kind {
+          } else if case .testCaseEnded = event.kind {
             ended()
           }
         }
@@ -70,17 +70,17 @@ struct TestCaseIterationTests {
         var configuration = Configuration()
         configuration.eventHandler = { event, context in
           guard let iteration = context.iteration else { return }
-          if case .testStarted = event.kind {
+          if case .testCaseStarted = event.kind {
             iterations.withLock { $0 = iteration }
             started()
-          } else if case .testEnded = event.kind {
+          } else if case .testCaseEnded = event.kind {
             ended()
           }
         }
         configuration.repetitionPolicy = .repeating(.untilIssueRecorded, maximumIterationCount: iterationCount)
 
         await Test {
-          #expect(iterations.rawValue < iterationWithIssue)
+          #expect(iterations.rawValue <= iterationWithIssue)
         }.run(configuration: configuration)
       }
     }
@@ -96,10 +96,10 @@ struct TestCaseIterationTests {
         var configuration = Configuration()
         configuration.eventHandler = { event, context in
           guard let iteration = context.iteration else { return }
-          if case .testStarted = event.kind {
+          if case .testCaseStarted = event.kind {
             iterations.withLock { $0 = iteration }
             started()
-          } else if case .testEnded = event.kind {
+          } else if case .testCaseEnded = event.kind {
             ended()
           }
         }
@@ -122,7 +122,10 @@ struct TestCaseIterationTests {
 
     var configuration = Configuration()
     configuration.eventHandler = { event, context in
-      guard let test = context.test, let iteration = context.iteration else { return }
+      guard case .testCaseStarted = event.kind,
+              let test = context.test,
+              let iteration = context.iteration
+      else { return }
       if test.name.contains("Failing") {
         iterationForFailingTest.withLock { $0 = iteration }
       }