felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-25 19:10:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve tests

Browse Source
This commit is contained in:
Alfonso Grillo
2023-01-30 18:23:31 +01:00
parent 3908d16817
commit 0497927953
3 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RiotSwiftUI/Modules/Settings/Notifications/Service/Mock/MockNotificationSettingsService.swift
+1 -1
View File
@@ -46,7 +46,7 @@ class MockNotificationSettingsService: NotificationSettingsServiceType, Observab
func updatePushRuleActions(for ruleId: String, enabled: Bool, actions: NotificationActions?, completion: ((Result<Void, Error>) -> Void)?) {
guard let ruleIndex = rules.firstIndex(where: { $0.ruleId == ruleId }) else {
completion?(.failure(NSError(domain: "fake", code: 0)))
completion?(.success(()))
return
}
RiotSwiftUI/Modules/Settings/Notifications/Test/Unit/NotificationSettingsViewModelTests.swift
+24 -12
View File
@@ -45,9 +45,12 @@ final class NotificationSettingsViewModelTests: XCTestCase {
let expectation = expectation(description: #function)
setupWithPollRules()
viewModel.update(ruleID: .oneToOneRoom, isChecked: false)
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
viewModel.update(ruleID: .oneToOneRoom, isChecked: false) { result in
guard case .success = result else {
XCTFail()
return
}
XCTAssertEqual(self.viewModel.viewState.selectionState.count, 8)
XCTAssertEqual(self.viewModel.viewState.selectionState[.oneToOneRoom], false)
XCTAssertEqual(self.viewModel.viewState.selectionState[.oneToOnePollStart], false)
@@ -68,9 +71,12 @@ final class NotificationSettingsViewModelTests: XCTestCase {
let expectation = expectation(description: #function)
setupWithPollRules()
viewModel.update(ruleID: .allOtherMessages, isChecked: false)
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
viewModel.update(ruleID: .allOtherMessages, isChecked: false) { result in
guard case .success = result else {
XCTFail()
return
}
XCTAssertEqual(self.viewModel.viewState.selectionState.count, 8)
XCTAssertEqual(self.viewModel.viewState.selectionState[.allOtherMessages], false)
XCTAssertEqual(self.viewModel.viewState.selectionState[.pollStart], false)
@@ -91,9 +97,12 @@ final class NotificationSettingsViewModelTests: XCTestCase {
let expectation = expectation(description: #function)
setupWithPollRules()
viewModel.update(ruleID: .allOtherMessages, isChecked: false)
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
viewModel.update(ruleID: .allOtherMessages, isChecked: false) { result in
guard case .success = result else {
XCTFail()
return
}
// simulating a "mismatch" on the poll started rule
self.viewModel.update(ruleID: .pollStart, isChecked: true)
@@ -112,9 +121,12 @@ final class NotificationSettingsViewModelTests: XCTestCase {
let expectation = expectation(description: #function)
setupWithPollRules()
viewModel.update(ruleID: .oneToOneRoom, isChecked: false)
DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
viewModel.update(ruleID: .oneToOneRoom, isChecked: false) { result in
guard case .success = result else {
XCTFail()
return
}
// simulating a "mismatch" on the one to one poll started rule
self.viewModel.update(ruleID: .oneToOnePollStart, isChecked: true)
RiotSwiftUI/Modules/Settings/Notifications/ViewModel/NotificationSettingsViewModel.swift
+10 -8
View File
@@ -105,7 +105,7 @@ final class NotificationSettingsViewModel: NotificationSettingsViewModelType, Ob
// MARK: - Public
func update(ruleID: NotificationPushRuleId, isChecked: Bool) {
func update(ruleID: NotificationPushRuleId, isChecked: Bool, completion: ((Result<Void, Error>) -> Void)? = nil) {
let index = NotificationIndex.index(when: isChecked)
let standardActions = ruleID.standardActions(for: index)
let enabled = standardActions != .disabled
@@ -119,7 +119,8 @@ final class NotificationSettingsViewModel: NotificationSettingsViewModelType, Ob
id: ruleID,
enabled: enabled,
standardActions: standardActions,
then: ruleID.syncedRules
then: ruleID.syncedRules,
completion: completion
)
default:
@@ -127,7 +128,7 @@ final class NotificationSettingsViewModel: NotificationSettingsViewModelType, Ob
for: ruleID.rawValue,
enabled: enabled,
actions: standardActions.actions,
completion: nil
completion: completion
)
}
}
@@ -171,8 +172,8 @@ private extension NotificationSettingsViewModel {
func updatePushAction(id: NotificationPushRuleId,
enabled: Bool,
standardActions: NotificationStandardActions,
then rules: [NotificationPushRuleId]) {
then rules: [NotificationPushRuleId],
completion: ((Result<Void, Error>) -> Void)?) {
viewState.saving = true
Task {
@@ -187,18 +188,19 @@ private extension NotificationSettingsViewModel {
}
try await group.waitForAll()
await completeUpdate(error: nil)
await completeUpdate(completion: completion, result: .success(()))
}
} catch {
await completeUpdate(error: error)
await completeUpdate(completion: completion, result: .failure(error))
}
}
}
@MainActor
func completeUpdate(error: Error?) {
func completeUpdate(completion: ((Result<Void, Error>) -> Void)?, result: Result<Void, Error>) {
#warning("Handle error here in the next ticket")
viewState.saving = false
completion?(result)
}
func rulesUpdated(newRules: [NotificationPushRuleType]) {