[camera_avfoundation] Implementation swift migration - part 3

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraOrientationTests.swift

@@ -59,23 +59,13 @@ final class CameraOrientationTests: XCTestCase {
     )
   }
 
-  private func waitForRoundTrip(with queue: DispatchQueue) {
-    let expectation = self.expectation(description: "Queue flush")
-    queue.async {
-      DispatchQueue.main.async {
-        expectation.fulfill()
-      }
-    }
-    waitForExpectations(timeout: 30, handler: nil)
-  }
-
   private func sendOrientation(
     _ orientation: UIDeviceOrientation,
     to cameraPlugin: CameraPlugin,
     captureSessionQueue: DispatchQueue
   ) {
     cameraPlugin.orientationChanged(createMockNotification(for: orientation))
-    waitForRoundTrip(with: captureSessionQueue)
+    waitForQueueRoundTrip(with: captureSessionQueue)
   }
 
   private func createMockNotification(for deviceOrientation: UIDeviceOrientation) -> Notification {

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPluginInitializeCameraTests.swift

@@ -35,16 +35,6 @@ final class CameraPluginInitializeCameraTests: XCTestCase {
     return (cameraPlugin, mockCamera, mockGlobalEventApi, captureSessionQueue)
   }
 
-  private func waitForRoundTrip(with queue: DispatchQueue) {
-    let expectation = self.expectation(description: "Queue flush")
-    queue.async {
-      DispatchQueue.main.async {
-        expectation.fulfill()
-      }
-    }
-    waitForExpectations(timeout: 30, handler: nil)
-  }
-
   func testInitializeCamera_setsCameraOnFrameAvailableCallback() {
     let (cameraPlugin, mockCamera, _, _) = createCameraPlugin()
     let expectation = expectation(description: "Initialization completed")
@@ -93,7 +83,7 @@ final class CameraPluginInitializeCameraTests: XCTestCase {
       XCTAssertNil(error)
     }
 
-    waitForRoundTrip(with: captureSessionQueue)
+    waitForQueueRoundTrip(with: captureSessionQueue)
 
     XCTAssertTrue(mockGlobalEventApi.deviceOrientationChangedCalled)
   }

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPreviewPauseTests.swift

@@ -14,15 +14,15 @@ import XCTest
 
 final class CameraPreviewPauseTests: XCTestCase {
   func testPausePreviewWithResult_shouldPausePreview() {
-    let camera = FLTCam()
+    let camera = CameraTestUtils.createTestCamera()
 
     camera.pausePreview()
 
     XCTAssertTrue(camera.isPreviewPaused)
   }
 
   func testResumePreviewWithResult_shouldResumePreview() {
-    let camera = FLTCam()
+    let camera = CameraTestUtils.createTestCamera()
 
     camera.resumePreview()
 

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

@@ -43,7 +43,7 @@ final class CameraSessionPresetsTests: XCTestCase {
     configuration.mediaSettings = CameraTestUtils.createDefaultMediaSettings(
       resolutionPreset: FCPPlatformResolutionPreset.max)
 
-    let _ = FLTCam(configuration: configuration, error: nil)
+    let _ = CameraTestUtils.createTestCamera(configuration)
 
     waitForExpectations(timeout: 30, handler: nil)
   }
@@ -67,7 +67,7 @@ final class CameraSessionPresetsTests: XCTestCase {
       resolutionPreset: FCPPlatformResolutionPreset.max)
     configuration.captureDeviceFactory = { _ in MockCaptureDevice() }
 
-    let _ = FLTCam(configuration: configuration, error: nil)
+    let _ = CameraTestUtils.createTestCamera(configuration)
 
     waitForExpectations(timeout: 30, handler: nil)
   }
@@ -91,7 +91,7 @@ final class CameraSessionPresetsTests: XCTestCase {
     configuration.mediaSettings = CameraTestUtils.createDefaultMediaSettings(
       resolutionPreset: FCPPlatformResolutionPreset.ultraHigh)
 
-    let _ = FLTCam(configuration: configuration, error: nil)
+    let _ = CameraTestUtils.createTestCamera(configuration)
 
     waitForExpectations(timeout: 30, handler: nil)
   }

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

@@ -126,7 +126,7 @@ final class CameraSettingsTests: XCTestCase {
     let configuration = CameraTestUtils.createTestCameraConfiguration()
     configuration.mediaSettingsWrapper = injectedWrapper
     configuration.mediaSettings = settings
-    let camera = FLTCam(configuration: configuration, error: nil)
+    let camera = CameraTestUtils.createTestCamera(configuration)
 
     // Expect FPS configuration is passed to camera device.
     wait(
@@ -200,7 +200,7 @@ final class CameraSettingsTests: XCTestCase {
 
     let configuration = CameraTestUtils.createTestCameraConfiguration()
     configuration.mediaSettings = settings
-    let camera = FLTCam(configuration: configuration, error: nil)
+    let camera = CameraTestUtils.createTestCamera(configuration)
 
     let range = camera.captureDevice.activeFormat.videoSupportedFrameRateRanges[0]
     XCTAssertLessThanOrEqual(range.minFrameRate, 60)

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraTestUtils.swift

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import Foundation
+import XCTest
 
 // Import Objectice-C part of the implementation when SwiftPM is used.
 #if canImport(camera_avfoundation_objc)
@@ -80,10 +80,20 @@ enum CameraTestUtils {
     return configuration
   }
 
-  static func createCameraWithCaptureSessionQueue(_ captureSessionQueue: DispatchQueue) -> FLTCam {
+  static func createTestCamera(_ configuration: FLTCamConfiguration) -> FLTCam {
+    return FLTCam(configuration: configuration, error: nil)
+  }
+
+  static func createTestCamera() -> FLTCam {
+    return createTestCamera(createTestCameraConfiguration())
+  }
+
+  static func createCameraWithCaptureSessionQueue(_ captureSessionQueue: DispatchQueue)
+    -> FLTCam
+  {
     let configuration = createTestCameraConfiguration()
     configuration.captureSessionQueue = captureSessionQueue
-    return FLTCam(configuration: configuration, error: nil)
+    return createTestCamera(configuration)
   }
 
   /// Creates a test sample buffer.
@@ -116,7 +126,7 @@ enum CameraTestUtils {
 
   /// Creates a test audio sample buffer.
   /// @return a test audio sample buffer.
-  static func createTestAudioSampleBuffer() -> CMSampleBuffer? {
+  static func createTestAudioSampleBuffer() -> CMSampleBuffer {
     var blockBuffer: CMBlockBuffer?
     CMBlockBufferCreateWithMemoryBlock(
       allocator: kCFAllocatorDefault,
@@ -129,8 +139,6 @@ enum CameraTestUtils {
       flags: kCMBlockBufferAssureMemoryNowFlag,
       blockBufferOut: &blockBuffer)
 
-    guard let blockBuffer = blockBuffer else { return nil }
-
     var formatDescription: CMFormatDescription?
     var basicDescription = AudioStreamBasicDescription(
       mSampleRate: 44100,
@@ -156,13 +164,33 @@ enum CameraTestUtils {
     var sampleBuffer: CMSampleBuffer?
     CMAudioSampleBufferCreateReadyWithPacketDescriptions(
       allocator: kCFAllocatorDefault,
-      dataBuffer: blockBuffer,
+      dataBuffer: blockBuffer!,
       formatDescription: formatDescription!,
       sampleCount: 1,
       presentationTimeStamp: .zero,
       packetDescriptions: nil,
       sampleBufferOut: &sampleBuffer)
 
-    return sampleBuffer
+    return sampleBuffer!
+  }
+}
+
+extension XCTestCase {
+  /// Wait until a round trip of a given `DispatchQueue` is complete. This allows for testing
+  /// side-effects of async functions that do not provide any notification of completion.
+  func waitForQueueRoundTrip(with queue: DispatchQueue) {
+    let expectation = expectation(description: "Queue flush")
+
+    queue.async {
+      if queue == DispatchQueue.main {
+        expectation.fulfill()
+      } else {
+        DispatchQueue.main.async {
+          expectation.fulfill()
+        }
+      }
+    }
+
+    wait(for: [expectation], timeout: 1)
   }
 }

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamExposureTests.swift

@@ -19,7 +19,7 @@ final class FLTCamExposureTests: XCTestCase {
     let configuration = CameraTestUtils.createTestCameraConfiguration()
     configuration.captureDeviceFactory = { _ in mockDevice }
     configuration.deviceOrientationProvider = mockDeviceOrientationProvider
-    let camera = FLTCam(configuration: configuration, error: nil)
+    let camera = CameraTestUtils.createTestCamera(configuration)
 
     return (camera, mockDevice, mockDeviceOrientationProvider)
   }

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamFocusTests.swift

@@ -20,7 +20,7 @@ final class FLTCamSetFocusModeTests: XCTestCase {
     let configuration = CameraTestUtils.createTestCameraConfiguration()
     configuration.captureDeviceFactory = { _ in mockDevice }
     configuration.deviceOrientationProvider = mockDeviceOrientationProvider
-    let camera = FLTCam(configuration: configuration, error: nil)
+    let camera = CameraTestUtils.createTestCamera(configuration)
 
     return (camera, mockDevice, mockDeviceOrientationProvider)
   }

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamSetDeviceOrientationTests.swift

@@ -14,8 +14,7 @@ import XCTest
 
 final class FLTCamSetDeviceOrientationTests: XCTestCase {
   private func createCamera() -> (FLTCam, MockCaptureConnection, MockCaptureConnection) {
-    let configuration = CameraTestUtils.createTestCameraConfiguration()
-    let camera = FLTCam(configuration: configuration, error: nil)
+    let camera = CameraTestUtils.createTestCamera()
 
     let mockCapturePhotoOutput = MockCapturePhotoOutput()
     let mockPhotoCaptureConnection = MockCaptureConnection()

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamSetFlashModeTests.swift

@@ -19,7 +19,7 @@ final class FLTCamSetFlashModeTests: XCTestCase {
 
     let configuration = CameraTestUtils.createTestCameraConfiguration()
     configuration.captureDeviceFactory = { _ in mockDevice }
-    let camera = FLTCam(configuration: configuration, error: nil)
+    let camera = CameraTestUtils.createTestCamera(configuration)
     camera.capturePhotoOutput = mockCapturePhotoOutput
 
     return (camera, mockDevice, mockCapturePhotoOutput)

packages/camera/camera_avfoundation/example/ios/RunnerTests/FLTCamZoomTests.swift

@@ -18,7 +18,7 @@ final class FLTCamZoomTests: XCTestCase {
 
     let configuration = CameraTestUtils.createTestCameraConfiguration()
     configuration.captureDeviceFactory = { _ in mockDevice }
-    let camera = FLTCam(configuration: configuration, error: nil)
+    let camera = CameraTestUtils.createTestCamera(configuration)
 
     return (camera, mockDevice)
   }

packages/camera/camera_avfoundation/example/ios/RunnerTests/PhotoCaptureTests.swift

@@ -17,7 +17,7 @@ final class PhotoCaptureTests: XCTestCase {
   private func createCam(with captureSessionQueue: DispatchQueue) -> FLTCam {
     let configuration = CameraTestUtils.createTestCameraConfiguration()
     configuration.captureSessionQueue = captureSessionQueue
-    return FLTCam(configuration: configuration, error: nil)
+    return CameraTestUtils.createTestCamera(configuration)
   }
 
   func testCaptureToFile_mustReportErrorToResultIfSavePhotoDelegateCompletionsWithError() {
@@ -174,7 +174,7 @@ final class PhotoCaptureTests: XCTestCase {
     let configuration = CameraTestUtils.createTestCameraConfiguration()
     configuration.captureSessionQueue = captureSessionQueue
     configuration.captureDeviceFactory = { _ in captureDeviceMock }
-    let cam = FLTCam(configuration: configuration, error: nil)
+    let cam = CameraTestUtils.createTestCamera(configuration)
 
     let filePath = "test"
     let mockOutput = MockCapturePhotoOutput()

packages/camera/camera_avfoundation/example/ios/RunnerTests/StreamingTests.swift

@@ -37,7 +37,7 @@ final class StreamingTests: XCTestCase {
     let configuration = CameraTestUtils.createTestCameraConfiguration()
     configuration.captureSessionQueue = captureSessionQueue
 
-    let camera = FLTCam(configuration: configuration, error: nil)
+    let camera = CameraTestUtils.createTestCamera(configuration)
     let sampleBuffer = CameraTestUtils.createTestSampleBuffer()
 
     return (camera, sampleBuffer)
@@ -54,10 +54,8 @@ final class StreamingTests: XCTestCase {
     let messenger = MockFlutterBinaryMessenger()
     camera.startImageStream(with: messenger, imageStreamHandler: handlerMock)
 
-    let expectation = XCTKVOExpectation(
-      keyPath: "isStreamingImages", object: camera, expectedValue: true)
-    let result = XCTWaiter.wait(for: [expectation], timeout: 1)
-    XCTAssertEqual(result, .completed)
+    waitForQueueRoundTrip(with: DispatchQueue.main)
+    XCTAssertEqual(camera.isStreamingImages, true)
 
     streamingExpectation.expectedFulfillmentCount = 4
     for _ in 0..<10 {
@@ -78,10 +76,8 @@ final class StreamingTests: XCTestCase {
     let messenger = MockFlutterBinaryMessenger()
     camera.startImageStream(with: messenger, imageStreamHandler: handlerMock)
 
-    let expectation = XCTKVOExpectation(
-      keyPath: "isStreamingImages", object: camera, expectedValue: true)
-    let result = XCTWaiter.wait(for: [expectation], timeout: 1)
-    XCTAssertEqual(result, .completed)
+    waitForQueueRoundTrip(with: DispatchQueue.main)
+    XCTAssertEqual(camera.isStreamingImages, true)
 
     streamingExpectation.expectedFulfillmentCount = 5
     for _ in 0..<10 {