浏览代码

Use `expectedFulfillmentCount` since it is now available on Linux (#503)

George Barnett 6 年之前
父节点
当前提交
554bb3b44d
共有 1 个文件被更改,包括 3 次插入12 次删除
  1. 3 12
      Tests/GRPCTests/ServerWebTests.swift

+ 3 - 12
Tests/GRPCTests/ServerWebTests.swift

@@ -110,12 +110,8 @@ extension ServerWebTests {
     let numberOfRequests = 2_000
 
     let completionHandlerExpectation = expectation(description: "completion handler called")
-    // Linux version of Swift doesn't have the `expectedFulfillmentCount` API yet.
-    // Implemented in https://github.com/apple/swift-corelibs-xctest/pull/228 but not yet
-    // released.
-    //
-    // Wait for the expected number of responses (i.e. `numberOfRequests`) instead.
-    var responses = 0
+    completionHandlerExpectation.expectedFulfillmentCount = numberOfRequests
+    completionHandlerExpectation.assertForOverFulfill = true
 
     for i in 0..<numberOfRequests {
       let message = "foo \(i)"
@@ -125,11 +121,7 @@ extension ServerWebTests {
         XCTAssertNil(error)
         if let data = data {
           XCTAssertEqual(String(data: data, encoding: .utf8), expectedResponse)
-          responses += 1
-
-          if responses == numberOfRequests {
-            completionHandlerExpectation.fulfill()
-          }
+          completionHandlerExpectation.fulfill()
         }
       }
     }
@@ -140,7 +132,6 @@ extension ServerWebTests {
   func testServerStreaming() {
     let message = "foo bar baz"
 
-
     var expectedData = Data()
     var index = 0
     message.split(separator: " ").forEach { (component) in