Refine UTs

Author: alfogrillo

RiotSwiftUI/Modules/UserSessions/UserSessionsOverview/Service/MatrixSDK/UserSessionsDataProvider.swift

@@ -77,6 +77,15 @@ class UserSessionsDataProvider: UserSessionsDataProviderProtocol {
 }
 
 extension UserSessionsDataProvider {
+    private func deleteAccountDataIfNeeded(deviceList: [MXDevice]) {
+        let obsoletedDeviceAccountDataKeys = obsoletedDeviceAccountData(deviceList: deviceList,
+                                                                        accountDataEvents: session.accountData.allAccountDataEvents())
+        
+        for accountDataKey in obsoletedDeviceAccountDataKeys {
+            session.deleteAccountData(withType: accountDataKey, success: {}, failure: { _ in })
+        }
+    }
+    
     // internal just to facilitate tests
     func obsoletedDeviceAccountData(deviceList: [MXDevice], accountDataEvents: [String: Any]) -> Set<String> {
         let deviceAccountDataKeys = Set(
@@ -91,13 +100,4 @@ extension UserSessionsDataProvider {
 
         return deviceAccountDataKeys.subtracting(expectedDeviceAccountDataKeys)
     }
-    
-    private func deleteAccountDataIfNeeded(deviceList: [MXDevice]) {
-        let obsoletedDeviceAccountDataKeys = obsoletedDeviceAccountData(deviceList: deviceList,
-                                                                        accountDataEvents: session.accountData.allAccountDataEvents())
-        
-        for accountDataKey in obsoletedDeviceAccountDataKeys {
-            session.deleteAccountData(withType: accountDataKey, success: {}, failure: { _ in })
-        }
-    }
 }

RiotTests/UserSessionsDataProviderTests.swift

@@ -106,7 +106,8 @@ class UserSessionCardViewDataTests: XCTestCase {
         let dataProvider = UserSessionsDataProvider(session: mxSession)
 
         let accountDataEvents: [String: Any] = [
-            "io.element.matrix_client_information.D": ""
+            "io.element.matrix_client_information.D": "",
+            "foo": ""
         ]
 
         let expectedObsoletedEvents: Set = [
@@ -123,7 +124,8 @@ class UserSessionCardViewDataTests: XCTestCase {
         let dataProvider = UserSessionsDataProvider(session: mxSession)
 
         let accountDataEvents: [String: Any] = [
-            "io.element.matrix_client_information.C": ""
+            "io.element.matrix_client_information.C": "",
+            "foo": ""
         ]
 
         let expectedObsoletedEvents: Set<String> = []
@@ -138,7 +140,7 @@ class UserSessionCardViewDataTests: XCTestCase {
 
         let expectedObsoletedEvents = Set(["D", "E", "F"].map { "io.element.matrix_client_information.\($0)"})
 
-        let accountDataEvents: [String: Any] = expectedObsoletedEvents.reduce(into: [:]) { partialResult, value in
+        let accountDataEvents: [String: Any] = expectedObsoletedEvents.reduce(into: ["foo": ""]) { partialResult, value in
             partialResult[value] = ""
         }