Skip to content

Commit 66c9604

Browse files
authored
Refactor FXIOS-14344 [Swift 6 migration] Fixing warnings in unit tests (#31129)
Fix warnings in unit tests batch 4
1 parent c8dcb3f commit 66c9604

17 files changed

+64
-63
lines changed

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Browser/BrowserWebUIDelegateTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ final class BrowserWebUIDelegateTests: XCTestCase {
2121
)
2222
}
2323

24-
override func setUp() {
25-
super.setUp()
24+
override func setUp() async throws {
25+
try await super.setUp()
2626
DependencyHelperMock().bootstrapDependencies()
2727
let profile = MockProfile()
2828
LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: profile)
2929
engineResponder = MockWKUIHandler()
3030
mockLegacyResponder = MockLegacyResponder()
3131
}
3232

33-
override func tearDown() {
33+
override func tearDown() async throws {
3434
DependencyHelperMock().reset()
3535
engineResponder = nil
3636
mockLegacyResponder = nil
37-
super.tearDown()
37+
try await super.tearDown()
3838
}
3939

4040
func testCreateWebView_respondsToEngineResponder() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/ContextualHints/ContextualHintEligibilityUtilityTests.swift

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ class ContextualHintEligibilityUtilityTests: XCTestCase {
1616
var urlBar: MockURLBarView!
1717
var overlayState: MockOverlayModeManager!
1818

19-
override func setUp() {
20-
super.setUp()
19+
override func setUp() async throws {
20+
try await super.setUp()
2121

2222
profile = MockProfile()
2323
urlBar = MockURLBarView()
@@ -28,14 +28,13 @@ class ContextualHintEligibilityUtilityTests: XCTestCase {
2828
overlayState: nil)
2929
}
3030

31-
override func tearDown() {
32-
super.tearDown()
33-
31+
override func tearDown() async throws {
3432
profile.shutdown()
3533
profile = nil
3634
urlBar = nil
3735
overlayState = nil
3836
subject = nil
37+
try await super.tearDown()
3938
}
4039

4140
// MARK: - Test should Present cases

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/ContextualHints/ContextualHintViewProviderTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ class ContextualHintViewProviderTests: XCTestCase {
1313

1414
private var profile: MockProfile!
1515

16-
override func setUp() {
17-
super.setUp()
16+
override func setUp() async throws {
1817
profile = MockProfile()
1918
LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: profile)
19+
try await super.setUp()
2020
}
2121

22-
override func tearDown() {
23-
super.tearDown()
22+
override func tearDown() async throws {
2423
profile = nil
24+
try await super.tearDown()
2525
}
2626

2727
// MARK: Mark Contextual Hint Configuration

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/ContextMenu/ContextMenuConfigurationTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import XCTest
88

99
@testable import Client
1010

11+
@MainActor
1112
final class ContextMenuConfigurationTests: XCTestCase {
1213
func tests_initialState_forMerinoItem_returnsExpectedState() {
1314
let merinoItem: HomepageItem = .merino(

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/ContextMenu/ContextMenuCoordinatorTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import XCTest
1212
final class ContextMenuCoordinatorTests: XCTestCase {
1313
private var mockRouter: MockRouter!
1414

15-
override func setUp() {
16-
super.setUp()
15+
override func setUp() async throws {
16+
try await super.setUp()
1717
DependencyHelperMock().bootstrapDependencies()
1818
mockRouter = MockRouter(navigationController: MockNavigationController())
1919
}
2020

21-
override func tearDown() {
21+
override func tearDown() async throws {
2222
mockRouter = nil
2323
DependencyHelperMock().reset()
24-
super.tearDown()
24+
try await super.tearDown()
2525
}
2626

2727
func test_initialState() {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/HomepageDiffableDataSourceTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ import MozillaAppServices
88

99
@testable import Client
1010

11+
@MainActor
1112
final class HomepageDiffableDataSourceTests: XCTestCase {
1213
var collectionView: UICollectionView?
1314
var diffableDataSource: HomepageDiffableDataSource?
1415

15-
override func setUpWithError() throws {
16-
try super.setUpWithError()
17-
16+
override func setUp() async throws {
17+
try await super.setUp()
1818
collectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
1919
let collectionView = try XCTUnwrap(collectionView)
2020
diffableDataSource = HomepageDiffableDataSource(
@@ -26,11 +26,11 @@ final class HomepageDiffableDataSourceTests: XCTestCase {
2626
LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: MockProfile())
2727
}
2828

29-
override func tearDown() {
29+
override func tearDown() async throws {
3030
diffableDataSource = nil
3131
collectionView = nil
3232
DependencyHelperMock().reset()
33-
super.tearDown()
33+
try await super.tearDown()
3434
}
3535

3636
// MARK: - applyInitialSnapshot

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/HomepageViewControllerTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ final class HomepageViewControllerTests: XCTestCase, StoreTestUtility {
1414
var mockStore: MockStoreForMiddleware<AppState>!
1515
var mockThrottler: MockThrottler!
1616

17-
override func setUp() {
18-
super.setUp()
17+
override func setUp() async throws {
18+
try await super.setUp()
1919
LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: MockProfile())
2020
DependencyHelperMock().bootstrapDependencies()
2121
setupStore()
2222
}
2323

24-
override func tearDown() {
24+
override func tearDown() async throws {
2525
mockThrottler = nil
2626
mockNotificationCenter = nil
2727
mockThemeManager = nil
2828
DependencyHelperMock().reset()
2929
resetStore()
30-
super.tearDown()
30+
try await super.tearDown()
3131
}
3232

3333
// MARK: - Initial State

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/PrivateHomepageViewControllerTests.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Common
77

88
@testable import Client
99

10+
@MainActor
1011
final class PrivateHomepageViewControllerTests: XCTestCase {
1112
let windowUUID: WindowUUID = .XCTestDefaultUUID
1213

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/Redux/BookmarksMiddlewareTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ final class BookmarksMiddlewareTests: XCTestCase, StoreTestUtility {
1111
var mockProfile: MockProfile!
1212
var mockStore: MockStoreForMiddleware<AppState>!
1313

14-
override func setUp() {
15-
super.setUp()
14+
override func setUp() async throws {
15+
try await super.setUp()
1616
mockProfile = MockProfile()
1717
DependencyHelperMock().bootstrapDependencies()
1818
setupStore()
1919
}
2020

21-
override func tearDown() {
21+
override func tearDown() async throws {
2222
mockProfile = nil
2323
DependencyHelperMock().reset()
2424
resetStore()
25-
super.tearDown()
25+
try await super.tearDown()
2626
}
2727

2828
func test_initializeAction_getBookmarksData() throws {

firefox-ios/firefox-ios-tests/Tests/ClientTests/Frontend/Homepage/Redux/HomepageMiddlewareTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@ final class HomepageMiddlewareTests: XCTestCase, StoreTestUtility {
1313
var mockStore: MockStoreForMiddleware<AppState>!
1414
var mockNotificationCenter: MockNotificationCenter!
1515

16-
override func setUp() {
17-
super.setUp()
16+
override func setUp() async throws {
17+
try await super.setUp()
1818
mockGleanWrapper = MockGleanWrapper()
1919
mockNotificationCenter = MockNotificationCenter()
2020
DependencyHelperMock().bootstrapDependencies()
2121
LegacyFeatureFlagsManager.shared.initializeDeveloperFeatures(with: MockProfile())
2222
setupStore()
2323
}
2424

25-
override func tearDown() {
25+
override func tearDown() async throws {
2626
DependencyHelperMock().reset()
2727
mockGleanWrapper = nil
2828
mockNotificationCenter = nil
2929
resetStore()
30-
super.tearDown()
30+
try await super.tearDown()
3131
}
3232

3333
func test_init_setsUpNotifications() {

0 commit comments

Comments
 (0)