Make more Selector properties work on iOS

dev/e2e_app/integration_test/common.dart

@@ -12,6 +12,7 @@ final _nativeAutomatorConfig = NativeAutomatorConfig(
 
 Future<void> createApp(PatrolIntegrationTester $) async {
   await app_main.main();
+  await $.pumpAndSettle();
 }
 
 void patrol(

dev/e2e_app/ios/RunnerTests/RunnerTests.swift

@@ -1,9 +1,114 @@
 import XCTest
 import patrol
 
+typealias Selector = patrol.Selector
+
 final class RunnerTests: XCTestCase {
   func testSample() {
     // This test is here to serve as a sample for more tests in the future
     XCTAssertEqual(2 + 2, 4)
   }
+
+  func testSelectorToNSPredicate_text() {
+    var selector = createEmptySelector()
+    selector.text = "Log in"
+
+    let predicate = selector.toNSPredicate()
+
+    NSLog(predicate.predicateFormat)
+    XCTAssertEqual(
+      predicate.predicateFormat,
+      """
+      label == "Log in" OR \
+      title == "Log in"
+      """)
+  }
+
+  func testSelectorToNSPredicate_textStartsWith() {
+    var selector = createEmptySelector()
+    selector.textStartsWith = "Log in"
+
+    let predicate = selector.toNSPredicate()
+
+    NSLog(predicate.predicateFormat)
+    XCTAssertEqual(
+      predicate.predicateFormat,
+      """
+      label BEGINSWITH "Log in" OR \
+      title BEGINSWITH "Log in"
+      """)
+  }
+
+  func testSelectorToNSPredicate_textContains() {
+    var selector = createEmptySelector()
+    selector.textContains = "Log in"
+
+    let predicate = selector.toNSPredicate()
+
+    NSLog(predicate.predicateFormat)
+    XCTAssertEqual(
+      predicate.predicateFormat,
+      """
+      label CONTAINS "Log in" OR \
+      title CONTAINS "Log in"
+      """)
+  }
+
+  func testSelectorToNSPredicate_resourceId() {
+    var selector = createEmptySelector()
+    selector.resourceId = "log_in"
+
+    let predicate = selector.toNSPredicate()
+
+    NSLog(predicate.predicateFormat)
+    XCTAssertEqual(
+      predicate.predicateFormat,
+      """
+      identifier == "log_in"
+      """)
+  }
+
+  func testSelectorToNSPredicate_complex_1() {
+    var selector = createEmptySelector()
+    selector.textContains = "text_contains"
+    selector.resourceId = "resource_id"
+
+    let predicate = selector.toNSPredicate()
+
+    NSLog(predicate.predicateFormat)
+    XCTAssertEqual(
+      predicate.predicateFormat,
+      """
+      (label CONTAINS "text_contains" OR \
+      title CONTAINS "text_contains") AND \
+      identifier == "resource_id"
+      """)
+  }
+
+  func testSelectorToNSPredicate_complex_2() {
+    var selector = createEmptySelector()
+    selector.textContains = "text_contains"
+    selector.resourceId = "resource_id"
+
+    let predicate = selector.toNSPredicate()
+
+    NSLog(predicate.predicateFormat)
+    XCTAssertEqual(
+      predicate.predicateFormat,
+      """
+      (label CONTAINS "text_contains" OR \
+      title CONTAINS "text_contains") AND \
+      identifier == "resource_id"
+      """)
+  }
+}
+
+private func createEmptySelector(text: String? = nil) -> patrol.Selector {
+  // Temporary fix. We will remove the Selector class later
+  let jsonString = "{}"
+
+  let jsonData = jsonString.data(using: .utf8)!
+  let decoder = JSONDecoder()
+
+  return try! decoder.decode(patrol.Selector.self, from: jsonData)
 }

dev/e2e_app/lib/main.dart

@@ -86,6 +86,7 @@ class _ExampleHomePageState extends State<ExampleHomePage> {
           ),
           Text(
             '$_counter',
+            semanticsLabel: 'Counter: $_counter',
             key: const Key('counterText'),
             style: Theme.of(context).textTheme.headlineMedium,
           ),
@@ -110,7 +111,11 @@ class _ExampleHomePageState extends State<ExampleHomePage> {
                   key: const Key('tile1'),
                   title: const Text('Add'),
                   trailing: IconButton(
-                    icon: const Icon(Icons.add, key: Key('icon1')),
+                    icon: const Icon(
+                      Icons.add,
+                      key: Key('icon1'),
+                      semanticLabel: 'Increment counter',
+                    ),
                     onPressed: _incrementCounter,
                   ),
                 ),

dev/e2e_app/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -4,14 +4,14 @@
 
 import FlutterMacOS
 import Foundation
+
 import flutter_local_notifications
 import flutter_timezone
 import geolocator_apple
 import patrol
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  FlutterLocalNotificationsPlugin.register(
-    with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
+  FlutterLocalNotificationsPlugin.register(with: registry.registrar(forPlugin: "FlutterLocalNotificationsPlugin"))
   FlutterTimezonePlugin.register(with: registry.registrar(forPlugin: "FlutterTimezonePlugin"))
   GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
   PatrolPlugin.register(with: registry.registrar(forPlugin: "PatrolPlugin"))

packages/patrol/darwin/Classes/AutomatorServer/Automator/Automator.swift

@@ -1,3 +1,93 @@
+extension Selector {
+  public func toTextFieldNSPredicate() -> NSPredicate {
+    var format = ""
+    var begun = false
+    var values = [String]()
+
+    if text != nil {
+      begun = true
+      format += "(label == %@ OR title == %@ OR value == %@ OR placeholderValue == %@)"
+      values.append(text!)
+      values.append(text!)
+      values.append(text!)
+      values.append(text!)
+    }
+
+    if textStartsWith != nil {
+      if begun { format += " AND " }
+      begun = true
+      format +=
+        "(label BEGINSWITH %@ OR title BEGINSWITH %@ OR value BEGINSWITH %@ OR placeholderValue BEGINSWITH %@)"
+      values.append(textStartsWith!)
+      values.append(textStartsWith!)
+      values.append(textStartsWith!)
+      values.append(textStartsWith!)
+    }
+
+    if textContains != nil {
+      if begun { format += " AND " }
+      begun = true
+      format +=
+        "(label CONTAINS %@ OR title CONTAINS %@ OR value CONTAINS %@ OR placeholderValue CONTAINS %@)"
+      values.append(textContains!)
+      values.append(textContains!)
+      values.append(textContains!)
+      values.append(textContains!)
+    }
+
+    if resourceId != nil {
+      if begun { format += " AND " }
+      begun = true
+      format += "(identifier == %@)"
+      values.append(resourceId!)
+    }
+
+    let predicate = NSPredicate(format: format, argumentArray: values)
+
+    return predicate
+  }
+
+  public func toNSPredicate() -> NSPredicate {
+    var format = ""
+    var begun = false
+    var values = [String]()
+
+    if text != nil {
+      begun = true
+      format += "(label == %@ OR title == %@)"
+      values.append(text!)
+      values.append(text!)
+    }
+
+    if textStartsWith != nil {
+      if begun { format += " AND " }
+      begun = true
+      format += "(label BEGINSWITH %@ OR title BEGINSWITH %@)"
+      values.append(textStartsWith!)
+      values.append(textStartsWith!)
+    }
+
+    if textContains != nil {
+      if begun { format += " AND " }
+      begun = true
+      format += "(label CONTAINS %@ OR title CONTAINS %@)"
+      values.append(textContains!)
+      values.append(textContains!)
+    }
+
+    if resourceId != nil {
+      if begun { format += " AND " }
+      begun = true
+      format += "(identifier == %@)"
+      values.append(resourceId!)
+    }
+
+    let predicate = NSPredicate(format: format, argumentArray: values)
+
+    return predicate
+  }
+}
+
 #if PATROL_ENABLED
   import XCTest
   import os
@@ -13,21 +103,19 @@
 
     // MARK: General UI interaction
     func tap(
-      onText text: String,
+      on selector: Selector,
       inApp bundleId: String,
-      atIndex index: Int,
       withTimeout timeout: TimeInterval?
     ) throws
     func doubleTap(
-      onText text: String,
+      on selector: Selector,
       inApp bundleId: String,
       withTimeout timeout: TimeInterval?
     ) throws
     func tapAt(coordinate vector: CGVector, inApp bundleId: String) throws
     func enterText(
       _ data: String,
-      byText text: String,
-      atIndex index: Int,
+      on selector: Selector,
       inApp bundleId: String,
       dismissKeyboard: Bool,
       withTimeout timeout: TimeInterval?
@@ -41,7 +129,7 @@
     ) throws
     func swipe(from start: CGVector, to end: CGVector, inApp bundleId: String) throws
     func waitUntilVisible(
-      onText text: String,
+      on selector: Selector,
       inApp bundleId: String,
       withTimeout timeout: TimeInterval?
     ) throws
@@ -58,7 +146,7 @@
     func enableBluetooth() throws
     func disableBluetooth() throws
     func getNativeViews(
-      byText text: String,
+      on selector: Selector,
       inApp bundleId: String
     ) throws -> [NativeView]
     func getUITreeRoots(installedApps: [String]) throws -> [NativeView]