[v2] ApolloClientProtocol and Test Deprecation Cleanup

.github/workflows/ci-tests.yml

@@ -177,7 +177,6 @@ jobs:
         name: ${{ matrix.name }}-results
         path: |
           TestResults/ResultBundle.zip
-
   run-codegen-test-configurations:
     runs-on: macos-15
     timeout-minutes: 20
@@ -248,4 +247,3 @@ jobs:
     - name: Run CocoaPods Integration Tests
       id: run-cocoapods-integration-tests
       uses: ./.github/actions/run-cocoapods-integration-tests
-

Tests/ApolloInternalTestHelpers/MockNetworkTransport.swift

@@ -6,6 +6,8 @@ public final class MockNetworkTransport: NetworkTransport {
   public let mockServer: MockGraphQLServer
   public let requestChainTransport: RequestChainNetworkTransport
 
+  public var url: URL { requestChainTransport.endpointURL }
+
   public init(
     mockServer: MockGraphQLServer = MockGraphQLServer(),
     store: ApolloStore
@@ -87,7 +89,7 @@ public final class MockNetworkTransport: NetworkTransport {
       }
 
       let httpResponse = HTTPURLResponse(
-        url: TestURL.mockServer.url,
+        url: request.url!,
         statusCode: 200,
         httpVersion: nil,
         headerFields: nil

Tests/ApolloTests/ApolloStore_BatchedLoadTests.swift

@@ -114,6 +114,7 @@ class ApolloStore_BatchedLoadTests: XCTestCase {
     XCTAssertEqual(data.hero?.name, "R2-D2")
     XCTAssertEqual(data.hero?.friends?.count, 100)
 
+    // 3 loads: ROOT_QUERY.hero, hero.friends, list of friends
     XCTAssertEqual(cache.numberOfBatchLoads, 3)
   }
 

Tests/ApolloTests/AutomaticPersistedQueriesTests.swift

@@ -228,7 +228,6 @@ class AutomaticPersistedQueriesTests: XCTestCase, MockResponseProvider {
         expectation.to(equal("{\"episode\":\"\(episode.rawValue)\"}"))
 
       case .none:
-        #warning("TODO: write test to test this case actually happens")
         expectation.to(equal("{}"))
 
       case .null: