Merge pull request #977 from BranchMetrics/SDK-686-simplify-FB-unit-test

SDK-686 simplify FB unit test

Author: echo-branch

Branch-SDK-Tests/BNCFacebookAppLinksTests.m

@@ -9,24 +9,19 @@
 #import <XCTest/XCTest.h>
 #import "BNCFacebookMock.h"
 #import "BNCFacebookAppLinks.h"
-#import "Branch.h"
 
 @interface BNCFacebookAppLinks()
 - (BOOL)isDeepLinkingClassAvailable;
 @end
 
 @interface BNCFacebookAppLinksTests : XCTestCase
 @property (nonatomic, strong, readwrite) BNCFacebookAppLinks *applinks;
-@property (nonatomic, strong, readwrite) Branch *branch;
-@property (nonatomic, strong, readwrite) BNCPreferenceHelper *preferenceHelper;
 @end
 
 @implementation BNCFacebookAppLinksTests
 
 - (void)setUp {
-    self.branch = [Branch getInstance];
     self.applinks = [BNCFacebookAppLinks new];
-    self.preferenceHelper = [BNCPreferenceHelper preferenceHelper];
 }
 
 - (void)tearDown {
@@ -53,6 +48,7 @@ - (void)testFetchFacebookAppLink {
     [self.applinks registerFacebookDeepLinkingClass:[BNCFacebookMock new]];
     [self.applinks fetchFacebookAppLinkWithCompletion:^(NSURL * _Nullable appLink, NSError * _Nullable error) {
         XCTAssertTrue([[appLink absoluteString] isEqualToString:@"https://branch.io"]);
+        XCTAssertTrue([NSThread isMainThread]);
         [expectation fulfill];
     }];
 
@@ -63,28 +59,19 @@ - (void)testFetchFacebookAppLink {
 
 // check if FBSDKAppLinkUtility.fetchDeferredAppLink is called on the main thread
 // https://developers.facebook.com/docs/reference/ios/current/class/FBSDKAppLinkUtility
-- (void)testCheckFacebookAppLinks {
+- (void)testFetchFacebookAppLink_BackgroundThead {
     __block XCTestExpectation *expectation = [self expectationWithDescription:@""];
 
-    [self.branch registerFacebookDeepLinkingClass:[BNCFacebookMock new]];
-    
-    // checkFacebookAppLinks is not public, so use reflection to call it
-    SEL selector = NSSelectorFromString(@"checkFacebookAppLinks");
-    ((void (*)(id, SEL))[self.branch methodForSelector:selector])(self.branch, selector);
-    
-    // wait 2 secs, then fulfill expectation, if checkFacebookAppLinks succeeded in setting
-    // BNCPreferenceHelper's property 'faceBookAppLink'
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        if ([self.preferenceHelper faceBookAppLink]) {
-            XCTAssertTrue([[self.preferenceHelper faceBookAppLink].absoluteString isEqualToString:@"https://branch.io"]);
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        [self.applinks registerFacebookDeepLinkingClass:[BNCFacebookMock new]];
+        [self.applinks fetchFacebookAppLinkWithCompletion:^(NSURL * _Nullable appLink, NSError * _Nullable error) {
+            XCTAssertTrue([[appLink absoluteString] isEqualToString:@"https://branch.io"]);
+            XCTAssertTrue([NSThread isMainThread]);
             [expectation fulfill];
-        } else {
-            XCTFail(@"BNCPreferenceHelper.faceBookAppLink is nil after 2 seconds");
-        }
+        }];
     });
 
-    // wait 3 secs, then check if expectation's been fulfilled
-    [self waitForExpectationsWithTimeout:3 handler:^(NSError * _Nullable error) {
+    [self waitForExpectationsWithTimeout:2 handler:^(NSError * _Nullable error) {
         NSLog(@"%@", error);
     }];
 }

Branch-SDK/Branch-SDK/BNCFacebookAppLinks.m

@@ -64,7 +64,7 @@ - (void)fetchFacebookAppLinkWithCompletion:(void (^_Nullable)(NSURL *__nullable
      };
 
     dispatch_async(dispatch_get_main_queue(), ^{
-     ((void (*)(id, SEL, void (^ __nullable)(NSURL *__nullable appLink, NSError * __nullable error)))[self.appLinkUtility methodForSelector:self.fetchDeferredAppLink])(self.appLinkUtility, self.fetchDeferredAppLink, completionBlock);
+        ((void (*)(id, SEL, void (^ __nullable)(NSURL *__nullable appLink, NSError * __nullable error)))[self.appLinkUtility methodForSelector:self.fetchDeferredAppLink])(self.appLinkUtility, self.fetchDeferredAppLink, completionBlock);
     });
  }