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..77c397a38391 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: { _ 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 { XCTAssertFalse(setDeviceOrientationCalled) - XCTAssertFalse(weakEventAPI?.deviceOrientationChangedCalled ?? false) + XCTAssertFalse(mockEventAPI.deviceOrientationChangedCalled) 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 }