From a18a5b21c11b2ca28ba003350c2f2d305c903e4c Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Mon, 19 Oct 2026 15:58:00 -0700 Subject: [PATCH 1/2] [camera_avfoundation] Fix Swift analyzer issues in tests --- .../darwin/Tests/AvailableCamerasTests.swift | 8 ++++---- .../darwin/Tests/CameraOrientationTests.swift | 8 +++----- .../darwin/Tests/CameraSessionPresetsTests.swift | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/camera/camera_avfoundation/darwin/Tests/AvailableCamerasTests.swift b/packages/camera/camera_avfoundation/darwin/Tests/AvailableCamerasTests.swift index 4fbece5523d5..b9aedac76224 100644 --- a/packages/camera/camera_avfoundation/darwin/Tests/AvailableCamerasTests.swift +++ b/packages/camera/camera_avfoundation/darwin/Tests/AvailableCamerasTests.swift @@ -46,10 +46,10 @@ final class AvailableCamerasTest: XCTestCase { telephotoCamera.uniqueID = "3" telephotoCamera.position = .back - var requiredTypes: [AVCaptureDevice.DeviceType] = [ + let requiredTypes: [AVCaptureDevice.DeviceType] = [ .builtInWideAngleCamera, .builtInTelephotoCamera, .builtInUltraWideCamera, ] - var cameras = [wideAngleCamera, frontFacingCamera, telephotoCamera, ultraWideCamera] + let cameras = [wideAngleCamera, frontFacingCamera, telephotoCamera, ultraWideCamera] XCTAssertEqual(deviceTypes, requiredTypes) XCTAssertEqual(mediaType, .video) @@ -83,7 +83,7 @@ final class AvailableCamerasTest: XCTestCase { frontFacingCamera.uniqueID = "1" frontFacingCamera.position = .front - var requiredTypes: [AVCaptureDevice.DeviceType] = [ + let requiredTypes: [AVCaptureDevice.DeviceType] = [ .builtInWideAngleCamera, .builtInTelephotoCamera, .builtInUltraWideCamera, ] let cameras = [wideAngleCamera, frontFacingCamera] @@ -115,7 +115,7 @@ final class AvailableCamerasTest: XCTestCase { unspecifiedCamera.uniqueID = "0" unspecifiedCamera.position = .unspecified - var requiredTypes: [AVCaptureDevice.DeviceType] = [ + let requiredTypes: [AVCaptureDevice.DeviceType] = [ .builtInWideAngleCamera, .builtInTelephotoCamera, .builtInUltraWideCamera, ] let cameras = [unspecifiedCamera] diff --git a/packages/camera/camera_avfoundation/darwin/Tests/CameraOrientationTests.swift b/packages/camera/camera_avfoundation/darwin/Tests/CameraOrientationTests.swift index 4878cbe51d6f..30697c00eb90 100644 --- a/packages/camera/camera_avfoundation/darwin/Tests/CameraOrientationTests.swift +++ b/packages/camera/camera_avfoundation/darwin/Tests/CameraOrientationTests.swift @@ -117,7 +117,6 @@ final class CameraOrientationTests: XCTestCase { let (_, mockCamera, mockEventAPI, mockDevice, mockDeviceDiscoverer, _) = createCameraPlugin() let captureSessionQueue = DispatchQueue(label: "capture_session_queue") weak var weakPlugin: CameraPlugin? - weak var weakDevice = mockDevice autoreleasepool { let cameraPlugin = CameraPlugin( @@ -126,7 +125,7 @@ final class CameraOrientationTests: XCTestCase { globalAPI: mockEventAPI, deviceDiscoverer: mockDeviceDiscoverer, permissionManager: MockCameraPermissionManager(), - deviceFactory: { _ in weakDevice! }, + deviceFactory: { [weak mockDevice] _ in mockDevice! }, captureSessionFactory: { MockCaptureSession() }, captureDeviceInputFactory: MockCaptureDeviceInputFactory(), captureSessionQueue: captureSessionQueue @@ -154,12 +153,11 @@ final class CameraOrientationTests: XCTestCase { } } - weak var weakEventAPI = mockEventAPI // Must check in captureSessionQueue since orientationChanged dispatches to this queue. let expectation = self.expectation(description: "Dispatched to capture session queue") - captureSessionQueue.async { + captureSessionQueue.async { [weak mockEventAPI] in XCTAssertFalse(setDeviceOrientationCalled) - XCTAssertFalse(weakEventAPI?.deviceOrientationChangedCalled ?? false) + XCTAssertFalse(mockEventAPI?.deviceOrientationChangedCalled ?? false) expectation.fulfill() } diff --git a/packages/camera/camera_avfoundation/darwin/Tests/CameraSessionPresetsTests.swift b/packages/camera/camera_avfoundation/darwin/Tests/CameraSessionPresetsTests.swift index 5d56567959f0..4751f902630c 100644 --- a/packages/camera/camera_avfoundation/darwin/Tests/CameraSessionPresetsTests.swift +++ b/packages/camera/camera_avfoundation/darwin/Tests/CameraSessionPresetsTests.swift @@ -25,7 +25,7 @@ final class CameraSessionPresetsTests: XCTestCase { let captureFormatMock = MockCaptureDeviceFormat() let captureDeviceMock = MockCaptureDevice() captureDeviceMock.flutterFormats = [captureFormatMock] - var currentFormat: CaptureDeviceFormat = captureFormatMock + let currentFormat: CaptureDeviceFormat = captureFormatMock captureDeviceMock.activeFormatStub = { return currentFormat } From 70fb21f9decb255a2c8040cf7377c32c8071f51a Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Mon, 19 Oct 2026 16:26:35 -0700 Subject: [PATCH 2/2] code review --- .../darwin/Tests/CameraOrientationTests.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/camera/camera_avfoundation/darwin/Tests/CameraOrientationTests.swift b/packages/camera/camera_avfoundation/darwin/Tests/CameraOrientationTests.swift index 30697c00eb90..77c397a38391 100644 --- a/packages/camera/camera_avfoundation/darwin/Tests/CameraOrientationTests.swift +++ b/packages/camera/camera_avfoundation/darwin/Tests/CameraOrientationTests.swift @@ -125,7 +125,7 @@ final class CameraOrientationTests: XCTestCase { globalAPI: mockEventAPI, deviceDiscoverer: mockDeviceDiscoverer, permissionManager: MockCameraPermissionManager(), - deviceFactory: { [weak mockDevice] _ in mockDevice! }, + deviceFactory: { _ in mockDevice }, captureSessionFactory: { MockCaptureSession() }, captureDeviceInputFactory: MockCaptureDeviceInputFactory(), captureSessionQueue: captureSessionQueue @@ -155,9 +155,9 @@ final class CameraOrientationTests: XCTestCase { // Must check in captureSessionQueue since orientationChanged dispatches to this queue. let expectation = self.expectation(description: "Dispatched to capture session queue") - captureSessionQueue.async { [weak mockEventAPI] in + captureSessionQueue.async { XCTAssertFalse(setDeviceOrientationCalled) - XCTAssertFalse(mockEventAPI?.deviceOrientationChangedCalled ?? false) + XCTAssertFalse(mockEventAPI.deviceOrientationChangedCalled) expectation.fulfill() }