Reverse fulfillment change

Nacho Bonafonte · Nacho Bonafonte · commit edb4e4d1fa14 · 2023-04-10T16:16:40.000+02:00
diff --git a/Tests/OpenTelemetryApiTests/Context/ActivityContextManagerTests.swift b/Tests/OpenTelemetryApiTests/Context/ActivityContextManagerTests.swift
@@ -226,7 +226,7 @@ class ActivityContextManagerTests: XCTestCase {
         }
         span1.end()
         XCTAssert(OpenTelemetry.instance.contextProvider.activeSpan === nil)
-        await fulfillment(of: [expec], timeout: 30)
+        await waitForExpectations(timeout: 30)
     }
 
     @available(macOS 10.15, iOS 13.0, tvOS 13.0, *)
@@ -258,7 +258,7 @@ class ActivityContextManagerTests: XCTestCase {
             XCTAssert(OpenTelemetry.instance.contextProvider.activeSpan === span1)
             expec.fulfill()
         }
-        await fulfillment(of: [expec], timeout: 30)
+        await waitForExpectations(timeout: 30)
         span1.end()
         XCTAssert(OpenTelemetry.instance.contextProvider.activeSpan === nil)
     }
@@ -316,8 +316,7 @@ class ActivityContextManagerTests: XCTestCase {
         }
 
         XCTAssert(ActivityContextManager.instance.getCurrentContextValue(forKey: .span) === parent)
-        await fulfillment(of: [expectation1, expectation2], timeout: 30, enforceOrder: false)
-
+        await waitForExpectations(timeout: 5, handler: nil)
         parent.end()
         XCTAssert(OpenTelemetry.instance.contextProvider.activeSpan === nil)
     }

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ class ActivityContextManagerTests: XCTestCase {`
`226`	`226`	`}`
`227`	`227`	`span1.end()`
`228`	`228`	`XCTAssert(OpenTelemetry.instance.contextProvider.activeSpan === nil)`
`229`		`- await fulfillment(of: [expec], timeout: 30)`
	`229`	`+ await waitForExpectations(timeout: 30)`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`@available(macOS 10.15, iOS 13.0, tvOS 13.0, *)`
`@@ -258,7 +258,7 @@ class ActivityContextManagerTests: XCTestCase {`
`258`	`258`	`XCTAssert(OpenTelemetry.instance.contextProvider.activeSpan === span1)`
`259`	`259`	`expec.fulfill()`
`260`	`260`	`}`
`261`		`- await fulfillment(of: [expec], timeout: 30)`
	`261`	`+ await waitForExpectations(timeout: 30)`
`262`	`262`	`span1.end()`
`263`	`263`	`XCTAssert(OpenTelemetry.instance.contextProvider.activeSpan === nil)`
`264`	`264`	`}`
`@@ -316,8 +316,7 @@ class ActivityContextManagerTests: XCTestCase {`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`XCTAssert(ActivityContextManager.instance.getCurrentContextValue(forKey: .span) === parent)`
`319`		`- await fulfillment(of: [expectation1, expectation2], timeout: 30, enforceOrder: false)`
`320`		`-`
	`319`	`+ await waitForExpectations(timeout: 5, handler: nil)`
`321`	`320`	`parent.end()`
`322`	`321`	`XCTAssert(OpenTelemetry.instance.contextProvider.activeSpan === nil)`
`323`	`322`	`}`