Merge pull request #12 from MFB-Technologies-Inc/feature/fix-test-war…

…nings Feature/fix test warnings
MFB-Technologies-Inc · Nov 13, 2024 · 1b42855 · 1b42855
2 parents fcd8b27 + a2d1693
commit 1b42855
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: macos-13
     environment: default
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Format lint
         run: swiftformat --lint .
       - name: Lint
@@ -37,7 +37,7 @@ jobs:
             sim: iPhone 15
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Select Xcode ${{ matrix.xcode }}
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
       - name: Boot simulator

diff --git a/Example/ExampleUITests/ExampleUITestCase.swift b/Example/ExampleUITests/ExampleUITestCase.swift
@@ -13,16 +13,17 @@ import XCTest
     import Example_macOS
 #endif
 
+@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
     }
 
@@ -36,9 +37,11 @@ class ExampleUITestCase: XCUITestCase {
         #if os(iOS)
             // iPad has a bug where view is blank when starting in portrait
             // Let's rotate it landscape and back to work around that bug.
-            XCUIDevice.shared.orientation = .portrait
-            XCUIDevice.shared.orientation = .landscapeRight
-            XCUIDevice.shared.orientation = .portrait
+            Task { @MainActor in
+                XCUIDevice.shared.orientation = .portrait
+                XCUIDevice.shared.orientation = .landscapeRight
+                XCUIDevice.shared.orientation = .portrait
+            }
         #endif
     }
 

diff --git a/Example/ExampleUITests/MutliValueUITests.swift b/Example/ExampleUITests/MutliValueUITests.swift
@@ -13,12 +13,15 @@ import XCTest
     import Example_macOS
 #endif
 
+@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
     }
 
@@ -56,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
@@ -13,12 +13,15 @@ import XCTest
     import Example_macOS
 #endif
 
+@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
     }
 
@@ -54,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
@@ -13,12 +13,15 @@ import XCTest
     import Example_macOS
 #endif
 
+@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
     }
 
@@ -67,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 {
@@ -80,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
@@ -8,6 +8,7 @@
 
 import XCTest
 
+@MainActor
 class XCUITestCase: XCTestCase {
     private var _app: XCUIApplication?
 
@@ -30,14 +31,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 setUpWithError() throws {
-        _app = XCUIApplication()
-        continueAfterFailure = false
-
-        try app().launch()
+    override func setUp() async throws {
+        Task { @MainActor in
+            self._app = XCUIApplication()
+            self.continueAfterFailure = false
+            try? self.app().launch()
+        }
     }
 }
 
@@ -53,6 +58,7 @@ class XCUITestCase: XCTestCase {
             )
         }
 
+        @MainActor
         func currentFocus() throws -> XCUIElement {
             try allElements().descendants(matching: .any).element(matching: focusPredicate)
         }

diff --git a/Sources/PickBetter/PlainInlineBetterPickerStyle.swift b/Sources/PickBetter/PlainInlineBetterPickerStyle.swift
@@ -40,7 +40,7 @@ public struct PlainInlineBetterPickerStyle: BetterPickerStyle {
         let id: String
     }
 
-    private var items: [PreviewItem] = ["A", "B", "C"].map { PreviewItem(id: $0) }
+    private let items: [PreviewItem] = ["A", "B", "C"].map { PreviewItem(id: $0) }
 
     private func itemContent(_ item: PreviewItem) -> some View {
         Text(item.id)