Skip to content

Commit 759473e

Browse files
authored
[camera_avfoundation] Fix Swift analyzer issues in tests (flutter#13340)
I don't know why these analyzer issues are being reported one-at-a-time in CI on flutter/packages#13284 instead of all at once, but flutter/packages#13332 was only one of a few analyzer issues: ``` darwin/Tests/CameraSessionPresetsTests.swift:28:9: error: variable 'currentFormat' was never mutated; consider changing to 'let' constant var currentFormat: CaptureDeviceFormat = captureFormatMock ~~~ ^ let darwin/Tests/CameraInitRaceConditionsTests.swift:62:24: warning: immutable value '_captureSessionQueue' was never used; consider replacing with '_' or removing it [#NoUsage] 60 | 61 | func testFlutterChannelInitializedWhenStartingImageStream() { 62 | let (cameraPlugin, _captureSessionQueue) = createCameraPlugin() darwin/Tests/AvailableCamerasTests.swift:49:11: warning: variable 'requiredTypes' was never mutated; consider changing to 'let' constant [#VariableNeverMutated] 47 | telephotoCamera.position = .back 48 | 49 | var requiredTypes: [AVCaptureDevice.DeviceType] = [ darwin/Tests/AvailableCamerasTests.swift:52:11: warning: variable 'cameras' was never mutated; consider changing to 'let' constant [#VariableNeverMutated] 50 | .builtInWideAngleCamera, .builtInTelephotoCamera, .builtInUltraWideCamera, 51 | ] 52 | var cameras = [wideAngleCamera, frontFacingCamera, telephotoCamera, ultraWideCamera] darwin/Tests/AvailableCamerasTests.swift:86:11: warning: variable 'requiredTypes' was never mutated; consider changing to 'let' constant [#VariableNeverMutated] 84 | frontFacingCamera.position = .front 85 | 86 | var requiredTypes: [AVCaptureDevice.DeviceType] = [ darwin/Tests/AvailableCamerasTests.swift:118:11: warning: variable 'requiredTypes' was never mutated; consider changing to 'let' constant [#VariableNeverMutated] 116 | unspecifiedCamera.position = .unspecified 117 | 118 | var requiredTypes: [AVCaptureDevice.DeviceType] = [ darwin/Tests/CameraOrientationTests.swift:120:14: warning: weak variable 'weakDevice' was never mutated; consider changing to 'let' constant [#VariableNeverMutated::WeakMutability] 118 | let captureSessionQueue = DispatchQueue(label: "capture_session_queue") 119 | weak var weakPlugin: CameraPlugin? 120 | weak var weakDevice = mockDevice darwin/Tests/CameraOrientationTests.swift:157:14: warning: weak variable 'weakEventAPI' was never mutated; consider changing to 'let' constant [#VariableNeverMutated::WeakMutability] 155 | } 156 | 157 | weak var weakEventAPI = mockEventAPI ``` This wasn't showing up in CI due to flutter#194517. ## Pre-Review Checklist **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed. [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.
1 parent 8482163 commit 759473e

3 files changed

Lines changed: 7 additions & 9 deletions

File tree

‎packages/camera/camera_avfoundation/darwin/Tests/AvailableCamerasTests.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ final class AvailableCamerasTest: XCTestCase {
4646
telephotoCamera.uniqueID = "3"
4747
telephotoCamera.position = .back
4848

49-
var requiredTypes: [AVCaptureDevice.DeviceType] = [
49+
let requiredTypes: [AVCaptureDevice.DeviceType] = [
5050
.builtInWideAngleCamera, .builtInTelephotoCamera, .builtInUltraWideCamera,
5151
]
52-
var cameras = [wideAngleCamera, frontFacingCamera, telephotoCamera, ultraWideCamera]
52+
let cameras = [wideAngleCamera, frontFacingCamera, telephotoCamera, ultraWideCamera]
5353

5454
XCTAssertEqual(deviceTypes, requiredTypes)
5555
XCTAssertEqual(mediaType, .video)
@@ -83,7 +83,7 @@ final class AvailableCamerasTest: XCTestCase {
8383
frontFacingCamera.uniqueID = "1"
8484
frontFacingCamera.position = .front
8585

86-
var requiredTypes: [AVCaptureDevice.DeviceType] = [
86+
let requiredTypes: [AVCaptureDevice.DeviceType] = [
8787
.builtInWideAngleCamera, .builtInTelephotoCamera, .builtInUltraWideCamera,
8888
]
8989
let cameras = [wideAngleCamera, frontFacingCamera]
@@ -115,7 +115,7 @@ final class AvailableCamerasTest: XCTestCase {
115115
unspecifiedCamera.uniqueID = "0"
116116
unspecifiedCamera.position = .unspecified
117117

118-
var requiredTypes: [AVCaptureDevice.DeviceType] = [
118+
let requiredTypes: [AVCaptureDevice.DeviceType] = [
119119
.builtInWideAngleCamera, .builtInTelephotoCamera, .builtInUltraWideCamera,
120120
]
121121
let cameras = [unspecifiedCamera]

‎packages/camera/camera_avfoundation/darwin/Tests/CameraOrientationTests.swift‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ final class CameraOrientationTests: XCTestCase {
117117
let (_, mockCamera, mockEventAPI, mockDevice, mockDeviceDiscoverer, _) = createCameraPlugin()
118118
let captureSessionQueue = DispatchQueue(label: "capture_session_queue")
119119
weak var weakPlugin: CameraPlugin?
120-
weak var weakDevice = mockDevice
121120

122121
autoreleasepool {
123122
let cameraPlugin = CameraPlugin(
@@ -126,7 +125,7 @@ final class CameraOrientationTests: XCTestCase {
126125
globalAPI: mockEventAPI,
127126
deviceDiscoverer: mockDeviceDiscoverer,
128127
permissionManager: MockCameraPermissionManager(),
129-
deviceFactory: { _ in weakDevice! },
128+
deviceFactory: { _ in mockDevice },
130129
captureSessionFactory: { MockCaptureSession() },
131130
captureDeviceInputFactory: MockCaptureDeviceInputFactory(),
132131
captureSessionQueue: captureSessionQueue
@@ -154,12 +153,11 @@ final class CameraOrientationTests: XCTestCase {
154153
}
155154
}
156155

157-
weak var weakEventAPI = mockEventAPI
158156
// Must check in captureSessionQueue since orientationChanged dispatches to this queue.
159157
let expectation = self.expectation(description: "Dispatched to capture session queue")
160158
captureSessionQueue.async {
161159
XCTAssertFalse(setDeviceOrientationCalled)
162-
XCTAssertFalse(weakEventAPI?.deviceOrientationChangedCalled ?? false)
160+
XCTAssertFalse(mockEventAPI.deviceOrientationChangedCalled)
163161
expectation.fulfill()
164162
}
165163

‎packages/camera/camera_avfoundation/darwin/Tests/CameraSessionPresetsTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ final class CameraSessionPresetsTests: XCTestCase {
2525
let captureFormatMock = MockCaptureDeviceFormat()
2626
let captureDeviceMock = MockCaptureDevice()
2727
captureDeviceMock.flutterFormats = [captureFormatMock]
28-
var currentFormat: CaptureDeviceFormat = captureFormatMock
28+
let currentFormat: CaptureDeviceFormat = captureFormatMock
2929
captureDeviceMock.activeFormatStub = {
3030
return currentFormat
3131
}

0 commit comments

Comments
 (0)