From c4fdba3cc937c2602e978f8bb72a6821ca56df46 Mon Sep 17 00:00:00 2001
From: Dariusz Rybicki <dariusz@elixxir.io>
Date: Thu, 29 Sep 2022 18:18:54 +0200
Subject: [PATCH] Refactor
---
.../Messenger/Functions/MessengerCreate.swift | 2 +-
.../Messenger/Functions/MessengerDestroy.swift | 2 +-
.../Functions/MessengerRestoreBackup.swift | 2 +-
.../Utils/MessengerFileManager.swift | 6 +++---
.../Messenger/Functions/MessengerCreateTests.swift | 14 +++++++-------
.../Functions/MessengerDestroyTests.swift | 14 +++++++-------
.../Functions/MessengerRestoreBackupTests.swift | 6 +++---
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/Sources/XXMessengerClient/Messenger/Functions/MessengerCreate.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerCreate.swift
index ed9d193d..bee7f472 100644
--- a/Sources/XXMessengerClient/Messenger/Functions/MessengerCreate.swift
+++ b/Sources/XXMessengerClient/Messenger/Functions/MessengerCreate.swift
@@ -16,7 +16,7 @@ extension MessengerCreate {
let password = env.generateSecret()
try env.passwordStorage.save(password)
let storageDir = env.storageDir
- try env.fileManager.removeDirectory(storageDir)
+ try env.fileManager.removeItem(storageDir)
try env.fileManager.createDirectory(storageDir)
try env.newCMix(
ndfJSON: String(data: ndfData, encoding: .utf8)!,
diff --git a/Sources/XXMessengerClient/Messenger/Functions/MessengerDestroy.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerDestroy.swift
index 7d6932ba..89c472ce 100644
--- a/Sources/XXMessengerClient/Messenger/Functions/MessengerDestroy.swift
+++ b/Sources/XXMessengerClient/Messenger/Functions/MessengerDestroy.swift
@@ -23,7 +23,7 @@ extension MessengerDestroy {
env.e2e.set(nil)
env.cMix.set(nil)
env.isListeningForMessages.set(false)
- try env.fileManager.removeDirectory(env.storageDir)
+ try env.fileManager.removeItem(env.storageDir)
try env.passwordStorage.remove()
}
}
diff --git a/Sources/XXMessengerClient/Messenger/Functions/MessengerRestoreBackup.swift b/Sources/XXMessengerClient/Messenger/Functions/MessengerRestoreBackup.swift
index b196faca..e1f0ec10 100644
--- a/Sources/XXMessengerClient/Messenger/Functions/MessengerRestoreBackup.swift
+++ b/Sources/XXMessengerClient/Messenger/Functions/MessengerRestoreBackup.swift
@@ -33,7 +33,7 @@ extension MessengerRestoreBackup {
let ndfData = try env.downloadNDF(env.ndfEnvironment)
let password = env.generateSecret()
try env.passwordStorage.save(password)
- try env.fileManager.removeDirectory(storageDir)
+ try env.fileManager.removeItem(storageDir)
try env.fileManager.createDirectory(storageDir)
let report = try env.newCMixFromBackup(
ndfJSON: String(data: ndfData, encoding: .utf8)!,
diff --git a/Sources/XXMessengerClient/Utils/MessengerFileManager.swift b/Sources/XXMessengerClient/Utils/MessengerFileManager.swift
index 700990ea..9e2c1590 100644
--- a/Sources/XXMessengerClient/Utils/MessengerFileManager.swift
+++ b/Sources/XXMessengerClient/Utils/MessengerFileManager.swift
@@ -3,7 +3,7 @@ import XCTestDynamicOverlay
public struct MessengerFileManager {
public var isDirectoryEmpty: (String) -> Bool
- public var removeDirectory: (String) throws -> Void
+ public var removeItem: (String) throws -> Void
public var createDirectory: (String) throws -> Void
}
@@ -16,7 +16,7 @@ extension MessengerFileManager {
let contents = try? fileManager.contentsOfDirectory(atPath: path)
return contents?.isEmpty ?? true
},
- removeDirectory: { path in
+ removeItem: { path in
if fileManager.fileExists(atPath: path) {
try fileManager.removeItem(atPath: path)
}
@@ -34,7 +34,7 @@ extension MessengerFileManager {
extension MessengerFileManager {
public static let unimplemented = MessengerFileManager(
isDirectoryEmpty: XCTUnimplemented("\(Self.self).isDirectoryEmpty", placeholder: false),
- removeDirectory: XCTUnimplemented("\(Self.self).removeDirectory"),
+ removeItem: XCTUnimplemented("\(Self.self).removeItem"),
createDirectory: XCTUnimplemented("\(Self.self).createDirectory")
)
}
diff --git a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerCreateTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerCreateTests.swift
index 2180dda3..0c8ce3ba 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerCreateTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerCreateTests.swift
@@ -15,7 +15,7 @@ final class MessengerCreateTests: XCTestCase {
var didDownloadNDF: [NDFEnvironment] = []
var didGenerateSecret: [Int] = []
var didSavePassword: [Data] = []
- var didRemoveDirectory: [String] = []
+ var didRemoveItem: [String] = []
var didCreateDirectory: [String] = []
var didNewCMix: [DidNewCMix] = []
@@ -37,8 +37,8 @@ final class MessengerCreateTests: XCTestCase {
didSavePassword.append(password)
}
env.storageDir = storageDir
- env.fileManager.removeDirectory = { path in
- didRemoveDirectory.append(path)
+ env.fileManager.removeItem = { path in
+ didRemoveItem.append(path)
}
env.fileManager.createDirectory = { path in
didCreateDirectory.append(path)
@@ -58,7 +58,7 @@ final class MessengerCreateTests: XCTestCase {
XCTAssertNoDifference(didDownloadNDF, [.unimplemented])
XCTAssertNoDifference(didGenerateSecret, [32])
XCTAssertNoDifference(didSavePassword, [password])
- XCTAssertNoDifference(didRemoveDirectory, [storageDir])
+ XCTAssertNoDifference(didRemoveItem, [storageDir])
XCTAssertNoDifference(didCreateDirectory, [storageDir])
XCTAssertNoDifference(didNewCMix, [.init(
ndfJSON: String(data: ndf, encoding: .utf8)!,
@@ -108,7 +108,7 @@ final class MessengerCreateTests: XCTestCase {
env.generateSecret.run = { _ in "password".data(using: .utf8)! }
env.passwordStorage.save = { _ in }
env.storageDir = "storage-dir"
- env.fileManager.removeDirectory = { _ in throw error }
+ env.fileManager.removeItem = { _ in throw error }
let create: MessengerCreate = .live(env)
XCTAssertThrowsError(try create()) { err in
@@ -126,7 +126,7 @@ final class MessengerCreateTests: XCTestCase {
env.generateSecret.run = { _ in "password".data(using: .utf8)! }
env.passwordStorage.save = { _ in }
env.storageDir = "storage-dir"
- env.fileManager.removeDirectory = { _ in }
+ env.fileManager.removeItem = { _ in }
env.fileManager.createDirectory = { _ in throw error }
let create: MessengerCreate = .live(env)
@@ -145,7 +145,7 @@ final class MessengerCreateTests: XCTestCase {
env.generateSecret.run = { _ in "password".data(using: .utf8)! }
env.passwordStorage.save = { _ in }
env.storageDir = "storage-dir"
- env.fileManager.removeDirectory = { _ in }
+ env.fileManager.removeItem = { _ in }
env.fileManager.createDirectory = { _ in }
env.newCMix.run = { _, _, _, _ in throw error }
let create: MessengerCreate = .live(env)
diff --git a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerDestroyTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerDestroyTests.swift
index ccf999e7..99a52e84 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerDestroyTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerDestroyTests.swift
@@ -9,7 +9,7 @@ final class MessengerDestroyTests: XCTestCase {
var hasRunningProcesses: [Bool] = [true, true, false]
var didStopNetworkFollower = 0
var didSleep: [TimeInterval] = []
- var didRemoveDirectory: [String] = []
+ var didRemoveItem: [String] = []
var didSetUD: [UserDiscovery?] = []
var didSetE2E: [E2E?] = []
var didSetCMix: [CMix?] = []
@@ -30,7 +30,7 @@ final class MessengerDestroyTests: XCTestCase {
env.e2e.set = { didSetE2E.append($0) }
env.cMix.set = { didSetCMix.append($0) }
env.isListeningForMessages.set = { didSetIsListeningForMessages.append($0) }
- env.fileManager.removeDirectory = { didRemoveDirectory.append($0) }
+ env.fileManager.removeItem = { didRemoveItem.append($0) }
env.passwordStorage.remove = { didRemovePassword += 1 }
let destroy: MessengerDestroy = .live(env)
@@ -42,7 +42,7 @@ final class MessengerDestroyTests: XCTestCase {
XCTAssertNoDifference(didSetE2E.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetCMix.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetIsListeningForMessages, [false])
- XCTAssertNoDifference(didRemoveDirectory, [storageDir])
+ XCTAssertNoDifference(didRemoveItem, [storageDir])
XCTAssertNoDifference(didRemovePassword, 1)
}
@@ -78,7 +78,7 @@ final class MessengerDestroyTests: XCTestCase {
env.e2e.set = { didSetE2E.append($0) }
env.cMix.set = { didSetCMix.append($0) }
env.isListeningForMessages.set = { didSetIsListeningForMessages.append($0) }
- env.fileManager.removeDirectory = { _ in throw error }
+ env.fileManager.removeItem = { _ in throw error }
let destroy: MessengerDestroy = .live(env)
XCTAssertThrowsError(try destroy()) { err in
@@ -94,7 +94,7 @@ final class MessengerDestroyTests: XCTestCase {
struct Error: Swift.Error, Equatable {}
let error = Error()
let storageDir = "test-storage-dir"
- var didRemoveDirectory: [String] = []
+ var didRemoveItem: [String] = []
var didSetUD: [UserDiscovery?] = []
var didSetE2E: [E2E?] = []
var didSetCMix: [CMix?] = []
@@ -107,7 +107,7 @@ final class MessengerDestroyTests: XCTestCase {
env.cMix.set = { didSetCMix.append($0) }
env.isListeningForMessages.set = { didSetIsListeningForMessages.append($0) }
env.storageDir = storageDir
- env.fileManager.removeDirectory = { didRemoveDirectory.append($0) }
+ env.fileManager.removeItem = { didRemoveItem.append($0) }
env.passwordStorage.remove = { throw error }
let destroy: MessengerDestroy = .live(env)
@@ -118,6 +118,6 @@ final class MessengerDestroyTests: XCTestCase {
XCTAssertNoDifference(didSetE2E.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetCMix.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetIsListeningForMessages, [false])
- XCTAssertNoDifference(didRemoveDirectory, [storageDir])
+ XCTAssertNoDifference(didRemoveItem, [storageDir])
}
}
diff --git a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRestoreBackupTests.swift b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRestoreBackupTests.swift
index 672adc37..7e55ddc3 100644
--- a/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRestoreBackupTests.swift
+++ b/Tests/XXMessengerClientTests/Messenger/Functions/MessengerRestoreBackupTests.swift
@@ -40,7 +40,7 @@ final class MessengerRestoreBackupTests: XCTestCase {
env.generateSecret.run = { _ in password }
env.passwordStorage.save = { caughtActions.append(.didSavePassword(password: $0)) }
env.passwordStorage.load = { password }
- env.fileManager.removeDirectory = { caughtActions.append(.didRemoveDirectory(path: $0)) }
+ env.fileManager.removeItem = { caughtActions.append(.didRemoveItem(path: $0)) }
env.fileManager.createDirectory = { caughtActions.append(.didCreateDirectory(path: $0)) }
env.newCMixFromBackup.run = {
ndfJSON, storageDir, backupPassphrase, sessionPassword, backupFileContents in
@@ -114,7 +114,7 @@ final class MessengerRestoreBackupTests: XCTestCase {
.didSavePassword(
password: password
),
- .didRemoveDirectory(
+ .didRemoveItem(
path: env.storageDir
),
.didCreateDirectory(
@@ -185,7 +185,7 @@ private enum CaughtAction: Equatable {
case didSavePassword(
password: Data
)
- case didRemoveDirectory(
+ case didRemoveItem(
path: String
)
case didCreateDirectory(
--
GitLab