From 5fe607268bf8cfd76b7cb8e43b7116255ca9dc0a Mon Sep 17 00:00:00 2001
From: carolinacass <67160898+carolinacass@users.noreply.github.com>
Date: Thu, 3 Nov 2022 10:42:04 +0000
Subject: [PATCH 1/2] Use #fileID/#filePath instead of #file

Motivation:

Modifications:

Changed #file to #filePath or #fileID depending on the situation
---
 .../AsyncHTTPClient/AsyncAwait/Transaction+StateMachine.swift | 2 +-
 .../ConnectionPoolSizeConfigValueIsRespectedTests.swift       | 2 +-
 Tests/AsyncHTTPClientTests/HTTPClientTests.swift              | 2 +-
 .../HTTPConnectionPool+HTTP2StateMachineTests.swift           | 2 +-
 Tests/AsyncHTTPClientTests/HTTPConnectionPoolTests.swift      | 2 +-
 Tests/AsyncHTTPClientTests/HTTPRequestStateMachineTests.swift | 2 +-
 Tests/AsyncHTTPClientTests/SOCKSTestUtils.swift               | 2 +-
 Tests/AsyncHTTPClientTests/XCTest+AsyncAwait.swift            | 4 ++--
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Sources/AsyncHTTPClient/AsyncAwait/Transaction+StateMachine.swift b/Sources/AsyncHTTPClient/AsyncAwait/Transaction+StateMachine.swift
index 32f93582b..8700d6b32 100644
--- a/Sources/AsyncHTTPClient/AsyncAwait/Transaction+StateMachine.swift
+++ b/Sources/AsyncHTTPClient/AsyncAwait/Transaction+StateMachine.swift
@@ -641,7 +641,7 @@ extension Transaction {
         private func verifyStreamIDIsEqual(
             registered: TransactionBody.AsyncIterator.ID,
             this: TransactionBody.AsyncIterator.ID,
-            file: StaticString = #file,
+            file: StaticString = #fileID,
             line: UInt = #line
         ) {
             if registered != this {
diff --git a/Tests/AsyncHTTPClientTests/ConnectionPoolSizeConfigValueIsRespectedTests.swift b/Tests/AsyncHTTPClientTests/ConnectionPoolSizeConfigValueIsRespectedTests.swift
index 46cddeead..be8eed0aa 100644
--- a/Tests/AsyncHTTPClientTests/ConnectionPoolSizeConfigValueIsRespectedTests.swift
+++ b/Tests/AsyncHTTPClientTests/ConnectionPoolSizeConfigValueIsRespectedTests.swift
@@ -52,7 +52,7 @@ final class ConnectionPoolSizeConfigValueIsRespectedTests: XCTestCaseHTTPClientT
 
         let g = DispatchGroup()
         for workerID in 0..<numberOfParallelWorkers {
-            DispatchQueue(label: "\(#file):\(#line):worker-\(workerID)").async(group: g) {
+            DispatchQueue(label: "\(#filePath):\(#line):worker-\(workerID)").async(group: g) {
                 func makeRequest() {
                     let url = "http://127.0.0.1:\(httpBin.port)"
                     XCTAssertNoThrow(try client.get(url: url).wait())
diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
index a8036ab81..7ddc8f2cf 100644
--- a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
@@ -1008,7 +1008,7 @@ final class HTTPClientTests: XCTestCaseHTTPClientTestsBaseClass {
         let url = "http://127.0.0.1:\(server?.localAddress?.port ?? -1)/hello"
         let g = DispatchGroup()
         for workerID in 0..<numberOfParallelWorkers {
-            DispatchQueue(label: "\(#file):\(#line):worker-\(workerID)").async(group: g) {
+            DispatchQueue(label: "\(#filePath):\(#line):worker-\(workerID)").async(group: g) {
                 func makeRequest() {
                     XCTAssertNoThrow(try self.defaultClient.get(url: url).wait())
                 }
diff --git a/Tests/AsyncHTTPClientTests/HTTPConnectionPool+HTTP2StateMachineTests.swift b/Tests/AsyncHTTPClientTests/HTTPConnectionPool+HTTP2StateMachineTests.swift
index 699909c09..bf1ef4a98 100644
--- a/Tests/AsyncHTTPClientTests/HTTPConnectionPool+HTTP2StateMachineTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPConnectionPool+HTTP2StateMachineTests.swift
@@ -1331,7 +1331,7 @@ class HTTPConnectionPool_HTTP2StateMachineTests: XCTestCase {
 func XCTAssertEqualTypeAndValue<Left, Right: Equatable>(
     _ lhs: @autoclosure () throws -> Left,
     _ rhs: @autoclosure () throws -> Right,
-    file: StaticString = #file,
+    file: StaticString = #filePath,
     line: UInt = #line
 ) {
     XCTAssertNoThrow(try {
diff --git a/Tests/AsyncHTTPClientTests/HTTPConnectionPoolTests.swift b/Tests/AsyncHTTPClientTests/HTTPConnectionPoolTests.swift
index 60e5077ee..e85571ad1 100644
--- a/Tests/AsyncHTTPClientTests/HTTPConnectionPoolTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPConnectionPoolTests.swift
@@ -419,7 +419,7 @@ class HTTPConnectionPoolTests: XCTestCase {
 
         let dispatchGroup = DispatchGroup()
         for workerID in 0..<numberOfParallelWorkers {
-            DispatchQueue(label: "\(#file):\(#line):worker-\(workerID)").async(group: dispatchGroup) {
+            DispatchQueue(label: "\(#filePath):\(#line):worker-\(workerID)").async(group: dispatchGroup) {
                 func makeRequest() {
                     let url = "http://localhost:\(httpBin.port)"
                     var maybeRequest: HTTPClient.Request?
diff --git a/Tests/AsyncHTTPClientTests/HTTPRequestStateMachineTests.swift b/Tests/AsyncHTTPClientTests/HTTPRequestStateMachineTests.swift
index a68d58aa0..61ea4702b 100644
--- a/Tests/AsyncHTTPClientTests/HTTPRequestStateMachineTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPRequestStateMachineTests.swift
@@ -746,7 +746,7 @@ extension HTTPRequestStateMachine.Action {
     fileprivate func assertFailRequest<Error>(
         _ expectedError: Error,
         _ expectedFinalStreamAction: HTTPRequestStateMachine.Action.FinalFailedRequestAction,
-        file: StaticString = #file,
+        file: StaticString = #filePath,
         line: UInt = #line
     ) where Error: Swift.Error & Equatable {
         guard case .failRequest(let actualError, let actualFinalStreamAction) = self else {
diff --git a/Tests/AsyncHTTPClientTests/SOCKSTestUtils.swift b/Tests/AsyncHTTPClientTests/SOCKSTestUtils.swift
index d7c97e6fe..d888769b4 100644
--- a/Tests/AsyncHTTPClientTests/SOCKSTestUtils.swift
+++ b/Tests/AsyncHTTPClientTests/SOCKSTestUtils.swift
@@ -40,7 +40,7 @@ class MockSOCKSServer {
         self.channel.localAddress!.port!
     }
 
-    init(expectedURL: String, expectedResponse: String, misbehave: Bool = false, file: String = #file, line: UInt = #line) throws {
+    init(expectedURL: String, expectedResponse: String, misbehave: Bool = false, file: String = #filePath, line: UInt = #line) throws {
         let elg = MultiThreadedEventLoopGroup(numberOfThreads: 1)
         let bootstrap: ServerBootstrap
         if misbehave {
diff --git a/Tests/AsyncHTTPClientTests/XCTest+AsyncAwait.swift b/Tests/AsyncHTTPClientTests/XCTest+AsyncAwait.swift
index 3f2d1185e..bf297413c 100644
--- a/Tests/AsyncHTTPClientTests/XCTest+AsyncAwait.swift
+++ b/Tests/AsyncHTTPClientTests/XCTest+AsyncAwait.swift
@@ -65,7 +65,7 @@ extension XCTestCase {
 internal func XCTAssertThrowsError<T>(
     _ expression: @autoclosure () async throws -> T,
     verify: (Error) -> Void = { _ in },
-    file: StaticString = #file,
+    file: StaticString = #filePath,
     line: UInt = #line
 ) async {
     do {
@@ -79,7 +79,7 @@ internal func XCTAssertThrowsError<T>(
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 internal func XCTAssertNoThrowWithResult<Result>(
     _ expression: @autoclosure () async throws -> Result,
-    file: StaticString = #file,
+    file: StaticString = #filePath,
     line: UInt = #line
 ) async -> Result? {
     do {

From bb3f705096b907747c97c8394931b092d99bd867 Mon Sep 17 00:00:00 2001
From: carolinacass <67160898+carolinacass@users.noreply.github.com>
Date: Thu, 3 Nov 2022 13:59:37 +0000
Subject: [PATCH 2/2] minor fix changed from Path to ID

---
 .../ConnectionPoolSizeConfigValueIsRespectedTests.swift         | 2 +-
 Tests/AsyncHTTPClientTests/HTTPClientTests.swift                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Tests/AsyncHTTPClientTests/ConnectionPoolSizeConfigValueIsRespectedTests.swift b/Tests/AsyncHTTPClientTests/ConnectionPoolSizeConfigValueIsRespectedTests.swift
index be8eed0aa..79c304fc2 100644
--- a/Tests/AsyncHTTPClientTests/ConnectionPoolSizeConfigValueIsRespectedTests.swift
+++ b/Tests/AsyncHTTPClientTests/ConnectionPoolSizeConfigValueIsRespectedTests.swift
@@ -52,7 +52,7 @@ final class ConnectionPoolSizeConfigValueIsRespectedTests: XCTestCaseHTTPClientT
 
         let g = DispatchGroup()
         for workerID in 0..<numberOfParallelWorkers {
-            DispatchQueue(label: "\(#filePath):\(#line):worker-\(workerID)").async(group: g) {
+            DispatchQueue(label: "\(#fileID):\(#line):worker-\(workerID)").async(group: g) {
                 func makeRequest() {
                     let url = "http://127.0.0.1:\(httpBin.port)"
                     XCTAssertNoThrow(try client.get(url: url).wait())
diff --git a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
index 7ddc8f2cf..8f4126c43 100644
--- a/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
+++ b/Tests/AsyncHTTPClientTests/HTTPClientTests.swift
@@ -1008,7 +1008,7 @@ final class HTTPClientTests: XCTestCaseHTTPClientTestsBaseClass {
         let url = "http://127.0.0.1:\(server?.localAddress?.port ?? -1)/hello"
         let g = DispatchGroup()
         for workerID in 0..<numberOfParallelWorkers {
-            DispatchQueue(label: "\(#filePath):\(#line):worker-\(workerID)").async(group: g) {
+            DispatchQueue(label: "\(#fileID):\(#line):worker-\(workerID)").async(group: g) {
                 func makeRequest() {
                     XCTAssertNoThrow(try self.defaultClient.get(url: url).wait())
                 }