Use handler queue for subscription callback (actual head of 2.9.2 rel…

…ease) Test cleanup - Turn off code signing for test targets - Update integration test credentials - Separated waits for inverted expectations in long running tests - Change test setup lifecycle to account for base query completed state; delta query may be invoked after base query is done, as in the case of a network failure)
awslabs · Jan 18, 2019 · da40e48 · da40e48
1 parent 512c133
commit da40e48
Show file tree

Hide file tree

Showing 6 changed files with 183 additions and 57 deletions.
diff --git a/AWSAppSyncClient.xcodeproj/project.pbxproj b/AWSAppSyncClient.xcodeproj/project.pbxproj
@@ -1049,7 +1049,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1010;
-				LastUpgradeCheck = 1000;
+				LastUpgradeCheck = 1010;
 				ORGANIZATIONNAME = "Amazon Web Services";
 				TargetAttributes = {
 					1700503521543E41008B16B6 = {
@@ -1702,7 +1702,7 @@
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1733,7 +1733,7 @@
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2065,7 +2065,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2094,7 +2094,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
+				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;

diff --git a/AWSAppSyncClient.xcodeproj/xcshareddata/xcschemes/AWSAppSync.xcscheme b/AWSAppSyncClient.xcodeproj/xcshareddata/xcschemes/AWSAppSync.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1000"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/AWSAppSyncClient/Internal/AppSyncSubscriptionWithSync.swift b/AWSAppSyncClient/Internal/AppSyncSubscriptionWithSync.swift
@@ -159,7 +159,7 @@ final class AppSyncSubscriptionWithSync<Subscription: GraphQLSubscription, BaseQ
         let semaphore = DispatchSemaphore(value: 0)
 
         AppSyncLog.info("Initializing base query results from cache")
-        appSyncClient.fetch(query: baseQuery, cachePolicy: CachePolicy.returnCacheDataDontFetch) { [weak self] (result, error) in
+        appSyncClient.fetch(query: baseQuery, cachePolicy: .returnCacheDataDontFetch) { [weak self] (result, error) in
             self?.baseQueryHandler(result, error)
             semaphore.signal()
         }
@@ -249,6 +249,7 @@ final class AppSyncSubscriptionWithSync<Subscription: GraphQLSubscription, BaseQ
         do {
             subscriptionWatcher = try appSyncClient.subscribeWithConnectCallback(
                 subscription: subscription,
+                queue: handlerQueue ?? DispatchQueue.main,
                 connectCallback: connectCallback,
                 resultHandler: resultHandler
             )