[PM-18417] refactor: Move BitwardenTestError into TestHelpers (#1410)

This commit is contained in:
Katherine Bertelsen 2025-03-06 14:02:30 -06:00 committed by GitHub
parent c2a90a6c3c
commit 9c0dae3d1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
104 changed files with 118 additions and 55 deletions

View File

@ -1,5 +1,6 @@
import Combine
import Foundation
import TestHelpers
@testable import AuthenticatorShared
@ -107,7 +108,7 @@ class MockStateService: StateService {
if let userId {
return userId
} else {
throw AuthenticatorTestError.example
throw BitwardenTestError.example
}
}
}

View File

@ -1,5 +1,6 @@
import AuthenticatorBridgeKit
import InlineSnapshotTesting
import TestHelpers
import XCTest
@testable import AuthenticatorShared
@ -69,9 +70,9 @@ class AuthenticatorItemRepositoryTests: BitwardenTestCase { // swiftlint:disable
/// `addAuthenticatorItem()` throws an error if encrypting the item fails
func test_addAuthenticatorItem_encryptError() async {
cryptographyService.encryptError = AuthenticatorTestError.example
cryptographyService.encryptError = BitwardenTestError.example
await assertAsyncThrows(error: AuthenticatorTestError.example) {
await assertAsyncThrows(error: BitwardenTestError.example) {
try await subject.addAuthenticatorItem(.fixture())
}
}
@ -250,7 +251,7 @@ class AuthenticatorItemRepositoryTests: BitwardenTestCase { // swiftlint:disable
/// `saveTemporarySharedItem(_)` throws errors received from the `AuthenticatorBridgeItemService`.
func test_saveTemporarySharedItem_throwsError() async throws {
let item = AuthenticatorItemView.fixture()
let error = AuthenticatorTestError.example
let error = BitwardenTestError.example
sharedItemService.errorToThrow = error
@ -406,7 +407,7 @@ class AuthenticatorItemRepositoryTests: BitwardenTestCase { // swiftlint:disable
let favoritedItem = itemListItem(from: items[1])
authItemService.authenticatorItemsSubject.send(items)
sharedItemService.sharedItemsSubject.send(completion: .failure(AuthenticatorTestError.example))
sharedItemService.sharedItemsSubject.send(completion: .failure(BitwardenTestError.example))
var iterator = try await subject.itemListPublisher().makeAsyncIterator()
let sections = try await iterator.next()

View File

@ -1,4 +1,5 @@
import Foundation
import TestHelpers
@testable import AuthenticatorShared
@ -6,11 +7,11 @@ class MockExportItemsService: ExportItemsService {
var didClearFiles = false
var exportFileContentsFormat: ExportFileType?
var exportFileContentResult: Result<String, Error> = .failure(AuthenticatorTestError.example)
var exportFileContentResult: Result<String, Error> = .failure(BitwardenTestError.example)
var mockFileName: String = "mockExport.json"
var writeToFileResult: Result<URL, Error> = .failure(AuthenticatorTestError.example)
var writeToFileResult: Result<URL, Error> = .failure(BitwardenTestError.example)
func clearTemporaryFiles() {
didClearFiles = true

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
@testable import AuthenticatorShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import AuthenticatorShared
@ -67,7 +68,7 @@ class ExportItemsProcessorTests: BitwardenTestCase {
/// `.receive()` with `.exportItemsTapped` logs an error on export failure.
@MainActor
func test_receive_exportItemsTapped_unencrypted_error() throws {
exportService.exportFileContentResult = .failure(AuthenticatorTestError.example)
exportService.exportFileContentResult = .failure(BitwardenTestError.example)
subject.state.fileFormat = .csv
subject.receive(.exportItemsTapped)
@ -78,7 +79,7 @@ class ExportItemsProcessorTests: BitwardenTestCase {
}
waitFor(!errorReporter.errors.isEmpty)
task.cancel()
XCTAssertEqual(errorReporter.errors.first as? AuthenticatorTestError, .example)
XCTAssertEqual(errorReporter.errors.first as? BitwardenTestError, .example)
}
/// `.receive()` with `.exportItemsTapped` passes a file url to the coordinator on success.

View File

@ -1,4 +1,5 @@
import Foundation
import TestHelpers
import XCTest
@testable import AuthenticatorShared
@ -168,12 +169,12 @@ class ImportItemsProcessorTests: BitwardenTestCase {
/// When the import process throws an unexpected error, the processor logs the error..
@MainActor
func test_fileSelectionCompleted_unknownError() async throws {
importItemsService.errorToThrow = AuthenticatorTestError.example
importItemsService.errorToThrow = BitwardenTestError.example
let data = "Test Data".data(using: .utf8)!
subject.fileSelectionCompleted(fileName: "Filename", data: data)
try await waitForAsync { !self.errorReporter.errors.isEmpty }
XCTAssertEqual(errorReporter.errors.last as? AuthenticatorTestError, AuthenticatorTestError.example)
XCTAssertEqual(errorReporter.errors.last as? BitwardenTestError, BitwardenTestError.example)
XCTAssertTrue(coordinator.alertShown.isEmpty)
XCTAssertNil(subject.state.toast)
}

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
// swiftlint:disable file_length
@ -154,7 +155,7 @@ class ItemListProcessorTests: BitwardenTestCase { // swiftlint:disable:this type
/// `perform(_:)` with `.appeared` records any errors.
func test_perform_appeared_error_vaultListGroupSubjectFail() {
authItemRepository.itemListSubject.send(completion: .failure(AuthenticatorTestError.example))
authItemRepository.itemListSubject.send(completion: .failure(BitwardenTestError.example))
let task = Task {
await subject.perform(.appeared)
@ -163,7 +164,7 @@ class ItemListProcessorTests: BitwardenTestCase { // swiftlint:disable:this type
waitFor(!errorReporter.errors.isEmpty)
task.cancel()
XCTAssertEqual(errorReporter.errors.last as? AuthenticatorTestError, .example)
XCTAssertEqual(errorReporter.errors.last as? BitwardenTestError, .example)
}
/// `perform(_:)` with `.appeared` handles TOTP Code expiration
@ -257,7 +258,7 @@ class ItemListProcessorTests: BitwardenTestCase { // swiftlint:disable:this type
@MainActor
func test_perform_copyPressed_error() {
let localItem = ItemListItem.fixture()
totpService.getTotpCodeResult = .failure(AuthenticatorTestError.example)
totpService.getTotpCodeResult = .failure(BitwardenTestError.example)
let task = Task {
await subject.perform(.copyPressed(localItem))
@ -329,7 +330,7 @@ class ItemListProcessorTests: BitwardenTestCase { // swiftlint:disable:this type
authItemRepository.pmSyncEnabled = true
application.canOpenUrlResponse = true
let localItem = ItemListItem.fixture()
authItemRepository.tempItemErrorToThrow = AuthenticatorTestError.example
authItemRepository.tempItemErrorToThrow = BitwardenTestError.example
await subject.perform(.moveToBitwardenPressed(localItem))
@ -424,7 +425,7 @@ class ItemListProcessorTests: BitwardenTestCase { // swiftlint:disable:this type
/// `perform(.search)` throws error and error is logged.
@MainActor
func test_perform_search_error() async {
authItemRepository.searchItemListSubject.send(completion: .failure(AuthenticatorTestError.example))
authItemRepository.searchItemListSubject.send(completion: .failure(BitwardenTestError.example))
await subject.perform(.search("example"))
XCTAssertEqual(subject.state.searchResults.count, 0)
@ -432,7 +433,7 @@ class ItemListProcessorTests: BitwardenTestCase { // swiftlint:disable:this type
subject.state.searchResults,
[]
)
XCTAssertEqual(errorReporter.errors as? [AuthenticatorTestError], [.example])
XCTAssertEqual(errorReporter.errors as? [BitwardenTestError], [.example])
}
/// `perform(.search)` handles TOTP Code expiration

View File

@ -1,5 +1,6 @@
import BitwardenSdk
import SwiftUI
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import LocalAuthentication
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import LocalAuthentication
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import AuthenticationServices
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import AuthenticationServices
import BitwardenSdk
import TestHelpers
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,6 +1,7 @@
import AuthenticatorBridgeKit
import BitwardenSdk
import Combine
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import BitwardenSdk
import InlineSnapshotTesting
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import AuthenticationServices
import BitwardenSdk
import TestHelpers
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,6 +1,7 @@
import BitwardenSdk
import Combine
import Foundation
import TestHelpers
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import BitwardenSdk
import InlineSnapshotTesting
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import BitwardenSdk
import InlineSnapshotTesting
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
// swiftlint:disable file_length

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import AuthenticationServices
import Foundation
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import BitwardenSdk
import Combine
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import AuthenticationServices
import SwiftUI
import TestHelpers
import XCTest
// swiftlint:disable file_length

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
// swiftlint:disable file_length

View File

@ -1,5 +1,6 @@
import AuthenticationServices
import Networking
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import SwiftUI
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import AuthenticationServices
import Networking
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import AuthenticationServices
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import AuthenticationServices
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import AuthenticationServices
import BitwardenSdk
import TestHelpers
import XCTest
// swiftlint:disable file_length

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import SwiftUI
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import SwiftUI
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -3,6 +3,7 @@
import AuthenticationServices
import BitwardenSdk
import Foundation
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,6 +1,7 @@
import AuthenticationServices
import AuthenticatorBridgeKit
import Foundation
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -2,6 +2,7 @@
import Foundation
import Networking
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import SnapshotTesting
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import SwiftUI
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import SwiftUI
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import AuthenticationServices
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,6 +1,7 @@
import BitwardenSdk
import PhotosUI
import SwiftUI
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import BitwardenSdk
import InlineSnapshotTesting
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,6 +1,7 @@
// swiftlint:disable:this file_name
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -2,6 +2,7 @@
import AuthenticationServices
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,6 +1,7 @@
// swiftlint:disable:this file_name
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import SwiftUI
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
// swiftlint:disable file_length

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -3,6 +3,7 @@
import AuthenticationServices
import BitwardenSdk
import Networking
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,5 +1,6 @@
import BitwardenSdk
import Networking
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,3 +1,4 @@
import TestHelpers
import XCTest
@testable import BitwardenShared

View File

@ -1,4 +1,5 @@
import BitwardenSdk
import TestHelpers
import XCTest
@testable import BitwardenShared

Some files were not shown because too many files have changed in this diff Show More