Add MainActor isolation to tests

MFB-Technologies-Inc · Nov 13, 2024 · 75c9bc6 · 75c9bc6
1 parent 5bef707
commit 75c9bc6
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 19 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,6 +21,7 @@ jobs:
         run: swiftlint .
   ui-tests:
     strategy:
+      fail-fast: false
       matrix:
         include:
           - os: macos-12
@@ -43,4 +44,4 @@ jobs:
       - name: Boot simulator
         run: xcrun simctl boot '${{ matrix.sim }}'
       - name: Run tests
-        run: xcodebuild -project ./Example/Example.xcodeproj -scheme Example test -destination platform='iOS Simulator',name='${{ matrix.sim }}' -quiet -enableCodeCoverage YES -derivedDataPath "./output"
+        run: xcodebuild -project ./Example/Example.xcodeproj -scheme Example test -destination platform='iOS Simulator',name='${{ matrix.sim }}' -enableCodeCoverage YES -derivedDataPath "./output"
diff --git a/Example/ExampleUITests/ExampleUITestCase.swift b/Example/ExampleUITests/ExampleUITestCase.swift
@@ -15,15 +15,15 @@ import XCTest
 
 @MainActor
 class ExampleUITestCase: XCUITestCase {
-    var _sectionNavItem: (() throws -> XCUIElement)? {
+    var _sectionNavItem: (@MainActor () throws -> XCUIElement)? {
         nil
     }
 
     func sectionNavItem() throws -> XCUIElement {
         try XCTUnwrap(_sectionNavItem)()
     }
 
-    var _picker: (() throws -> XCUIElement)? {
+    var _picker: (@MainActor () throws -> XCUIElement)? {
         nil
     }
 

diff --git a/Example/ExampleUITests/MutliValueUITests.swift b/Example/ExampleUITests/MutliValueUITests.swift
@@ -15,11 +15,13 @@ import XCTest
 
 @MainActor
 final class MultiValueUITests: ExampleUITestCase {
-    override var _sectionNavItem: (() throws -> XCUIElement)? {
+    @MainActor
+    override var _sectionNavItem: (@MainActor () throws -> XCUIElement)? {
         multiValueNavItem
     }
 
-    override var _picker: (() throws -> XCUIElement)? {
+    @MainActor
+    override var _picker: (@MainActor () throws -> XCUIElement)? {
         multiValuePicker
     }
 
@@ -57,14 +59,14 @@ final class MultiValueUITests: ExampleUITestCase {
         XCTAssert(try !buttonOne().isSelected, "'1' is still not selected after being deselected and '0' is deselected")
     }
 
-    func testGridStyleDeselectAndSelectNew() throws {
+    func testGridStyleDeselectAndSelectNew() async throws {
         _ = try gridStyleToggle().waitForExistence(timeout: 1)
         try setGridStyle()
 
         try sharedTestSteps()
     }
 
-    func testListStyleDeselectAndSelectNew() throws {
+    func testListStyleDeselectAndSelectNew() async throws {
         _ = try gridStyleToggle().waitForExistence(timeout: 1)
         try setListStyle()
 

diff --git a/Example/ExampleUITests/SingleOptionalValueTests.swift b/Example/ExampleUITests/SingleOptionalValueTests.swift
@@ -15,11 +15,13 @@ import XCTest
 
 @MainActor
 final class SingleOptionalValueUITests: ExampleUITestCase {
-    override var _sectionNavItem: (() throws -> XCUIElement)? {
+    @MainActor
+    override var _sectionNavItem: (@MainActor () throws -> XCUIElement)? {
         singleOptionalValueNavItem
     }
 
-    override var _picker: (() throws -> XCUIElement)? {
+    @MainActor
+    override var _picker: (@MainActor () throws -> XCUIElement)? {
         singleOptionalValuePicker
     }
 
@@ -55,14 +57,14 @@ final class SingleOptionalValueUITests: ExampleUITestCase {
         XCTAssert(try buttonOne().isSelected, "'1' should be selected after it is tapped.")
     }
 
-    func testGridStyleDeselectAndSelectNew() throws {
+    func testGridStyleDeselectAndSelectNew() async throws {
         _ = try gridStyleToggle().waitForExistence(timeout: 1)
         try setGridStyle()
 
         try sharedTestSteps()
     }
 
-    func testListStyleDeselectAndSelectNew() throws {
+    func testListStyleDeselectAndSelectNew() async throws {
         _ = try gridStyleToggle().waitForExistence(timeout: 1)
         try setListStyle()
 

diff --git a/Example/ExampleUITests/SingleValueUITests.swift b/Example/ExampleUITests/SingleValueUITests.swift
@@ -15,11 +15,13 @@ import XCTest
 
 @MainActor
 final class SingleValueUITests: ExampleUITestCase {
-    override var _sectionNavItem: (() throws -> XCUIElement)? {
+    @MainActor
+    override var _sectionNavItem: (@MainActor () throws -> XCUIElement)? {
         singleValueNavItem
     }
 
-    override var _picker: (() throws -> XCUIElement)? {
+    @MainActor
+    override var _picker: (@MainActor () throws -> XCUIElement)? {
         singleValuePicker
     }
 
@@ -68,7 +70,7 @@ final class SingleValueUITests: ExampleUITestCase {
         XCTAssert(try !buttonZero().isSelected, "'0' should no longer be selected after tapping a new item.")
     }
 
-    func testGridStyleDeselectAndSelectNew() throws {
+    func testGridStyleDeselectAndSelectNew() async throws {
         _ = try gridStyleToggle().waitForExistence(timeout: 1)
         #if os(tvOS)
             guard try findVertically(gridStyleToggle(), method: .downOnly) else {
@@ -81,7 +83,7 @@ final class SingleValueUITests: ExampleUITestCase {
         try sharedTestSteps()
     }
 
-    func testListStyleDeselectAndSelectNew() throws {
+    func testListStyleDeselectAndSelectNew() async throws {
         _ = try gridStyleToggle().waitForExistence(timeout: 1)
         #if os(tvOS)
             guard try findVertically(gridStyleToggle(), method: .downOnly) else {

diff --git a/Example/ExampleUITests/XCUIElementQuery+ExactlyOneMatching.swift b/Example/ExampleUITests/XCUIElementQuery+ExactlyOneMatching.swift
@@ -9,6 +9,7 @@
 import XCTest
 
 extension XCUIElementQuery {
+    @MainActor
     public func exactlyOneMatch() throws -> XCUIElement {
         XCTAssertEqual(count, 1, "Requiring only one element match the query resulting in `self`")
         return firstMatch

diff --git a/Example/ExampleUITests/XCUITestCase.swift b/Example/ExampleUITests/XCUITestCase.swift
@@ -20,6 +20,7 @@ class XCUITestCase: XCTestCase {
         try app().descendants(matching: .any)
     }
 
+    @MainActor
     func elementPredicate(labeled label: String) -> NSPredicate {
         NSComparisonPredicate(
             leftExpression: NSExpression(forKeyPath: \XCUIElement.label),
@@ -31,13 +32,18 @@ class XCUITestCase: XCTestCase {
     }
 
     func elementCompoundOrPredicate(labeled labels: Set<String>) -> NSPredicate {
-        NSCompoundPredicate(orPredicateWithSubpredicates: labels.map(elementPredicate(labeled:)))
+        let subpredicates = labels.map { label in
+            elementPredicate(labeled: label)
+        }
+        return NSCompoundPredicate(orPredicateWithSubpredicates: subpredicates)
     }
 
     override func setUp() async throws {
-        _app = XCUIApplication()
-        continueAfterFailure = false
-        try? app().launch()
+        Task { @MainActor in
+            self._app = XCUIApplication()
+            self.continueAfterFailure = false
+            try? self.app().launch()
+        }
     }
 }
 
@@ -53,6 +59,7 @@ class XCUITestCase: XCTestCase {
             )
         }
 
+        @MainActor
         func currentFocus() throws -> XCUIElement {
             try allElements().descendants(matching: .any).element(matching: focusPredicate)
         }