Skip to content

Commit 20b5861

Browse files
RobertOdrowazRobertOdrowaz
authored
[camera_avfoundation] Test utils and mocks swift migration - part 1 (#8890)
Migrates camera test utils and mocks as part of flutter/flutter#119109 Migrates `CameraTestUtils` and `MockCaptureSession` to swift. The `FLTdispatchQueueSetSpecific` function from `CameraTestUtils` still has to be in ObjC so it's now separately in `QueueTestUtils`. ## Pre-Review Checklist [^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 4373c30 commit 20b5861

25 files changed

+355
-373
lines changed

‎packages/camera/camera_avfoundation/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.9.18+12
2+
3+
* Migrates test utils and mocks to Swift.
4+
* Renames the methods of Objective-C type `FLTCaptureSession` when exported to Swift.
5+
16
## 0.9.18+11
27

38
* Backfills unit tests for the `FLTCam` class.

‎packages/camera/camera_avfoundation/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
54D650172516862D30686934 /* libPods-Runner.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ECAF63F924EFA2D68883BA85 /* libPods-Runner.a */; };
1414
78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
1515
7F29EB292D26A59000740257 /* MockCameraDeviceDiscoverer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F29EB282D26A59000740257 /* MockCameraDeviceDiscoverer.m */; };
16-
7F29EB412D281C7E00740257 /* MockCaptureSession.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F29EB402D281C7E00740257 /* MockCaptureSession.m */; };
1716
7F8FD2292D4BFABF001AF2C1 /* MockGlobalEventApi.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F8FD2282D4BFABF001AF2C1 /* MockGlobalEventApi.m */; };
1817
7F8FD22C2D4D07DD001AF2C1 /* MockFlutterTextureRegistry.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F8FD22B2D4D07DD001AF2C1 /* MockFlutterTextureRegistry.m */; };
1918
7F8FD22F2D4D0B88001AF2C1 /* MockFlutterBinaryMessenger.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F8FD22E2D4D0B88001AF2C1 /* MockFlutterBinaryMessenger.m */; };
@@ -47,14 +46,15 @@
4746
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
4847
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
4948
97DB234D2D566D0700CEFE66 /* CameraPreviewPauseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97DB234C2D566D0700CEFE66 /* CameraPreviewPauseTests.swift */; };
50-
E0CDBAC227CD9729002561D9 /* CameraTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = E0CDBAC127CD9729002561D9 /* CameraTestUtils.m */; };
51-
E11D6A912D82C7740031E6C5 /* FLTCamExposureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E11D6A902D82C7740031E6C5 /* FLTCamExposureTests.swift */; };
49+
E0CDBAC227CD9729002561D9 /* QueueTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = E0CDBAC127CD9729002561D9 /* QueueTestUtils.m */; };
5250
E11D6A8F2D81B81D0031E6C5 /* MockCaptureVideoDataOutput.swift in Sources */ = {isa = PBXBuildFile; fileRef = E11D6A8E2D81B81D0031E6C5 /* MockCaptureVideoDataOutput.swift */; };
51+
E11D6A912D82C7740031E6C5 /* FLTCamExposureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E11D6A902D82C7740031E6C5 /* FLTCamExposureTests.swift */; };
5352
E12C4FF62D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E12C4FF52D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift */; };
5453
E12C4FF82D68E85500515E70 /* MockFLTCameraPermissionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E12C4FF72D68E85500515E70 /* MockFLTCameraPermissionManager.swift */; };
55-
E16602952D8471C0003CFE12 /* FLTCamZoomTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16602942D8471C0003CFE12 /* FLTCamZoomTests.swift */; };
56-
E1A5F4E32D80259C0005BA64 /* FLTCamSetFlashModeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */; };
54+
E142681D2D8483FD0046CBBC /* MockCaptureSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = E142681C2D8483FD0046CBBC /* MockCaptureSession.swift */; };
55+
E142681F2D8566230046CBBC /* CameraTestUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = E142681E2D8566230046CBBC /* CameraTestUtils.swift */; };
5756
E15139182D80980900FEE47B /* FLTCamSetDeviceOrientationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E15139172D80980900FEE47B /* FLTCamSetDeviceOrientationTests.swift */; };
57+
E16602952D8471C0003CFE12 /* FLTCamZoomTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16602942D8471C0003CFE12 /* FLTCamZoomTests.swift */; };
5858
E1A5F4E32D80259C0005BA64 /* FLTCamSetFlashModeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */; };
5959
E1FFEAAD2D6C8DD700B14107 /* MockFLTCam.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1FFEAAC2D6C8DD700B14107 /* MockFLTCam.swift */; };
6060
E1FFEAAF2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1FFEAAE2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift */; };
@@ -96,8 +96,6 @@
9696
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
9797
7F29EB272D26A55300740257 /* MockCameraDeviceDiscoverer.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockCameraDeviceDiscoverer.h; sourceTree = "<group>"; };
9898
7F29EB282D26A59000740257 /* MockCameraDeviceDiscoverer.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockCameraDeviceDiscoverer.m; sourceTree = "<group>"; };
99-
7F29EB3E2D281C5800740257 /* MockCaptureSession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockCaptureSession.h; sourceTree = "<group>"; };
100-
7F29EB402D281C7E00740257 /* MockCaptureSession.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockCaptureSession.m; sourceTree = "<group>"; };
10199
7F8FD2272D4BFA8D001AF2C1 /* MockGlobalEventApi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockGlobalEventApi.h; sourceTree = "<group>"; };
102100
7F8FD2282D4BFABF001AF2C1 /* MockGlobalEventApi.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MockGlobalEventApi.m; sourceTree = "<group>"; };
103101
7F8FD22A2D4D07A6001AF2C1 /* MockFlutterTextureRegistry.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MockFlutterTextureRegistry.h; sourceTree = "<group>"; };
@@ -148,15 +146,16 @@
148146
9DDC4CE84A8B378AE4A8CD9C /* libPods-RunnerTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RunnerTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
149147
A8F314CD1C64E9257EBC811D /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
150148
B61D98BBC8FB276D1C4A7BB2 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
151-
E0CDBAC027CD9729002561D9 /* CameraTestUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CameraTestUtils.h; sourceTree = "<group>"; };
152-
E0CDBAC127CD9729002561D9 /* CameraTestUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CameraTestUtils.m; sourceTree = "<group>"; };
153-
E11D6A902D82C7740031E6C5 /* FLTCamExposureTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamExposureTests.swift; sourceTree = "<group>"; };
149+
E0CDBAC027CD9729002561D9 /* QueueTestUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QueueTestUtils.h; sourceTree = "<group>"; };
150+
E0CDBAC127CD9729002561D9 /* QueueTestUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QueueTestUtils.m; sourceTree = "<group>"; };
154151
E11D6A8E2D81B81D0031E6C5 /* MockCaptureVideoDataOutput.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCaptureVideoDataOutput.swift; sourceTree = "<group>"; };
152+
E11D6A902D82C7740031E6C5 /* FLTCamExposureTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamExposureTests.swift; sourceTree = "<group>"; };
155153
E12C4FF52D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPluginDelegatingMethodTests.swift; sourceTree = "<group>"; };
156154
E12C4FF72D68E85500515E70 /* MockFLTCameraPermissionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockFLTCameraPermissionManager.swift; sourceTree = "<group>"; };
157-
E16602942D8471C0003CFE12 /* FLTCamZoomTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamZoomTests.swift; sourceTree = "<group>"; };
158-
E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamSetFlashModeTests.swift; sourceTree = "<group>"; };
155+
E142681C2D8483FD0046CBBC /* MockCaptureSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCaptureSession.swift; sourceTree = "<group>"; };
156+
E142681E2D8566230046CBBC /* CameraTestUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraTestUtils.swift; sourceTree = "<group>"; };
159157
E15139172D80980900FEE47B /* FLTCamSetDeviceOrientationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamSetDeviceOrientationTests.swift; sourceTree = "<group>"; };
158+
E16602942D8471C0003CFE12 /* FLTCamZoomTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamZoomTests.swift; sourceTree = "<group>"; };
160159
E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamSetFlashModeTests.swift; sourceTree = "<group>"; };
161160
E1FFEAAC2D6C8DD700B14107 /* MockFLTCam.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockFLTCam.swift; sourceTree = "<group>"; };
162161
E1FFEAAE2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPluginCreateCameraTests.swift; sourceTree = "<group>"; };
@@ -191,8 +190,9 @@
191190
children = (
192191
7F29EB3F2D281C6D00740257 /* Mocks */,
193192
03BB766C2665316900CE5A93 /* Info.plist */,
194-
E0CDBAC027CD9729002561D9 /* CameraTestUtils.h */,
195-
E0CDBAC127CD9729002561D9 /* CameraTestUtils.m */,
193+
E0CDBAC027CD9729002561D9 /* QueueTestUtils.h */,
194+
E0CDBAC127CD9729002561D9 /* QueueTestUtils.m */,
195+
E142681E2D8566230046CBBC /* CameraTestUtils.swift */,
196196
979B3DF92D5B6BA2009BDE1A /* ExceptionCatcher.h */,
197197
979B3DFA2D5B6BC7009BDE1A /* ExceptionCatcher.m */,
198198
979B3DFC2D5B985B009BDE1A /* RunnerTests-Bridging-Header.h */,
@@ -255,13 +255,12 @@
255255
7FCEDD342D43C2B900EA1CA8 /* MockDeviceOrientationProvider.m */,
256256
7F29EB272D26A55300740257 /* MockCameraDeviceDiscoverer.h */,
257257
7F29EB282D26A59000740257 /* MockCameraDeviceDiscoverer.m */,
258-
7F29EB3E2D281C5800740257 /* MockCaptureSession.h */,
259-
7F29EB402D281C7E00740257 /* MockCaptureSession.m */,
260258
E1FFEAAC2D6C8DD700B14107 /* MockFLTCam.swift */,
261259
970ADABF2D6764CC00EFDCD9 /* MockEventChannel.swift */,
262260
E12C4FF72D68E85500515E70 /* MockFLTCameraPermissionManager.swift */,
263261
970ADABD2D6740A900EFDCD9 /* MockWritableData.swift */,
264262
E11D6A8E2D81B81D0031E6C5 /* MockCaptureVideoDataOutput.swift */,
263+
E142681C2D8483FD0046CBBC /* MockCaptureSession.swift */,
265264
);
266265
path = Mocks;
267266
sourceTree = "<group>";
@@ -565,16 +564,18 @@
565564
7F8FD22F2D4D0B88001AF2C1 /* MockFlutterBinaryMessenger.m in Sources */,
566565
E12C4FF82D68E85500515E70 /* MockFLTCameraPermissionManager.swift in Sources */,
567566
97922B0D2D6380C300A9B4CF /* SampleBufferTests.swift in Sources */,
567+
E142681D2D8483FD0046CBBC /* MockCaptureSession.swift in Sources */,
568568
E15139182D80980900FEE47B /* FLTCamSetDeviceOrientationTests.swift in Sources */,
569569
972CA92B2D5A1D8C004B846F /* CameraPropertiesTests.swift in Sources */,
570-
E0CDBAC227CD9729002561D9 /* CameraTestUtils.m in Sources */,
570+
E0CDBAC227CD9729002561D9 /* QueueTestUtils.m in Sources */,
571571
978296CF2D5F744B0009BDD3 /* PhotoCaptureTests.swift in Sources */,
572572
7FD582202D579ECC003B1200 /* MockCapturePhotoOutput.m in Sources */,
573573
979B3E002D5B9E6C009BDE1A /* CameraMethodChannelTests.swift in Sources */,
574574
E1FFEAAF2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift in Sources */,
575575
97DB234D2D566D0700CEFE66 /* CameraPreviewPauseTests.swift in Sources */,
576576
970ADAC02D6764CC00EFDCD9 /* MockEventChannel.swift in Sources */,
577577
977A25202D5A439300931E34 /* AvailableCamerasTests.swift in Sources */,
578+
E142681F2D8566230046CBBC /* CameraTestUtils.swift in Sources */,
578579
E1FFEAAD2D6C8DD700B14107 /* MockFLTCam.swift in Sources */,
579580
7F29EB292D26A59000740257 /* MockCameraDeviceDiscoverer.m in Sources */,
580581
E16602952D8471C0003CFE12 /* FLTCamZoomTests.swift in Sources */,
@@ -584,7 +585,6 @@
584585
E12C4FF62D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift in Sources */,
585586
977A25222D5A49EC00931E34 /* FLTCamFocusTests.swift in Sources */,
586587
978D90B42D5F630300CD817E /* StreamingTests.swift in Sources */,
587-
7F29EB412D281C7E00740257 /* MockCaptureSession.m in Sources */,
588588
7FCEDD352D43C2B900EA1CA8 /* MockDeviceOrientationProvider.m in Sources */,
589589
E11D6A8F2D81B81D0031E6C5 /* MockCaptureVideoDataOutput.swift in Sources */,
590590
977CAC9F2D5E5180001E5DC3 /* ThreadSafeEventChannelTests.swift in Sources */,

‎packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraMethodChannelTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ final class CameraMethodChannelTests: XCTestCase {
2323

2424
func testCreate_ShouldCallResultOnMainThread() {
2525
let avCaptureSessionMock = MockCaptureSession()
26-
avCaptureSessionMock.canSetSessionPreset = true
26+
avCaptureSessionMock.canSetSessionPresetStub = { _ in true }
2727
let camera = createCameraPlugin(with: avCaptureSessionMock)
2828
let expectation = self.expectation(description: "Result finished")
2929

@@ -48,7 +48,7 @@ final class CameraMethodChannelTests: XCTestCase {
4848

4949
func testDisposeShouldDeallocCamera() {
5050
let avCaptureSessionMock = MockCaptureSession()
51-
avCaptureSessionMock.canSetSessionPreset = true
51+
avCaptureSessionMock.canSetSessionPresetStub = { _ in true }
5252
let camera = createCameraPlugin(with: avCaptureSessionMock)
5353
let createExpectation = self.expectation(description: "create's result block must be called")
5454

‎packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPluginCreateCameraTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ final class CameraPluginCreateCameraTests: XCTestCase {
109109
// Permission is granted
110110
completion?(nil)
111111
}
112-
mockCaptureSession.canSetSessionPreset = true
112+
mockCaptureSession.canSetSessionPresetStub = { _ in true }
113113

114114
cameraPlugin.createCamera(
115115
withName: "camera_name",

‎packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraSessionPresetsTests.swift

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@ final class CameraSessionPresetsTests: XCTestCase {
3030
return true
3131
}
3232

33-
let configuration = FLTCreateTestCameraConfiguration()
33+
let configuration = CameraTestUtils.createTestCameraConfiguration()
3434
configuration.captureDeviceFactory = { captureDeviceMock }
3535
configuration.videoDimensionsForFormat = { format in
3636
return CMVideoDimensions(width: 1, height: 1)
3737
}
3838
configuration.videoCaptureSession = videoSessionMock
39-
configuration.mediaSettings = FCPGetDefaultMediaSettings(FCPPlatformResolutionPreset.max)
39+
configuration.mediaSettings = CameraTestUtils.createDefaultMediaSettings(
40+
resolutionPreset: FCPPlatformResolutionPreset.max)
4041

41-
FLTCreateCamWithConfiguration(configuration)
42+
let _ = FLTCam(configuration: configuration, error: nil)
4243

4344
waitForExpectations(timeout: 30, handler: nil)
4445
}
@@ -49,19 +50,20 @@ final class CameraSessionPresetsTests: XCTestCase {
4950

5051
let videoSessionMock = MockCaptureSession()
5152
// Make sure that setting resolution preset for session always succeeds.
52-
videoSessionMock.canSetSessionPreset = true
53+
videoSessionMock.canSetSessionPresetStub = { _ in true }
5354
videoSessionMock.setSessionPresetStub = { preset in
5455
if preset == expectedPreset {
5556
expectation.fulfill()
5657
}
5758
}
5859

59-
let configuration = FLTCreateTestCameraConfiguration()
60+
let configuration = CameraTestUtils.createTestCameraConfiguration()
6061
configuration.videoCaptureSession = videoSessionMock
61-
configuration.mediaSettings = FCPGetDefaultMediaSettings(FCPPlatformResolutionPreset.max)
62+
configuration.mediaSettings = CameraTestUtils.createDefaultMediaSettings(
63+
resolutionPreset: FCPPlatformResolutionPreset.max)
6264
configuration.captureDeviceFactory = { MockCaptureDevice() }
6365

64-
FLTCreateCamWithConfiguration(configuration)
66+
let _ = FLTCam(configuration: configuration, error: nil)
6567

6668
waitForExpectations(timeout: 30, handler: nil)
6769
}
@@ -72,19 +74,20 @@ final class CameraSessionPresetsTests: XCTestCase {
7274

7375
let videoSessionMock = MockCaptureSession()
7476
// Make sure that setting resolution preset for session always succeeds.
75-
videoSessionMock.canSetSessionPreset = true
77+
videoSessionMock.canSetSessionPresetStub = { _ in true }
7678
// Expect that setting "ultraHigh" resolutionPreset correctly updates videoCaptureSession.
7779
videoSessionMock.setSessionPresetStub = { preset in
7880
if preset == expectedPreset {
7981
expectation.fulfill()
8082
}
8183
}
8284

83-
let configuration = FLTCreateTestCameraConfiguration()
85+
let configuration = CameraTestUtils.createTestCameraConfiguration()
8486
configuration.videoCaptureSession = videoSessionMock
85-
configuration.mediaSettings = FCPGetDefaultMediaSettings(FCPPlatformResolutionPreset.ultraHigh)
87+
configuration.mediaSettings = CameraTestUtils.createDefaultMediaSettings(
88+
resolutionPreset: FCPPlatformResolutionPreset.ultraHigh)
8689

87-
FLTCreateCamWithConfiguration(configuration)
90+
let _ = FLTCam(configuration: configuration, error: nil)
8891

8992
waitForExpectations(timeout: 30, handler: nil)
9093
}

‎packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraSettingsTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ final class CameraSettingsTests: XCTestCase {
118118
)
119119
let injectedWrapper = TestMediaSettingsAVWrapper(test: self)
120120

121-
let configuration = FLTCreateTestCameraConfiguration()
121+
let configuration = CameraTestUtils.createTestCameraConfiguration()
122122
configuration.mediaSettingsWrapper = injectedWrapper
123123
configuration.mediaSettings = settings
124-
let camera = FLTCreateCamWithConfiguration(configuration)
124+
let camera = FLTCam(configuration: configuration, error: nil)
125125

126126
// Expect FPS configuration is passed to camera device.
127127
wait(
@@ -149,7 +149,7 @@ final class CameraSettingsTests: XCTestCase {
149149
func testSettings_ShouldBeSupportedByMethodCall() {
150150
let mockDevice = MockCaptureDevice()
151151
let mockSession = MockCaptureSession()
152-
mockSession.canSetSessionPreset = true
152+
mockSession.canSetSessionPresetStub = { _ in true }
153153
let camera = CameraPlugin(
154154
registry: MockFlutterTextureRegistry(),
155155
messenger: MockFlutterBinaryMessenger(),
@@ -192,9 +192,9 @@ final class CameraSettingsTests: XCTestCase {
192192
enableAudio: testEnableAudio
193193
)
194194

195-
let configuration = FLTCreateTestCameraConfiguration()
195+
let configuration = CameraTestUtils.createTestCameraConfiguration()
196196
configuration.mediaSettings = settings
197-
let camera = FLTCreateCamWithConfiguration(configuration)
197+
let camera = FLTCam(configuration: configuration, error: nil)
198198

199199
let range = camera.captureDevice.activeFormat.videoSupportedFrameRateRanges[0]
200200
XCTAssertLessThanOrEqual(range.minFrameRate, 60)

0 commit comments

Comments
 (0)