Skip to content

Commit a675437

Browse files
jessesquiresjessesquires
committed
clean up tests after #158 
1 parent 3926d69 commit a675437

21 files changed

+38
-111
lines changed

‎Example/Tests/UITests/GridUITests.swift‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313

1414
import XCTest
1515

16-
final class GridUITests: XCTestCase, @unchecked Sendable {
17-
@MainActor var app: XCUIApplication { XCUIApplication() }
16+
@MainActor
17+
final class GridUITests: XCTestCase {
18+
var app: XCUIApplication { XCUIApplication() }
1819

1920
override func setUp() async throws {
2021
try await super.setUp()
2122
self.continueAfterFailure = false
22-
await self.app.launch()
23-
await self.app.activate()
23+
self.app.launch()
24+
self.app.activate()
2425
}
2526

26-
@MainActor
2727
func test_grid_shuffle() {
2828
let shuffleButton = self.app.buttons["shuffle"].firstMatch
2929
XCTAssertTrue(shuffleButton.waitForExistence(timeout: 3))
@@ -33,7 +33,6 @@ final class GridUITests: XCTestCase, @unchecked Sendable {
3333
}
3434
}
3535

36-
@MainActor
3736
func test_grid_remove_reset() {
3837
let shuffleButton = self.app.buttons["shuffle"].firstMatch
3938
XCTAssertTrue(shuffleButton.waitForExistence(timeout: 3))

‎Example/Tests/UITests/ListUITests.swift‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313

1414
import XCTest
1515

16-
final class ListUITests: XCTestCase, @unchecked Sendable {
17-
@MainActor var app: XCUIApplication { XCUIApplication() }
16+
@MainActor
17+
final class ListUITests: XCTestCase {
18+
var app: XCUIApplication { XCUIApplication() }
1819

1920
override func setUp() async throws {
2021
try await super.setUp()
2122
self.continueAfterFailure = false
22-
await self.app.launch()
23-
await self.app.activate()
23+
self.app.launch()
24+
self.app.activate()
2425
}
2526

26-
@MainActor
2727
func test_list_shuffle() {
2828
let listTab = self.app.images["list.dash"].firstMatch
2929
listTab.tap()
@@ -39,7 +39,6 @@ final class ListUITests: XCTestCase, @unchecked Sendable {
3939
}
4040
}
4141

42-
@MainActor
4342
func test_list_remove_reset() {
4443
let listTab = self.app.images["list.dash"].firstMatch
4544
listTab.tap()

‎Example/Tests/UITests/StaticViewUITests.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313

1414
import XCTest
1515

16-
final class StaticViewUITests: XCTestCase, @unchecked Sendable {
17-
@MainActor var app: XCUIApplication { XCUIApplication() }
16+
@MainActor
17+
final class StaticViewUITests: XCTestCase {
18+
var app: XCUIApplication { XCUIApplication() }
1819

1920
override func setUp() async throws {
2021
try await super.setUp()
2122
self.continueAfterFailure = false
22-
await self.app.launch()
23-
await self.app.activate()
23+
self.app.launch()
24+
self.app.activate()
2425
}
2526

26-
@MainActor
2727
func test_view_other_tabs() {
2828
self.app.tabBars["Tab Bar"].buttons["Simple Static"].tap()
2929
self.app.collectionViews["Simple Static"].swipeUp()

‎Sources/DiffableDataSource.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import Foundation
1515
import UIKit
1616

17+
// @mattiem please don't be mad at me
1718
extension AnyHashable: @retroactive @unchecked Sendable { }
1819

1920
@MainActor

‎Tests/TestCellEventCoordinator.swift‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ import Foundation
1515
@testable import ReactiveCollectionsKit
1616
import XCTest
1717

18-
final class TestCellEventCoordinator: UnitTestCase, @unchecked Sendable {
18+
final class TestCellEventCoordinator: UnitTestCase {
1919

20-
@MainActor
2120
func test_underlyingViewController() {
2221
class CustomVC: UIViewController, CellEventCoordinator { }
2322
let controller = CustomVC()
@@ -27,7 +26,6 @@ final class TestCellEventCoordinator: UnitTestCase, @unchecked Sendable {
2726
XCTAssertNil(coordinator.underlyingViewController)
2827
}
2928

30-
@MainActor
3129
func test_didSelectCell_getsCalled() {
3230
let cell = FakeCellViewModel()
3331
let section = SectionViewModel(id: "id", cells: [cell])
@@ -53,7 +51,6 @@ final class TestCellEventCoordinator: UnitTestCase, @unchecked Sendable {
5351
self.keepDriverAlive(driver)
5452
}
5553

56-
@MainActor
5754
func test_didDeselectCell_getsCalled() {
5855
let cell = FakeCellViewModel()
5956
let section = SectionViewModel(id: "id", cells: [cell])

‎Tests/TestCellViewModel.swift‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ import Foundation
1515
@testable import ReactiveCollectionsKit
1616
import XCTest
1717

18+
@MainActor
1819
final class TestCellViewModel: XCTestCase {
1920

20-
@MainActor
2121
func test_CellViewModel_protocol_default_values() {
2222
let viewModel = FakeCellViewModel()
2323
XCTAssertTrue(viewModel.shouldSelect)
@@ -31,7 +31,6 @@ final class TestCellViewModel: XCTestCase {
3131
self.waitForExpectations()
3232
}
3333

34-
@MainActor
3534
func test_CellViewModel_protocol_extension() {
3635
let viewModel = FakeCellViewModel()
3736
XCTAssert(viewModel.cellClass == FakeCollectionCell.self)
@@ -45,7 +44,6 @@ final class TestCellViewModel: XCTestCase {
4544
}
4645

4746
// swiftlint:disable xct_specific_matcher
48-
@MainActor
4947
func test_eraseToAnyViewModel() {
5048
var viewModel = FakeTextCellViewModel()
5149
viewModel.expectationConfigureCell = self.expectation(field: .configure, id: viewModel.id)
@@ -150,7 +148,6 @@ final class TestCellViewModel: XCTestCase {
150148
}
151149
// swiftlint:enable xct_specific_matcher
152150

153-
@MainActor
154151
func test_debugDescription() {
155152
let cell = FakeTextCellViewModel().eraseToAnyViewModel()
156153
print(cell.debugDescription)

‎Tests/TestCollectionViewConstants.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,13 @@ import Foundation
1616
import UIKit
1717
import XCTest
1818

19+
@MainActor
1920
final class TestCollectionViewConstants: XCTestCase {
2021

21-
@MainActor
2222
func test_header() {
2323
XCTAssertEqual(CollectionViewConstants.headerKind, UICollectionView.elementKindSectionHeader)
2424
}
2525

26-
@MainActor
2726
func test_footer() {
2827
XCTAssertEqual(CollectionViewConstants.footerKind, UICollectionView.elementKindSectionFooter)
2928
}

‎Tests/TestCollectionViewDriver.swift‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ import Foundation
1515
@testable import ReactiveCollectionsKit
1616
import XCTest
1717

18-
final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
18+
final class TestCollectionViewDriver: UnitTestCase {
1919

20-
@MainActor
2120
func test_numberOfSections_numberOfItems() {
2221
let sections = Int.random(in: 5...10)
2322
let cells = Int.random(in: 5...15)
@@ -37,7 +36,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
3736
self.keepDriverAlive(driver)
3837
}
3938

40-
@MainActor
4139
func test_numberOfSections_isEmpty() {
4240
let driver = CollectionViewDriver(
4341
view: self.collectionView,
@@ -49,7 +47,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
4947
self.keepDriverAlive(driver)
5048
}
5149

52-
@MainActor
5350
func test_delegate_didSelect_didDeselect_calls_cellViewModel() {
5451
let sections = 2
5552
let cells = 5
@@ -73,7 +70,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
7370
self.keepDriverAlive(driver)
7471
}
7572

76-
@MainActor
7773
func test_delegate_shouldSelect_shouldDeselect_calls_cellViewModel() {
7874
let cell1 = FakeTextCellViewModel(shouldSelect: true, shouldDeselect: true)
7975
let cell2 = FakeTextCellViewModel(shouldSelect: false, shouldDeselect: false)
@@ -101,7 +97,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
10197
self.keepDriverAlive(driver)
10298
}
10399

104-
@MainActor
105100
func test_delegate_shouldHighlight_calls_cellViewModel() {
106101
let cell1 = FakeTextCellViewModel(shouldHighlight: true)
107102
let cell2 = FakeTextCellViewModel(shouldHighlight: false)
@@ -123,7 +118,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
123118
self.keepDriverAlive(driver)
124119
}
125120

126-
@MainActor
127121
func test_delegate_contextMenuConfigurationForItemAt_calls_cellViewModel() {
128122
let contextMenu = UIContextMenuConfiguration()
129123
let cell1 = FakeTextCellViewModel(contextMenuConfiguration: contextMenu)
@@ -154,7 +148,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
154148
self.keepDriverAlive(driver)
155149
}
156150

157-
@MainActor
158151
func test_delegate_willDisplay_didEndDisplaying_calls_cellViewModel() {
159152
let cell = FakeCollectionCell()
160153
let sections = 2
@@ -183,7 +176,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
183176
self.keepDriverAlive(driver)
184177
}
185178

186-
@MainActor
187179
func test_delegate_willDisplay_didEndDisplaying_calls_supplementaryViewModel() {
188180
let cell = FakeCollectionCell()
189181
let view = FakeSupplementaryView()
@@ -226,7 +218,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
226218
self.keepDriverAlive(driver)
227219
}
228220

229-
@MainActor
230221
func test_delegate_didHighlight_didUnhighlight_calls_cellViewModel() {
231222
let sections = 2
232223
let cells = 5
@@ -254,7 +245,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
254245
self.keepDriverAlive(driver)
255246
}
256247

257-
@MainActor
258248
func test_dataSource_cellForItemAt_calls_cellViewModel_configure() async {
259249
let viewController = FakeCollectionViewController()
260250
let driver = CollectionViewDriver(view: viewController.collectionView)
@@ -288,7 +278,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
288278
self.keepDriverAlive(driver)
289279
}
290280

291-
@MainActor
292281
func test_dataSource_cellForItemAt_calls_cellViewModel_configure_usingNibs() {
293282
let sections = 2
294283
let cells = 5
@@ -322,7 +311,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
322311
self.keepDriverAlive(driver)
323312
}
324313

325-
@MainActor
326314
func test_dataSource_supplementaryViewAt_calls_supplementaryViewModel_configure() async {
327315
let viewController = FakeCollectionViewController()
328316
viewController.collectionView.setCollectionViewLayout(
@@ -369,7 +357,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
369357
self.keepDriverAlive(driver)
370358
}
371359

372-
@MainActor
373360
func test_dataSource_supplementaryViewAt_calls_supplementaryViewModel_configure_usingNibs() {
374361
let count = 3
375362
let cells = (1...count).map { _ in FakeNumberCellViewModel() }
@@ -416,7 +403,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
416403
self.keepDriverAlive(driver)
417404
}
418405

419-
@MainActor
420406
func test_update_callsCompletion_withDefaultOptions() {
421407
let driver = CollectionViewDriver(view: self.collectionView)
422408

@@ -430,7 +416,6 @@ final class TestCollectionViewDriver: UnitTestCase, @unchecked Sendable {
430416
self.waitForExpectations()
431417
}
432418

433-
@MainActor
434419
func test_update_callsCompletion_withReloadOnReplace() {
435420
let driver = CollectionViewDriver(
436421
view: self.collectionView,

‎Tests/TestCollectionViewDriverReconfigure.swift‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ import Foundation
1515
@testable import ReactiveCollectionsKit
1616
import XCTest
1717

18-
final class TestCollectionViewDriverReconfigure: UnitTestCase, @unchecked Sendable {
18+
final class TestCollectionViewDriverReconfigure: UnitTestCase {
1919

20-
@MainActor
2120
func test_reconfigure_item() async {
2221
var uniqueCell = MyStaticCellViewModel(name: "initial")
2322
uniqueCell.expectation = self.expectation(field: .configure, id: uniqueCell.name)
@@ -49,7 +48,6 @@ final class TestCollectionViewDriverReconfigure: UnitTestCase, @unchecked Sendab
4948
self.keepDriverAlive(driver)
5049
}
5150

52-
@MainActor
5351
func test_reconfigure_header_footer() {
5452
let viewController = FakeCollectionViewController()
5553
viewController.collectionView.setCollectionViewLayout(

0 commit comments

Comments
 (0)