From b00217530e1890ac80971efc0c03f97f52216dad Mon Sep 17 00:00:00 2001 From: Ellen Shapiro Date: Tue, 11 Feb 2020 15:17:42 -0600 Subject: [PATCH 1/2] don't try to run the cache threading test on the SQLite tests --- Tests/ApolloCacheDependentTests/FetchQueryTests.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Tests/ApolloCacheDependentTests/FetchQueryTests.swift b/Tests/ApolloCacheDependentTests/FetchQueryTests.swift index 9b757e7d42..4797089bb2 100644 --- a/Tests/ApolloCacheDependentTests/FetchQueryTests.swift +++ b/Tests/ApolloCacheDependentTests/FetchQueryTests.swift @@ -385,6 +385,9 @@ class FetchQueryTests: XCTestCase { } func testThreadedCache() throws { + #if canImport(ApolloSQLite) + print("THIS ONLY TESTS THE IN-MEMORY CACHE") + #else let cache = InMemoryNormalizedCache() let networkTransport1 = MockNetworkTransport(body: [ @@ -476,5 +479,6 @@ class FetchQueryTests: XCTestCase { for watcher in watchers { watcher.cancel() } + #endif } } From 27d07f6b075f28fb3b60ac9802817c72ec24eb44 Mon Sep 17 00:00:00 2001 From: Ellen Shapiro Date: Tue, 11 Feb 2020 15:18:30 -0600 Subject: [PATCH 2/2] More changes from Apollo CLI --- Tests/StarWarsAPI/API.swift | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Tests/StarWarsAPI/API.swift b/Tests/StarWarsAPI/API.swift index e82bc6bf3a..ff54453016 100644 --- a/Tests/StarWarsAPI/API.swift +++ b/Tests/StarWarsAPI/API.swift @@ -5558,7 +5558,7 @@ public final class StarshipQuery: GraphQLQuery { public final class StarshipCoordinatesQuery: GraphQLQuery { /// The raw GraphQL definition of this operation. - public let operationDefinition = + public let operationDefinition: String = """ query StarshipCoordinates($coordinates: [[Float!]!]) { starshipCoordinates(coordinates: $coordinates) { @@ -5570,7 +5570,7 @@ public final class StarshipCoordinatesQuery: GraphQLQuery { } """ - public let operationName = "StarshipCoordinates" + public let operationName: String = "StarshipCoordinates" public let operationIdentifier: String? = "8dd77d4bc7494c184606da092a665a7c2ca3c2a3f14d3b23fa5e469e207b3406" @@ -5585,7 +5585,7 @@ public final class StarshipCoordinatesQuery: GraphQLQuery { } public struct Data: GraphQLSelectionSet { - public static let possibleTypes = ["Query"] + public static let possibleTypes: [String] = ["Query"] public static let selections: [GraphQLSelection] = [ GraphQLField("starshipCoordinates", arguments: ["coordinates": GraphQLVariable("coordinates")], type: .object(StarshipCoordinate.selections)), @@ -5611,7 +5611,7 @@ public final class StarshipCoordinatesQuery: GraphQLQuery { } public struct StarshipCoordinate: GraphQLSelectionSet { - public static let possibleTypes = ["Starship"] + public static let possibleTypes: [String] = ["Starship"] public static let selections: [GraphQLSelection] = [ GraphQLField("__typename", type: .nonNull(.scalar(String.self))),