updates unit tests and cleanup

Author: Evan Greer

swift-sdk/Internal/IterableEmbeddedManager.swift

@@ -51,25 +51,15 @@ class IterableEmbeddedManager: NSObject, IterableEmbeddedManagerProtocol {
         retrieveEmbeddedMessages(completion: completion)
     }
 
-    public func handleEmbeddedClick(message: IterableEmbeddedMessage?, buttonIdentifier: String?, clickedUrl: String) {
-        print("called embeddedMessageClicked IterableEmbeddedManager method.")
-        guard let message = message else {
-            print("Error: message is nil.")
-            return
-        }
+    public func handleEmbeddedClick(message: IterableEmbeddedMessage, buttonIdentifier: String?, clickedUrl: String) {
 
         if let url = URL(string: clickedUrl) {
-            handleClick(clickedUrl: url, forMessage: message)
+            handleUrl(url: url.absoluteString)
         } else {
             print("Invalid URL: \(clickedUrl)")
         }
     }
 
-    private func handleClick(clickedUrl url: URL, forMessage message: IterableEmbeddedMessage) {
-        
-        handleUrl(url: url.absoluteString)
-    }
-    
 
     private func createAction(fromUrlOrAction url: String) -> IterableAction? {
         if let parsedUrl = URL(string: url), let _ = parsedUrl.scheme {

swift-sdk/IterableEmbeddedManagerProtocol.swift

@@ -12,5 +12,5 @@ import Foundation
     func removeUpdateListener(_ listener: IterableEmbeddedUpdateDelegate)
 
     func syncMessages(completion: @escaping () -> Void)
-    func handleEmbeddedClick(message: IterableEmbeddedMessage?, buttonIdentifier: String?, clickedUrl: String)
+    func handleEmbeddedClick(message: IterableEmbeddedMessage, buttonIdentifier: String?, clickedUrl: String)
 }

tests/unit-tests/EmbeddedManagerTests.swift

@@ -12,7 +12,10 @@ final class EmbeddedManagerTests: XCTestCase {
 
         let mockApiClient = MockApiClient()
 
-        let manager = IterableEmbeddedManager(apiClient: mockApiClient)
+        let manager = IterableEmbeddedManager(apiClient: mockApiClient,
+                                              urlDelegate: nil,
+                                              urlOpener: MockUrlOpener(),
+                                              allowedProtocols: [])
 
         let view1 = ViewWithUpdateDelegate(
             onMessagesUpdatedCallback: {
@@ -32,7 +35,10 @@ final class EmbeddedManagerTests: XCTestCase {
     // getMessages
     func testGetMessagesWhenEmpty() {
         let mockApiClient = MockApiClient()
-        let manager = IterableEmbeddedManager(apiClient: mockApiClient)
+        let manager = IterableEmbeddedManager(apiClient: mockApiClient,
+                                              urlDelegate: nil,
+                                              urlOpener: MockUrlOpener(),
+                                              allowedProtocols: [])
         XCTAssertEqual(manager.getMessages().count, 0)
     }
     func testGetMessagesForPlacement() {
@@ -43,9 +49,12 @@ final class EmbeddedManagerTests: XCTestCase {
             IterableEmbeddedMessage(messageId: "3", placementId: 2),
             IterableEmbeddedMessage(messageId: "4", placementId: 3),
         ])
-        let manager = IterableEmbeddedManager(apiClient: mockApiClient)
+        let manager = IterableEmbeddedManager(apiClient: mockApiClient,
+                                              urlDelegate: nil,
+                                              urlOpener: MockUrlOpener(),
+                                              allowedProtocols: [])
 
-        manager.syncMessages {}
+        manager.syncMessages { }
 
         let messagesForPlacement2 = manager.getMessages(for: 2)
 
@@ -67,7 +76,10 @@ final class EmbeddedManagerTests: XCTestCase {
             IterableEmbeddedMessage(messageId: "2", placementId: 1),
         ])
 
-        let manager = IterableEmbeddedManager(apiClient: mockApiClient)
+        let manager = IterableEmbeddedManager(apiClient: mockApiClient,
+                                              urlDelegate: nil,
+                                              urlOpener: MockUrlOpener(),
+                                              allowedProtocols: [])
 
         let view = ViewWithUpdateDelegate(
             onMessagesUpdatedCallback: {
@@ -89,7 +101,10 @@ final class EmbeddedManagerTests: XCTestCase {
 
         let mockApiClient = MockApiClient()
         mockApiClient.setInvalidAPIKey()
-        let manager = IterableEmbeddedManager(apiClient: mockApiClient)
+        let manager = IterableEmbeddedManager(apiClient: mockApiClient,
+                                              urlDelegate: nil,
+                                              urlOpener: MockUrlOpener(),
+                                              allowedProtocols: [])
 
         let view = ViewWithUpdateDelegate(
             onMessagesUpdatedCallback: nil,
@@ -108,7 +123,10 @@ final class EmbeddedManagerTests: XCTestCase {
     // notify multiple delegates
     func testManagerNotifiesMultipleDelegates() {
         let mockApiClient = MockApiClient()
-        let manager = IterableEmbeddedManager(apiClient: mockApiClient)
+        let manager = IterableEmbeddedManager(apiClient: mockApiClient,
+                                              urlDelegate: nil,
+                                              urlOpener: MockUrlOpener(),
+                                              allowedProtocols: [])
 
         var delegate1Called = false
         var delegate2Called = false
@@ -137,7 +155,10 @@ final class EmbeddedManagerTests: XCTestCase {
     // add and remove listeners
     func testManagerCorrectlyAddsAndRemovesListeners() {
         let mockApiClient = MockApiClient()
-        let manager = IterableEmbeddedManager(apiClient: mockApiClient)
+        let manager = IterableEmbeddedManager(apiClient: mockApiClient,
+                                              urlDelegate: nil,
+                                              urlOpener: MockUrlOpener(),
+                                              allowedProtocols: [])
 
         var delegateCalled = false
 
@@ -169,7 +190,11 @@ final class EmbeddedManagerTests: XCTestCase {
     // init/deinit
     func testManagerInitializationAndDeinitialization() {
         let deinitExpectation = expectation(description: "Manager should deinitialize")
-        var manager: IterableEmbeddedManager? = IterableEmbeddedManager(apiClient: MockApiClient())
+        let mockApiClient = MockApiClient()
+        var manager: IterableEmbeddedManager? = IterableEmbeddedManager(apiClient: mockApiClient,
+                                                                        urlDelegate: nil,
+                                                                        urlOpener: MockUrlOpener(),
+                                                                        allowedProtocols: [])
         manager?.onDeinit = {
             deinitExpectation.fulfill()
         }
@@ -184,7 +209,10 @@ final class EmbeddedManagerTests: XCTestCase {
         let expectation = XCTestExpectation(description: "onMessagesUpdated called")
 
         let mockApiClient = MockApiClient()
-        let manager = IterableEmbeddedManager(apiClient: mockApiClient)
+        let manager = IterableEmbeddedManager(apiClient: mockApiClient,
+                                              urlDelegate: nil,
+                                              urlOpener: MockUrlOpener(),
+                                              allowedProtocols: [])
 
         let mockDelegate = ViewWithUpdateDelegate(
             onMessagesUpdatedCallback: {
@@ -229,6 +257,11 @@ final class EmbeddedManagerTests: XCTestCase {
         }
     }
 
+    private class MockUrlOpener: NSObject, UrlOpenerProtocol {
+        func open(url: URL) {
+        }
+    }
+    
     private class MockApiClient: BlankApiClient {
         private var newMessages = false
         private var invalidApiKey = false