npm - agent-device - Versions diffs - 0.21.12 → 0.21.14 - Mend

agent-device 0.21.12 → 0.21.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (317) hide show

package/dist/apple/runner/AgentDeviceRunner/AgentDeviceRunnerUITests/RunnerTests+AXSnapshotFallback.swift CHANGED Viewed

@@ -55,14 +55,10 @@ extension RunnerTests {
   static func privateAXCustomActionCoverage(_ raw: Any?) -> SnapshotCustomActionCoverage? {
     guard let coverage = raw as? [String: Any],
       let read = (coverage[RunnerAXSnapshotCustomActionsReadKey] as? NSNumber)?.intValue,
-      let candidates = (coverage[RunnerAXSnapshotCustomActionsCandidatesKey] as? NSNumber)?.intValue
+      let candidates = (coverage[RunnerAXSnapshotCustomActionsCandidatesKey] as? NSNumber)?.intValue,
+      let truncated = (coverage[RunnerAXSnapshotCustomActionsTruncatedKey] as? NSNumber)?.intValue,
+      let blocked = (coverage[RunnerAXSnapshotCustomActionsBlockedKey] as? NSNumber)?.boolValue
     else { return nil }
-    let truncated =
-      (coverage[RunnerAXSnapshotCustomActionsTruncatedKey] as? NSNumber)?.intValue ?? 0
-    let blocked = (coverage[RunnerAXSnapshotCustomActionsBlockedKey] as? NSNumber)?.boolValue ?? false
     return SnapshotCustomActionCoverage(
       read: read, candidates: candidates, truncated: truncated, blocked: blocked)
   }
@@ -114,14 +110,16 @@ extension RunnerTests {
   func recordPrivateAXAcceptedDepth(
+    bundleId: String?,
+    processIdentifier: Int?,
     exactDepthRequested: Bool,
     effectiveDepth: Int,
     attemptDepths: [Int]
   ) {
     guard !exactDepthRequested, effectiveDepth != attemptDepths.first else { return }
     rememberPrivateAXAcceptedDepth(
-      bundleId: currentBundleId,
-      processIdentifier: currentAppProcessIdentifier,
+      bundleId: bundleId,
+      processIdentifier: processIdentifier,
       depth: effectiveDepth
     )
   }
@@ -164,11 +162,12 @@ extension RunnerTests {
   }
   func privateAXSnapshotAcquisition(
-    app: XCUIApplication,
+    target: SnapshotCaptureTarget,
     hint: CaptureHint,
     deadline: Date = .distantFuture
   ) -> SnapshotAcquisition? {
     #if os(iOS) && targetEnvironment(simulator)
+      let app = target.app
       let requestedDepth = hint.rawTraversalDepth ?? 64
@@ -177,8 +176,8 @@ extension RunnerTests {
         exactDepthRequested
         ? nil
         : rememberedPrivateAXAcceptedDepth(
-          bundleId: currentBundleId,
-          processIdentifier: currentAppProcessIdentifier
+          bundleId: target.bundleId,
+          processIdentifier: target.processIdentifier
         )
       let attemptDepths = Self.privateAXAttemptDepths(
         requestedDepth: requestedDepth,
@@ -206,6 +205,8 @@ extension RunnerTests {
         return nil
       }
       recordPrivateAXAcceptedDepth(
+        bundleId: target.bundleId,
+        processIdentifier: target.processIdentifier,
         exactDepthRequested: exactDepthRequested,
         effectiveDepth: effectiveDepth,
         attemptDepths: attemptDepths
@@ -216,8 +217,11 @@ extension RunnerTests {
       }
       let rootFrame = privateAXRect(root["frame"])
-      let geometry = privateAXSnapshotGeometry(app: app, rootFrame: rootFrame)
-      let viewport = geometry.viewport
+      let viewport = privateAXSnapshotViewport(
+        app: app,
+        bundleId: target.bundleId,
+        rootFrame: rootFrame
+      )
       let nodes = privateAXAcquisition(
         rawRoot: root,
         hint: hint
@@ -254,8 +258,7 @@ extension RunnerTests {
         customActions: Self.privateAXCustomActionCoverage(
           response[RunnerAXSnapshotCustomActionsKey]
         ),
-        viewport: viewport,
-        interfaceOrientation: geometry.interfaceOrientation
+        viewport: viewport
       )
     #else
       return nil
@@ -266,40 +269,36 @@ extension RunnerTests {
-  func shouldReadPrivateAXViewportViaXCTest() -> Bool {
-    !hasAbandonedMainThreadWork() && !isSnapshotXCTestChannelPenalized(bundleId: currentBundleId)
+  func shouldReadPrivateAXViewportViaXCTest(bundleId: String?) -> Bool {
+    !hasAbandonedMainThreadWork() && !isSnapshotXCTestChannelPenalized(bundleId: bundleId)
   }
-  private func privateAXSnapshotGeometry(
+  private func privateAXSnapshotViewport(
     app: XCUIApplication,
+    bundleId: String?,
     rootFrame: CGRect
-  ) -> (viewport: CGRect, interfaceOrientation: Int) {
-    let fallback = rootFrame.isEmpty ? CGRect.infinite : rootFrame
-    guard shouldReadPrivateAXViewportViaXCTest() else {
-      return (fallback, RunnerInterfaceOrientation.unknown)
+  ) -> SnapshotViewport {
+    let fallback = SnapshotViewport.derived(box: rootFrame)
+    guard shouldReadPrivateAXViewportViaXCTest(bundleId: bundleId) else {
+      return fallback
     }
     do {
-      let anchor = try runMainThreadWork(
+      let reported = try runMainThreadWork(
         "private_ax_viewport",
         timeout: 1,
         timeoutError: snapshotMainThreadTimeoutError("reading private AX viewport")
       ) {
-        (
-          viewport: self.safeSnapshotViewport(app: app),
-          interfaceOrientation: self.capturedInterfaceOrientation(app: app)
-        )
+        self.safeSnapshotViewport(app: app, readingOrientation: true)
       }
-      if anchor.viewport.isInfinite || anchor.viewport.isNull || anchor.viewport.isEmpty {
-        return (fallback, RunnerInterfaceOrientation.unknown)
+      if case .missing = reported {
+        return fallback
       }
-      return (anchor.viewport, anchor.interfaceOrientation)
+      return reported
     } catch {
       NSLog("AGENT_DEVICE_RUNNER_PRIVATE_AX_VIEWPORT_FALLBACK=%@", String(describing: error))
-      return (fallback, RunnerInterfaceOrientation.unknown)
+      return fallback
     }
   }
@@ -321,555 +320,3 @@ extension RunnerTests {
     return nil
   }
 }