Skip to content
Snippets Groups Projects
Commit fbfa48f4 authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Merge branch 'feature/update-messenger-destroy' into 'development'

Remove file transfer and backup on destroy

See merge request elixxir/elixxir-dapps-sdk-swift!127
parents 18b4cb6e 67569a70
No related branches found
No related tags found
2 merge requests!127Remove file transfer and backup on destroy,!102Release 1.0.0
...@@ -19,6 +19,8 @@ extension MessengerDestroy { ...@@ -19,6 +19,8 @@ extension MessengerDestroy {
env.sleep(1) env.sleep(1)
} }
} }
env.fileTransfer.set(nil)
env.backup.set(nil)
env.ud.set(nil) env.ud.set(nil)
env.e2e.set(nil) env.e2e.set(nil)
env.cMix.set(nil) env.cMix.set(nil)
......
...@@ -10,6 +10,8 @@ final class MessengerDestroyTests: XCTestCase { ...@@ -10,6 +10,8 @@ final class MessengerDestroyTests: XCTestCase {
var didStopNetworkFollower = 0 var didStopNetworkFollower = 0
var didSleep: [TimeInterval] = [] var didSleep: [TimeInterval] = []
var didRemoveItem: [String] = [] var didRemoveItem: [String] = []
var didSetFileTransfer: [FileTransfer?] = []
var didSetBackup: [Backup?] = []
var didSetUD: [UserDiscovery?] = [] var didSetUD: [UserDiscovery?] = []
var didSetE2E: [E2E?] = [] var didSetE2E: [E2E?] = []
var didSetCMix: [CMix?] = [] var didSetCMix: [CMix?] = []
...@@ -26,6 +28,8 @@ final class MessengerDestroyTests: XCTestCase { ...@@ -26,6 +28,8 @@ final class MessengerDestroyTests: XCTestCase {
} }
env.sleep = { didSleep.append($0) } env.sleep = { didSleep.append($0) }
env.storageDir = storageDir env.storageDir = storageDir
env.fileTransfer.set = { didSetFileTransfer.append($0) }
env.backup.set = { didSetBackup.append($0) }
env.ud.set = { didSetUD.append($0) } env.ud.set = { didSetUD.append($0) }
env.e2e.set = { didSetE2E.append($0) } env.e2e.set = { didSetE2E.append($0) }
env.cMix.set = { didSetCMix.append($0) } env.cMix.set = { didSetCMix.append($0) }
...@@ -38,6 +42,8 @@ final class MessengerDestroyTests: XCTestCase { ...@@ -38,6 +42,8 @@ final class MessengerDestroyTests: XCTestCase {
XCTAssertNoDifference(didStopNetworkFollower, 1) XCTAssertNoDifference(didStopNetworkFollower, 1)
XCTAssertNoDifference(didSleep, [1, 1]) XCTAssertNoDifference(didSleep, [1, 1])
XCTAssertNoDifference(didSetFileTransfer.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetBackup.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetUD.map { $0 == nil }, [true]) XCTAssertNoDifference(didSetUD.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetE2E.map { $0 == nil }, [true]) XCTAssertNoDifference(didSetE2E.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetCMix.map { $0 == nil }, [true]) XCTAssertNoDifference(didSetCMix.map { $0 == nil }, [true])
...@@ -67,6 +73,8 @@ final class MessengerDestroyTests: XCTestCase { ...@@ -67,6 +73,8 @@ final class MessengerDestroyTests: XCTestCase {
func testRemoveDirectoryFailure() { func testRemoveDirectoryFailure() {
struct Error: Swift.Error, Equatable {} struct Error: Swift.Error, Equatable {}
let error = Error() let error = Error()
var didSetFileTransfer: [FileTransfer?] = []
var didSetBackup: [Backup?] = []
var didSetUD: [UserDiscovery?] = [] var didSetUD: [UserDiscovery?] = []
var didSetE2E: [E2E?] = [] var didSetE2E: [E2E?] = []
var didSetCMix: [CMix?] = [] var didSetCMix: [CMix?] = []
...@@ -74,6 +82,8 @@ final class MessengerDestroyTests: XCTestCase { ...@@ -74,6 +82,8 @@ final class MessengerDestroyTests: XCTestCase {
var env: MessengerEnvironment = .unimplemented var env: MessengerEnvironment = .unimplemented
env.cMix.get = { nil } env.cMix.get = { nil }
env.fileTransfer.set = { didSetFileTransfer.append($0) }
env.backup.set = { didSetBackup.append($0) }
env.ud.set = { didSetUD.append($0) } env.ud.set = { didSetUD.append($0) }
env.e2e.set = { didSetE2E.append($0) } env.e2e.set = { didSetE2E.append($0) }
env.cMix.set = { didSetCMix.append($0) } env.cMix.set = { didSetCMix.append($0) }
...@@ -84,6 +94,8 @@ final class MessengerDestroyTests: XCTestCase { ...@@ -84,6 +94,8 @@ final class MessengerDestroyTests: XCTestCase {
XCTAssertThrowsError(try destroy()) { err in XCTAssertThrowsError(try destroy()) { err in
XCTAssertEqual(err as? Error, error) XCTAssertEqual(err as? Error, error)
} }
XCTAssertNoDifference(didSetFileTransfer.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetBackup.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetUD.map { $0 == nil }, [true]) XCTAssertNoDifference(didSetUD.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetE2E.map { $0 == nil }, [true]) XCTAssertNoDifference(didSetE2E.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetCMix.map { $0 == nil }, [true]) XCTAssertNoDifference(didSetCMix.map { $0 == nil }, [true])
...@@ -95,6 +107,8 @@ final class MessengerDestroyTests: XCTestCase { ...@@ -95,6 +107,8 @@ final class MessengerDestroyTests: XCTestCase {
let error = Error() let error = Error()
let storageDir = "test-storage-dir" let storageDir = "test-storage-dir"
var didRemoveItem: [String] = [] var didRemoveItem: [String] = []
var didSetFileTransfer: [FileTransfer?] = []
var didSetBackup: [Backup?] = []
var didSetUD: [UserDiscovery?] = [] var didSetUD: [UserDiscovery?] = []
var didSetE2E: [E2E?] = [] var didSetE2E: [E2E?] = []
var didSetCMix: [CMix?] = [] var didSetCMix: [CMix?] = []
...@@ -102,6 +116,8 @@ final class MessengerDestroyTests: XCTestCase { ...@@ -102,6 +116,8 @@ final class MessengerDestroyTests: XCTestCase {
var env: MessengerEnvironment = .unimplemented var env: MessengerEnvironment = .unimplemented
env.cMix.get = { nil } env.cMix.get = { nil }
env.fileTransfer.set = { didSetFileTransfer.append($0) }
env.backup.set = { didSetBackup.append($0) }
env.ud.set = { didSetUD.append($0) } env.ud.set = { didSetUD.append($0) }
env.e2e.set = { didSetE2E.append($0) } env.e2e.set = { didSetE2E.append($0) }
env.cMix.set = { didSetCMix.append($0) } env.cMix.set = { didSetCMix.append($0) }
...@@ -114,6 +130,8 @@ final class MessengerDestroyTests: XCTestCase { ...@@ -114,6 +130,8 @@ final class MessengerDestroyTests: XCTestCase {
XCTAssertThrowsError(try destroy()) { err in XCTAssertThrowsError(try destroy()) { err in
XCTAssertEqual(err as? Error, error) XCTAssertEqual(err as? Error, error)
} }
XCTAssertNoDifference(didSetFileTransfer.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetBackup.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetUD.map { $0 == nil }, [true]) XCTAssertNoDifference(didSetUD.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetE2E.map { $0 == nil }, [true]) XCTAssertNoDifference(didSetE2E.map { $0 == nil }, [true])
XCTAssertNoDifference(didSetCMix.map { $0 == nil }, [true]) XCTAssertNoDifference(didSetCMix.map { $0 == nil }, [true])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment