replace deprecated code in tests

Author: roninopf

tests/hosting-apps/ui-tests-app/ViewController.swift

@@ -31,24 +31,6 @@ class ViewController: UIViewController {
         }
     }
 
-    // deprecated - will be removed in version 6.3.x or above
-    @IBAction func showSystemNotificationTap(_: UIButton) {
-        ITBInfo()
-        
-        IterableAPI.internalImplementation?.showSystemNotification(withTitle: "Zee Title", body: "Zee Body", buttonLeft: "Left Button", buttonRight: "Right Button") { str in
-            self.statusLbl.text = str
-        }
-    }
-    
-    // deprecated - will be removed in version 6.3.x or above
-    @IBAction func showSystemNotification2Tap(_: UIButton) {
-        ITBInfo()
-        
-        IterableAPI.internalImplementation?.showSystemNotification(withTitle: "Zee Title", body: "Zee Body", buttonLeft: "Zee Button") { str in
-            self.statusLbl.text = str
-        }
-    }
-    
     @IBAction func showInAppTap(_: UIButton) {
         ITBInfo()
 

tests/offline-events-tests/RequestHandlerTests.swift

@@ -551,8 +551,14 @@ class RequestHandlerTests: XCTestCase {
 
         let expectations = createExpectations(description: #function)
 
-        let requestGenerator = { (requestHandler: RequestHandlerProtocol) in
-            requestHandler.trackInAppOpen(messageId,
+        let requestGenerator = { (requestHandler: RequestHandlerProtocol) -> Future<SendRequestValue, SendRequestError> in
+            let message = IterableInAppMessage(messageId: messageId,
+                                               campaignId: nil,
+                                               content: IterableHtmlInAppContent(edgeInsets: .zero, html: ""))
+            
+            return requestHandler.trackInAppOpen(message,
+                                          location: .inApp,
+                                          inboxSessionId: nil,
                                           onSuccess: expectations.onSuccess,
                                           onFailure: expectations.onFailure)
         }
@@ -581,8 +587,14 @@ class RequestHandlerTests: XCTestCase {
 
         let expectations = createExpectations(description: #function)
 
-        let requestGenerator = { (requestHandler: RequestHandlerProtocol) in
-            requestHandler.trackInAppClick(messageId,
+        let requestGenerator = { (requestHandler: RequestHandlerProtocol) -> Future<SendRequestValue, SendRequestError> in
+            let message = IterableInAppMessage(messageId: messageId,
+                                               campaignId: nil,
+                                               content: IterableHtmlInAppContent(edgeInsets: .zero, html: ""))
+            
+            return requestHandler.trackInAppClick(message,
+                                           location: .inApp,
+                                           inboxSessionId: nil,
                                            clickedUrl: clickedUrl,
                                            onSuccess: expectations.onSuccess,
                                            onFailure: expectations.onFailure)

tests/unit-tests/DeepLinkTests.swift

@@ -32,29 +32,42 @@ class DeepLinkTests: XCTestCase {
 
         setupRedirectStubResponse(location: redirectLocation, campaignId: campaignId, templateId: templateId, messageId: messageId)
 
-        let internalAPI = InternalIterableAPI.initializeForTesting()
-        
-        internalAPI.getAndTrack(deepLink: URL(string: iterableRewriteURL)!) { redirectUrl in
-            XCTAssertEqual(redirectUrl, redirectLocation)
+        let mockUrlDelegate = MockUrlDelegate(returnValue: true)
+        mockUrlDelegate.callback = { url, context in
+            XCTAssertEqual(url.absoluteString, redirectLocation)
             XCTAssertTrue(Thread.isMainThread)
+            XCTAssertEqual(context.action.type, IterableAction.actionTypeOpenUrl)
             expectation1.fulfill()
         }
 
+        let deepLinkManager = IterableDeepLinkManager()
+        
+        _ = deepLinkManager.handleUniversalLink(URL(string: iterableRewriteURL)!,
+                                                urlDelegate: mockUrlDelegate,
+                                            urlOpener: MockUrlOpener())
+        
         wait(for: [expectation1], timeout: testExpectationTimeout)
     }
 
     func testTrackUniversalDeepLinkNoRewrite() {
         let expectation1 = expectation(description: "testUniversalDeepLinkNoRewrite")
 
         setupStubResponse()
-        
-        let internalAPI = InternalIterableAPI.initializeForTesting()
-        internalAPI.getAndTrack(deepLink: URL(string: iterableNoRewriteURL)!) { redirectUrl in
-            XCTAssertEqual(redirectUrl, self.iterableNoRewriteURL)
+
+        let mockUrlDelegate = MockUrlDelegate(returnValue: true)
+        mockUrlDelegate.callback = { url, context in
+            XCTAssertEqual(url.absoluteString, self.iterableNoRewriteURL)
             XCTAssertTrue(Thread.isMainThread)
+            XCTAssertEqual(context.action.type, IterableAction.actionTypeOpenUrl)
             expectation1.fulfill()
         }
 
+        let deepLinkManager = IterableDeepLinkManager()
+        
+        _ = deepLinkManager.handleUniversalLink(URL(string: iterableNoRewriteURL)!,
+                                                urlDelegate: mockUrlDelegate,
+                                                urlOpener: MockUrlOpener())
+
         wait(for: [expectation1], timeout: testExpectationTimeout)
     }
 
@@ -84,31 +97,8 @@ class DeepLinkTests: XCTestCase {
         wait(for: [expectation1], timeout: testExpectationTimeout)
     }
 
-    func testDeeplinkAttributionInfo() {
-        let expectation1 = expectation(description: "testDeeplinkAttributionInfo")
-        
-        let redirectLocation = "https://links.iterable.com/api/docs#!/email"
-        let campaignId = 83306
-        let templateId = 124_348
-        let messageId = "93125f33ba814b13a882358f8e0852e0"
-        
-        setupRedirectStubResponse(location: redirectLocation, campaignId: campaignId, templateId: templateId, messageId: messageId)
-        
-        let internalAPI = InternalIterableAPI.initializeForTesting()
-        internalAPI.getAndTrack(deepLink: URL(string: iterableRewriteURL)!) { resolvedURL in
-            XCTAssertEqual(resolvedURL, redirectLocation)
-        }?.onSuccess(block: { _ in
-            XCTAssertEqual(internalAPI.attributionInfo?.campaignId, NSNumber(value: campaignId))
-            XCTAssertEqual(internalAPI.attributionInfo?.templateId, NSNumber(value: templateId))
-            XCTAssertEqual(internalAPI.attributionInfo?.messageId, messageId)
-            expectation1.fulfill()
-        })
-        
-        wait(for: [expectation1], timeout: testExpectationTimeout)
-    }
-    
     func testHandleUniversalLinkAttributionInfo() {
-        let expectation1 = expectation(description: "testDeeplinkAttributionInfo")
+        let expectation1 = expectation(description: "testHandleUniversalLinkAttributionInfo")
 
         let redirectLocation = "https://links.iterable.com/api/docs#!/email"
         let campaignId = 83306
@@ -130,20 +120,26 @@ class DeepLinkTests: XCTestCase {
         wait(for: [expectation1], timeout: testExpectationTimeout)
     }
 
-    // this is a service that automatically redirects if that url is hit, make sure we are not actually hitting the url
-    // but our servers
+    /// this is a service that automatically redirects if that url is hit, make sure we are not actually hitting the url but our servers
     func testNoURLRedirect() {
         let expectation1 = expectation(description: "testNoURLRedirect")
 
         setupStubResponse()
 
-        let internalAPI = InternalIterableAPI.initializeForTesting()
-        internalAPI.getAndTrack(deepLink: URL(string: redirectRequest)!) { redirectUrl in
-            XCTAssertNotEqual(redirectUrl, self.exampleUrl)
-            XCTAssertEqual(redirectUrl, self.redirectRequest)
+        let mockUrlDelegate = MockUrlDelegate(returnValue: false)
+        mockUrlDelegate.callback = { redirectUrl, context in
+            XCTAssertNotEqual(redirectUrl.absoluteString, self.exampleUrl)
+            XCTAssertEqual(redirectUrl.absoluteString, self.redirectRequest)
+            
             expectation1.fulfill()
         }
 
+        let deepLinkManager = IterableDeepLinkManager()
+        
+        _ = deepLinkManager.handleUniversalLink(URL(string: redirectRequest)!,
+                                                urlDelegate: mockUrlDelegate,
+                                                urlOpener: MockUrlOpener())
+        
         wait(for: [expectation1], timeout: testExpectationTimeout)
     }