[quick_actions_ios] Migrate XCTest to Swift Testing (#10767)

Part of https://github.com/flutter/flutter/issues/180787 ``` ◇ Test run started. ↳ Testing Library Version: 102 (arm64-apple-ios13.0-simulator) ◇ Suite QuickActionsPluginTests started. ◇ Test applicationDidBecomeActiveLaunchWithShortcut() started. ◇ Test handleMethodCallClearShortcutItems() started. ◇ Test applicationDidBecomeActiveLaunchWithoutShortcut() started. ◇ Test applicationPerformActionForShortcutItem() started. ◇ Test applicationDidBecomeActiveLaunchWithShortcutBecomeActiveTwice() started. ◇ Test applicationDidFinishLaunchingWithOptionsLaunchWithoutShortcut() started. ◇ Test handleMethodCallSetShortcutItems() started. ◇ Test applicationDidFinishLaunchingWithOptionsLaunchWithShortcut() started. ✔ Test applicationDidBecomeActiveLaunchWithShortcutBecomeActiveTwice() passed after 0.003 seconds. ✔ Test applicationDidBecomeActiveLaunchWithShortcut() passed after 0.003 seconds. ✔ Test applicationPerformActionForShortcutItem() passed after 0.003 seconds. ✔ Test applicationDidFinishLaunchingWithOptionsLaunchWithShortcut() passed after 0.003 seconds. ✔ Test applicationDidFinishLaunchingWithOptionsLaunchWithoutShortcut() passed after 0.003 seconds. ✔ Test handleMethodCallSetShortcutItems() passed after 0.003 seconds. ✔ Test handleMethodCallClearShortcutItems() passed after 0.003 seconds. ✔ Test applicationDidBecomeActiveLaunchWithoutShortcut() passed after 0.003 seconds. ✔ Suite QuickActionsPluginTests passed after 0.025 seconds. ✔ Test run with 8 tests passed after 0.026 seconds. ``` https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8692855180982743569/+/u/Run_package_tests/native_test/stdout Adding CHANGELOG override per https://github.com/flutter/packages/pull/10761#discussion_r2686738994 ## Pre-Review Checklist **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
2026-03-13 10:40:37 +08:00 · 2026-01-28 15:19:42 -08:00
parent dd5ea0d1b9
commit cd4fd61fc5
2 changed files with 66 additions and 62 deletions
--- a/packages/quick_actions/quick_actions_ios/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/packages/quick_actions/quick_actions_ios/example/ios/Runner.xcodeproj/project.pbxproj
@@ -507,7 +507,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner";
 			};
 			name = Debug;
@@ -526,7 +526,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = dev.flutter.plugins.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
+				SWIFT_VERSION = 6.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/Runner";
 			};
 			name = Release;
--- a/packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/QuickActionsPluginTests.swift
+++ b/packages/quick_actions/quick_actions_ios/example/ios/RunnerTests/QuickActionsPluginTests.swift
@@ -3,7 +3,7 @@
 // found in the LICENSE file.

 import Flutter
-import XCTest
+import Testing

@testable import quick_actions_ios

@@ -19,9 +19,10 @@ class MockFlutterApi: IOSQuickActionsFlutterApiProtocol {
  }
 }

-class QuickActionsPluginTests: XCTestCase {
+@MainActor
+struct QuickActionsPluginTests {

-  func testHandleMethodCall_setShortcutItems() {
+  @Test func handleMethodCallSetShortcutItems() {
    let rawItem = ShortcutItemMessage(
      type: "SearchTheThing",
      localizedTitle: "Search the thing",
@@ -43,10 +44,10 @@ class QuickActionsPluginTests: XCTestCase {
      shortcutItemProvider: mockShortcutItemProvider)

    plugin.setShortcutItems(itemsList: [rawItem])
-    XCTAssertEqual(mockShortcutItemProvider.shortcutItems, [item], "Must set shortcut items.")
+    #expect(mockShortcutItemProvider.shortcutItems == [item])
  }

-  func testHandleMethodCall_clearShortcutItems() {
+  @Test func handleMethodCallClearShortcutItems() {
    let item = UIApplicationShortcutItem(
      type: "SearchTheThing",
      localizedTitle: "Search the thing",
@@ -65,11 +66,11 @@ class QuickActionsPluginTests: XCTestCase {

    plugin.clearShortcutItems()

-    XCTAssertEqual(mockShortcutItemProvider.shortcutItems, [], "Must clear shortcut items.")
+    #expect(mockShortcutItemProvider.shortcutItems == [])

  }

-  func testApplicationPerformActionForShortcutItem() {
+  @Test func applicationPerformActionForShortcutItem() async {
    let flutterApi: MockFlutterApi = MockFlutterApi()
    let mockShortcutItemProvider = MockShortcutItemProvider()

@@ -84,24 +85,24 @@ class QuickActionsPluginTests: XCTestCase {
      icon: UIApplicationShortcutIcon(templateImageName: "search_the_thing.png"),
      userInfo: nil)

-    let invokeMethodExpectation = expectation(description: "invokeMethod must be called.")
-    flutterApi.launchActionCallback = { aString in
-      XCTAssertEqual(aString, item.type)
-      invokeMethodExpectation.fulfill()
-    }
+    await confirmation("invokeMethod must be called") { confirmed in
+      flutterApi.launchActionCallback = { aString in
+        #expect(aString == item.type)
+        confirmed()
+      }

-    let actionResult = plugin.application(
-      UIApplication.shared,
-      performActionFor: item
-    ) { success in
-      // noop
-    }
+      let actionResult = plugin.application(
+        UIApplication.shared,
+        performActionFor: item
+      ) { success in
+        // noop
+      }

-    XCTAssert(actionResult, "performActionForShortcutItem must return true.")
-    waitForExpectations(timeout: 1)
+      #expect(actionResult, "performActionForShortcutItem must return true.")
+    }
  }

-  func testApplicationDidFinishLaunchingWithOptions_launchWithShortcut() {
+  @Test func applicationDidFinishLaunchingWithOptionsLaunchWithShortcut() {
    let flutterApi: MockFlutterApi = MockFlutterApi()
    let mockShortcutItemProvider = MockShortcutItemProvider()

@@ -119,11 +120,11 @@ class QuickActionsPluginTests: XCTestCase {
    let launchResult = plugin.application(
      UIApplication.shared,
      didFinishLaunchingWithOptions: [UIApplication.LaunchOptionsKey.shortcutItem: item])
-    XCTAssertFalse(
-      launchResult, "didFinishLaunchingWithOptions must return false if launched from shortcut.")
+    #expect(
+      !launchResult, "didFinishLaunchingWithOptions must return false if launched from shortcut.")
  }

-  func testApplicationDidFinishLaunchingWithOptions_launchWithoutShortcut() {
+  @Test func applicationDidFinishLaunchingWithOptionsLaunchWithoutShortcut() {
    let flutterApi: MockFlutterApi = MockFlutterApi()
    let mockShortcutItemProvider = MockShortcutItemProvider()

@@ -132,11 +133,11 @@ class QuickActionsPluginTests: XCTestCase {
      shortcutItemProvider: mockShortcutItemProvider)

    let launchResult = plugin.application(UIApplication.shared, didFinishLaunchingWithOptions: [:])
-    XCTAssert(
+    #expect(
      launchResult, "didFinishLaunchingWithOptions must return true if not launched from shortcut.")
  }

-  func testApplicationDidBecomeActive_launchWithoutShortcut() {
+  @Test func applicationDidBecomeActiveLaunchWithoutShortcut() {
    let flutterApi: MockFlutterApi = MockFlutterApi()
    let mockShortcutItemProvider = MockShortcutItemProvider()

@@ -145,13 +146,13 @@ class QuickActionsPluginTests: XCTestCase {
      shortcutItemProvider: mockShortcutItemProvider)

    let launchResult = plugin.application(UIApplication.shared, didFinishLaunchingWithOptions: [:])
-    XCTAssert(
+    #expect(
      launchResult, "didFinishLaunchingWithOptions must return true if not launched from shortcut.")

    plugin.applicationDidBecomeActive(UIApplication.shared)
  }

-  func testApplicationDidBecomeActive_launchWithShortcut() {
+  @Test func applicationDidBecomeActiveLaunchWithShortcut() async {
    let item = UIApplicationShortcutItem(
      type: "SearchTheThing",
      localizedTitle: "Search the thing",
@@ -166,24 +167,24 @@ class QuickActionsPluginTests: XCTestCase {
      flutterApi: flutterApi,
      shortcutItemProvider: mockShortcutItemProvider)

-    let invokeMethodExpectation = expectation(description: "invokeMethod must be called.")
-    flutterApi.launchActionCallback = { aString in
-      XCTAssertEqual(aString, item.type)
-      invokeMethodExpectation.fulfill()
+    await confirmation("invokeMethod must be called") { confirmed in
+      flutterApi.launchActionCallback = { aString in
+        #expect(aString == item.type)
+        confirmed()
+      }
+
+      let launchResult = plugin.application(
+        UIApplication.shared,
+        didFinishLaunchingWithOptions: [UIApplication.LaunchOptionsKey.shortcutItem: item])
+
+      #expect(
+        !launchResult, "didFinishLaunchingWithOptions must return false if launched from shortcut.")
+
+      plugin.applicationDidBecomeActive(UIApplication.shared)
    }
-
-    let launchResult = plugin.application(
-      UIApplication.shared,
-      didFinishLaunchingWithOptions: [UIApplication.LaunchOptionsKey.shortcutItem: item])
-
-    XCTAssertFalse(
-      launchResult, "didFinishLaunchingWithOptions must return false if launched from shortcut.")
-
-    plugin.applicationDidBecomeActive(UIApplication.shared)
-    waitForExpectations(timeout: 1)
  }

-  func testApplicationDidBecomeActive_launchWithShortcut_becomeActiveTwice() {
+  @Test func applicationDidBecomeActiveLaunchWithShortcutBecomeActiveTwice() async {
    let item = UIApplicationShortcutItem(
      type: "SearchTheThing",
      localizedTitle: "Search the thing",
@@ -198,25 +199,28 @@ class QuickActionsPluginTests: XCTestCase {
      flutterApi: flutterApi,
      shortcutItemProvider: mockShortcutItemProvider)

-    let invokeMethodExpectation = expectation(description: "invokeMethod must be called.")
+    await confirmation("shortcut should be handled when application becomes active") { confirmed in
+      flutterApi.launchActionCallback = { aString in
+        #expect(aString == item.type)
+        confirmed()
+      }

-    var invokeMethodCount = 0
-    flutterApi.launchActionCallback = { aString in
-      XCTAssertEqual(aString, item.type)
-      invokeMethodCount += 1
-      invokeMethodExpectation.fulfill()
+      let launchResult = plugin.application(
+        UIApplication.shared,
+        didFinishLaunchingWithOptions: [UIApplication.LaunchOptionsKey.shortcutItem: item])
+
+      #expect(
+        !launchResult, "didFinishLaunchingWithOptions must return false if launched from shortcut.")
+
+      plugin.applicationDidBecomeActive(UIApplication.shared)
    }
+    await confirmation("shortcut should only be handled once per launch", expectedCount: 0) {
+      confirmed in
+      flutterApi.launchActionCallback = { _ in
+        confirmed()
+      }

-    let launchResult = plugin.application(
-      UIApplication.shared,
-      didFinishLaunchingWithOptions: [UIApplication.LaunchOptionsKey.shortcutItem: item])
-
-    XCTAssertFalse(
-      launchResult, "didFinishLaunchingWithOptions must return false if launched from shortcut.")
-
-    plugin.applicationDidBecomeActive(UIApplication.shared)
-    waitForExpectations(timeout: 1)
-
-    XCTAssertEqual(invokeMethodCount, 1, "shortcut should only be handled once per launch.")
+      plugin.applicationDidBecomeActive(UIApplication.shared)
+    }
  }
 }