fix main apollo tests

Author: designatednerd

Tests/ApolloTests/BatchedLoadTests.swift

@@ -19,7 +19,7 @@ private final class MockBatchedNormalizedCache: NormalizedCache {
 
     DispatchQueue.global().asyncAfter(deadline: .now() + .milliseconds(1)) {
       let records = keys.map { self.records[$0] }
-      DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+      DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                      action: completion,
                                                      result: .success(records))
     }
@@ -30,7 +30,7 @@ private final class MockBatchedNormalizedCache: NormalizedCache {
              completion: @escaping (Result<Set<CacheKey>, Error>) -> Void) {
     DispatchQueue.global().asyncAfter(deadline: .now() + .milliseconds(1)) {
       let changedKeys = self.records.merge(records: records)
-      DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+      DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                      action: completion,
                                                      result: .success(changedKeys))
     }
@@ -39,7 +39,7 @@ private final class MockBatchedNormalizedCache: NormalizedCache {
   func clear(callbackQueue: DispatchQueue?, completion: ((Result<Void, Error>) -> Void)?) {
     DispatchQueue.global().asyncAfter(deadline: .now() + .milliseconds(1)) {
       self.records.clear()
-      DispatchQueue.apollo_returnResultAsyncIfNeeded(on: callbackQueue,
+      DispatchQueue.apollo.returnResultAsyncIfNeeded(on: callbackQueue,
                                                      action: completion,
                                                      result: .success(()))
     }

Tests/ApolloTests/PromiseTests.swift

@@ -10,14 +10,14 @@ class PromiseTests: XCTestCase {
   func testResultOfFulfilledPromise() {
     let promise = Promise<String>(fulfilled: "foo")
 
-    XCTAssertEqual(promise.result?.value, "foo")
+    XCTAssertEqual(promise.result?.apollo.value, "foo")
   }
 
   func testResultOfRejectedPromise() {
     let promise = Promise<String>(rejected: TestError())
 
-    XCTAssertNil(promise.result?.value)
-    XCTAssert(promise.result?.error is TestError)
+    XCTAssertNil(promise.result?.apollo.value)
+    XCTAssert(promise.result?.apollo.error is TestError)
   }
 
   func testWaitForResultOfFulfilledPromise() throws {
@@ -65,7 +65,7 @@ class PromiseTests: XCTestCase {
       fulfill("foo")
     }
 
-    XCTAssertEqual(promise.result?.value, "foo")
+    XCTAssertEqual(promise.result?.apollo.value, "foo")
   }
 
   func testWaitForResultOfImmediatelyFulfilledPromise() throws {
@@ -81,7 +81,7 @@ class PromiseTests: XCTestCase {
       reject(TestError())
     }
 
-    XCTAssert(promise.result?.error is TestError)
+    XCTAssert(promise.result?.apollo.error is TestError)
   }
 
   func testWaitForResultOfImmediatelyRejectedPromise() {

Tests/ApolloTests/ResultOrPromiseTests.swift

@@ -10,27 +10,27 @@ class ResultOrPromiseTests: XCTestCase {
   func testSuccessResult() {
     let resultOrPromise = ResultOrPromise.result(.success("foo"))
 
-    XCTAssertEqual(resultOrPromise.result?.value, "foo")
+    XCTAssertEqual(resultOrPromise.result?.apollo.value, "foo")
   }
 
   func testFailureResult() {
     let resultOrPromise = ResultOrPromise<String>.result(.failure(TestError()))
 
-    XCTAssertNil(resultOrPromise.result?.value)
-    XCTAssert(resultOrPromise.result?.error is TestError)
+    XCTAssertNil(resultOrPromise.result?.apollo.value)
+    XCTAssert(resultOrPromise.result?.apollo.error is TestError)
   }
 
   func testResultOfFulfilledPromise() {
     let resultOrPromise = ResultOrPromise.promise(Promise<String>(fulfilled: "foo"))
 
-    XCTAssertEqual(resultOrPromise.result?.value, "foo")
+    XCTAssertEqual(resultOrPromise.result?.apollo.value, "foo")
   }
 
   func testResultOfRejectedPromise() {
     let resultOrPromise = ResultOrPromise.promise(Promise<String>(rejected: TestError()))
 
-    XCTAssertNil(resultOrPromise.result?.value)
-    XCTAssert(resultOrPromise.result?.error is TestError)
+    XCTAssertNil(resultOrPromise.result?.apollo.value)
+    XCTAssert(resultOrPromise.result?.apollo.error is TestError)
   }
 
   func testWaitForSuccessResult() throws {

Tests/ApolloTests/URLSessionClientTests.swift

@@ -1,5 +1,6 @@
 import XCTest
 @testable import Apollo
+import ApolloCore
 
 class URLSessionClientLiveTests: XCTestCase {