Merge pull request #811 from Esri/df/stabilizeAttachmentCameraControllerTests.testOnCameraCaptureModeChanged()

Stabilize `AttachmentCameraControllerTests.testOnCameraCaptureModeChanged()`

Author: dfeinzimer

Test Runner/Test Runner/TestViews/AttachmentCameraControllerTestView.swift

@@ -20,15 +20,42 @@ import SwiftUI
 struct AttachmentCameraControllerTestView: View {
     @State private var captureMode: UIImagePickerController.CameraCaptureMode?
 
+    @State private var orientation = UIDeviceOrientation.unknown
+    
     var body: some View {
-        Text(captureMode?.name ?? "None")
-            .accessibilityIdentifier("Camera Capture Mode")
-        AttachmentCameraController(importState: .constant(.none))
-            .onCameraCaptureModeChanged { captureMode in
-                self.captureMode = captureMode
+        Color.clear
+            .fullScreenCover(isPresented: .constant(true)) {
+                AttachmentCameraController(importState: .constant(.none))
+                    .onCameraCaptureModeChanged { captureMode in
+                        self.captureMode = captureMode
+                    }
+                    .overlay {
+                        VStack {
+                            Text(captureMode?.name ?? "None")
+                                .accessibilityIdentifier("Camera Capture Mode")
+                            Text(orientation.name)
+                                .accessibilityIdentifier("Device Orientation")
+                                .onReceive(NotificationCenter.default.publisher(for: UIDevice.orientationDidChangeNotification)) { _ in
+                                    orientation = UIDevice.current.orientation
+                                }
+                                .task {
+                                    orientation = UIDevice.current.orientation
+                                }
+                        }
+                    }
             }
     }
-    
+}
+
+extension UIDeviceOrientation {
+    var name: String {
+        switch self {
+        case .portrait: "Portrait"
+        case .landscapeLeft: "Landscape Left"
+        case .landscapeRight: "Landscape Right"
+        default: "Other"
+        }
+    }
 }
 
 extension UIImagePickerController.CameraCaptureMode {

Test Runner/UI Tests/AttachmentCameraControllerTests.swift

@@ -29,8 +29,19 @@ final class AttachmentCameraControllerTests: XCTestCase {
         let app = XCUIApplication()
         let cameraModeController = app.otherElements["CameraMode"]
         let cameraModeLabel = app.staticTexts["Camera Capture Mode"]
+        let device = UIDevice.current.userInterfaceIdiom
+        let orientation = app.staticTexts["Device Orientation"]
+        
         app.launch()
 
+        let attachmentCameraControllerTestsButton = app.buttons["AttachmentCameraController Tests"]
+        
+        XCTAssertTrue(
+            attachmentCameraControllerTestsButton.exists,
+            "The AttachmentCameraController Tests button wasn't found."
+        )
+        attachmentCameraControllerTestsButton.tap()
+        
         addUIInterruptionMonitor(withDescription: "Camera access alert") { (alert) -> Bool in
             alert.buttons["Allow"].tap()
             return true
@@ -40,22 +51,27 @@ final class AttachmentCameraControllerTests: XCTestCase {
             return true
         }
 
-        let attachmentCameraControllerTestsButton = app.buttons["AttachmentCameraController Tests"]
-        
-        XCTAssertTrue(
-            attachmentCameraControllerTestsButton.exists,
-            "The AttachmentCameraController Tests button wasn't found."
-        )
-        attachmentCameraControllerTestsButton.tap()
-        
         XCTAssertTrue(
             cameraModeController.waitForExistence(timeout: 5)
         )
-        cameraModeController.swipeDown()
+        
+        if device == .pad || (device == .phone && orientation.label == "Landscape Right") {
+            cameraModeController.swipeDown()
+        } else if orientation.label == "Landscape Left" {
+            cameraModeController.swipeUp()
+        } else /* iPhone - portrait */ {
+            cameraModeController.swipeRight()
+        }
 
         XCTAssertEqual(cameraModeLabel.label, "Video")
 
-        cameraModeController.swipeUp()
+        if device == .pad || (device == .phone && orientation.label == "Landscape Right") {
+            cameraModeController.swipeUp()
+        } else if orientation.label == "Landscape Left" {
+            cameraModeController.swipeDown()
+        } else /* iPhone - portrait */ {
+            cameraModeController.swipeLeft()
+        }
 
         XCTAssertEqual(cameraModeLabel.label, "Photo")
     }