attempt to integrate keychain into tests

Author: roninopf

tests/common/CommonMocks.swift

@@ -466,18 +466,11 @@ class MockLocalStorage: LocalStorageProtocol {
     private var attributionInfoExpiration: Date? = nil
 
     private static func isExpired(expiration: Date?, currentDate: Date) -> Bool {
-        if let expiration = expiration {
-            if expiration.timeIntervalSinceReferenceDate > currentDate.timeIntervalSinceReferenceDate {
-                // expiration is later
-                return false
-            } else {
-                // expired
-                return true
-            }
-        } else {
-            // no expiration
+        guard let expiration = expiration else {
             return false
         }
+        
+        return !(expiration.timeIntervalSinceReferenceDate > currentDate.timeIntervalSinceReferenceDate)
     }
 }
 

tests/unit-tests/LocalStorageTests.swift

@@ -9,17 +9,32 @@ import XCTest
 class LocalStorageTests: XCTestCase {
     override func setUp() {
         super.setUp()
+        
         LocalStorageTests.clearTestUserDefaults()
+        LocalStorageTests.clearTestKeychain()
     }
 
-    static let userDefaultsSuiteName = "localstorage.tests"
+    static let localStorageTestSuiteName = "localstorage.tests"
 
     private static func getTestUserDefaults() -> UserDefaults {
-        UserDefaults(suiteName: userDefaultsSuiteName)!
+        UserDefaults(suiteName: localStorageTestSuiteName)!
     }
 
     private static func clearTestUserDefaults() {
-        getTestUserDefaults().removePersistentDomain(forName: userDefaultsSuiteName)
+        getTestUserDefaults().removePersistentDomain(forName: localStorageTestSuiteName)
+    }
+    
+    private static func getTestKeychain() -> IterableKeychain {
+        IterableKeychain(wrapper: KeychainWrapper(serviceName: localStorageTestSuiteName))
+    }
+    
+    private static func clearTestKeychain() {
+        let testKeychain = getTestKeychain()
+        
+        testKeychain.email = nil
+        testKeychain.userId = nil
+        testKeychain.authToken = nil
+        testKeychain.setLastPushPayload(nil, withExpiration: nil)
     }
 
     func testUserIdAndEmail() throws {
@@ -96,7 +111,8 @@ class LocalStorageTests: XCTestCase {
 
     func testPayload() throws {
         let mockDateProvider = MockDateProvider()
-        let localStorage = LocalStorage(userDefaults: LocalStorageTests.getTestUserDefaults())
+        let localStorage = LocalStorage(userDefaults: LocalStorageTests.getTestUserDefaults(), keychain: LocalStorageTests.getTestKeychain())
+        
         let payload: [AnyHashable: Any] = [
             "email": "[email protected]",
             "device": [