Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/camera/camera_avfoundation/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.9.18+10

* Backfills unit tests for the `FLTCam` class.
* Makes `exposureMode`, `focusMode`, and `flashMode` properties of `FLTCam` private.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice


## 0.9.18+9

* Backfills unit tests for `CameraPlugin` class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,8 @@
970ADAC02D6764CC00EFDCD9 /* MockEventChannel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 970ADABF2D6764CC00EFDCD9 /* MockEventChannel.swift */; };
972CA92B2D5A1D8C004B846F /* CameraPropertiesTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 972CA92A2D5A1D8C004B846F /* CameraPropertiesTests.swift */; };
972CA92D2D5A28C4004B846F /* QueueUtilsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 972CA92C2D5A28C4004B846F /* QueueUtilsTests.swift */; };
972CA9312D5A366C004B846F /* CameraExposureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 972CA9302D5A366C004B846F /* CameraExposureTests.swift */; };
977A25202D5A439300931E34 /* AvailableCamerasTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 977A251F2D5A439300931E34 /* AvailableCamerasTests.swift */; };
977A25222D5A49EC00931E34 /* CameraFocusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 977A25212D5A49EC00931E34 /* CameraFocusTests.swift */; };
977A25222D5A49EC00931E34 /* FLTCamFocusTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 977A25212D5A49EC00931E34 /* FLTCamFocusTests.swift */; };
977A25242D5A511600931E34 /* CameraPermissionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 977A25232D5A511600931E34 /* CameraPermissionTests.swift */; };
977CAC9F2D5E5180001E5DC3 /* ThreadSafeEventChannelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 977CAC9E2D5E5180001E5DC3 /* ThreadSafeEventChannelTests.swift */; };
978296CF2D5F744B0009BDD3 /* PhotoCaptureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 978296CE2D5F744B0009BDD3 /* PhotoCaptureTests.swift */; };
Expand All @@ -49,8 +48,10 @@
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
97DB234D2D566D0700CEFE66 /* CameraPreviewPauseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 97DB234C2D566D0700CEFE66 /* CameraPreviewPauseTests.swift */; };
E0CDBAC227CD9729002561D9 /* CameraTestUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = E0CDBAC127CD9729002561D9 /* CameraTestUtils.m */; };
E11D6A912D82C7740031E6C5 /* FLTCamExposureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E11D6A902D82C7740031E6C5 /* FLTCamExposureTests.swift */; };
E12C4FF62D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E12C4FF52D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift */; };
E12C4FF82D68E85500515E70 /* MockFLTCameraPermissionManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = E12C4FF72D68E85500515E70 /* MockFLTCameraPermissionManager.swift */; };
E16602952D8471C0003CFE12 /* FLTCamZoomTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E16602942D8471C0003CFE12 /* FLTCamZoomTests.swift */; };
E1A5F4E32D80259C0005BA64 /* FLTCamSetFlashModeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */; };
E1FFEAAD2D6C8DD700B14107 /* MockFLTCam.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1FFEAAC2D6C8DD700B14107 /* MockFLTCam.swift */; };
E1FFEAAF2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1FFEAAE2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift */; };
Expand Down Expand Up @@ -116,11 +117,10 @@
970ADABF2D6764CC00EFDCD9 /* MockEventChannel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockEventChannel.swift; sourceTree = "<group>"; };
972CA92A2D5A1D8C004B846F /* CameraPropertiesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPropertiesTests.swift; sourceTree = "<group>"; };
972CA92C2D5A28C4004B846F /* QueueUtilsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QueueUtilsTests.swift; sourceTree = "<group>"; };
972CA9302D5A366C004B846F /* CameraExposureTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraExposureTests.swift; sourceTree = "<group>"; };
9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
977A251F2D5A439300931E34 /* AvailableCamerasTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AvailableCamerasTests.swift; sourceTree = "<group>"; };
977A25212D5A49EC00931E34 /* CameraFocusTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraFocusTests.swift; sourceTree = "<group>"; };
977A25212D5A49EC00931E34 /* FLTCamFocusTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamFocusTests.swift; sourceTree = "<group>"; };
977A25232D5A511600931E34 /* CameraPermissionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPermissionTests.swift; sourceTree = "<group>"; };
977CAC9E2D5E5180001E5DC3 /* ThreadSafeEventChannelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ThreadSafeEventChannelTests.swift; sourceTree = "<group>"; };
978296CE2D5F744B0009BDD3 /* PhotoCaptureTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoCaptureTests.swift; sourceTree = "<group>"; };
Expand All @@ -147,8 +147,10 @@
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>"; };
E0CDBAC027CD9729002561D9 /* CameraTestUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CameraTestUtils.h; sourceTree = "<group>"; };
E0CDBAC127CD9729002561D9 /* CameraTestUtils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CameraTestUtils.m; sourceTree = "<group>"; };
E11D6A902D82C7740031E6C5 /* FLTCamExposureTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamExposureTests.swift; sourceTree = "<group>"; };
E12C4FF52D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPluginDelegatingMethodTests.swift; sourceTree = "<group>"; };
E12C4FF72D68E85500515E70 /* MockFLTCameraPermissionManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockFLTCameraPermissionManager.swift; sourceTree = "<group>"; };
E16602942D8471C0003CFE12 /* FLTCamZoomTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamZoomTests.swift; sourceTree = "<group>"; };
E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FLTCamSetFlashModeTests.swift; sourceTree = "<group>"; };
E1FFEAAC2D6C8DD700B14107 /* MockFLTCam.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockFLTCam.swift; sourceTree = "<group>"; };
E1FFEAAE2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraPluginCreateCameraTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -196,9 +198,7 @@
97DB234C2D566D0700CEFE66 /* CameraPreviewPauseTests.swift */,
972CA92A2D5A1D8C004B846F /* CameraPropertiesTests.swift */,
972CA92C2D5A28C4004B846F /* QueueUtilsTests.swift */,
972CA9302D5A366C004B846F /* CameraExposureTests.swift */,
977A251F2D5A439300931E34 /* AvailableCamerasTests.swift */,
977A25212D5A49EC00931E34 /* CameraFocusTests.swift */,
977A25232D5A511600931E34 /* CameraPermissionTests.swift */,
97C0FFAD2D5E023200A36284 /* SavePhotoDelegateTests.swift */,
977CAC9E2D5E5180001E5DC3 /* ThreadSafeEventChannelTests.swift */,
Expand All @@ -208,7 +208,10 @@
E12C4FF52D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift */,
E1FFEAAE2D6CDA8C00B14107 /* CameraPluginCreateCameraTests.swift */,
E1FFEAB02D6CDE5B00B14107 /* CameraPluginInitializeCameraTests.swift */,
E11D6A902D82C7740031E6C5 /* FLTCamExposureTests.swift */,
977A25212D5A49EC00931E34 /* FLTCamFocusTests.swift */,
E1A5F4E22D80259C0005BA64 /* FLTCamSetFlashModeTests.swift */,
E16602942D8471C0003CFE12 /* FLTCamZoomTests.swift */,
);
path = RunnerTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -539,6 +542,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
E11D6A912D82C7740031E6C5 /* FLTCamExposureTests.swift in Sources */,
97BD4A0E2D5CC5AE00F857D5 /* CameraSettingsTests.swift in Sources */,
972CA92D2D5A28C4004B846F /* QueueUtilsTests.swift in Sources */,
E1FFEAB12D6CDE5B00B14107 /* CameraPluginInitializeCameraTests.swift in Sources */,
Expand All @@ -562,14 +566,14 @@
97DB234D2D566D0700CEFE66 /* CameraPreviewPauseTests.swift in Sources */,
970ADAC02D6764CC00EFDCD9 /* MockEventChannel.swift in Sources */,
977A25202D5A439300931E34 /* AvailableCamerasTests.swift in Sources */,
972CA9312D5A366C004B846F /* CameraExposureTests.swift in Sources */,
E1FFEAAD2D6C8DD700B14107 /* MockFLTCam.swift in Sources */,
7F29EB292D26A59000740257 /* MockCameraDeviceDiscoverer.m in Sources */,
E16602952D8471C0003CFE12 /* FLTCamZoomTests.swift in Sources */,
97BD4A102D5CE13500F857D5 /* CameraSessionPresetsTests.swift in Sources */,
7FD582272D57C020003B1200 /* MockAssetWriter.m in Sources */,
979B3E022D5BA48F009BDE1A /* CameraOrientationTests.swift in Sources */,
E12C4FF62D68C69000515E70 /* CameraPluginDelegatingMethodTests.swift in Sources */,
977A25222D5A49EC00931E34 /* CameraFocusTests.swift in Sources */,
977A25222D5A49EC00931E34 /* FLTCamFocusTests.swift in Sources */,
978D90B42D5F630300CD817E /* StreamingTests.swift in Sources */,
7F29EB412D281C7E00740257 /* MockCaptureSession.m in Sources */,
7FCEDD352D43C2B900EA1CA8 /* MockDeviceOrientationProvider.m in Sources */,
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
// Copyright 2013 The Flutter Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

import XCTest

@testable import camera_avfoundation

final class FLTCamExposureTests: XCTestCase {
private func createCamera() -> (FLTCam, MockCaptureDevice, MockDeviceOrientationProvider) {
let mockDevice = MockCaptureDevice()
let mockDeviceOrientationProvider = MockDeviceOrientationProvider()

let configuration = FLTCreateTestCameraConfiguration()
configuration.captureDeviceFactory = { mockDevice }
configuration.deviceOrientationProvider = mockDeviceOrientationProvider
let camera = FLTCreateCamWithConfiguration(configuration)

return (camera, mockDevice, mockDeviceOrientationProvider)
}

func testSetExposureModeLocked_setsAuthExposeMode() {
let (camera, mockDevice, _) = createCamera()

mockDevice.setExposureModeStub = { mode in
// AVCaptureExposureModeAutoExpose automatically adjusts the exposure one time, and then
// locks exposure for the device
XCTAssertEqual(mode, .autoExpose)
}

camera.setExposureMode(.locked)
}

func testSetExposureModeAuto_setsContinousAutoExposureMode_ifSupported() {
let (camera, mockDevice, _) = createCamera()

// All exposure modes are supported
mockDevice.isExposureModeSupportedStub = { _ in true }

mockDevice.setExposureModeStub = { mode in
XCTAssertEqual(mode, .continuousAutoExposure)
}

camera.setExposureMode(.auto)
}

func testSetExposureModeAuto_setsAutoExposeMode_ifContinousAutoIsNotSupported() {
let (camera, mockDevice, _) = createCamera()

// Continous auto exposure is not supported
mockDevice.isExposureModeSupportedStub = { mode in
mode != .continuousAutoExposure
}

mockDevice.setExposureModeStub = { mode in
XCTAssertEqual(mode, .autoExpose)
}

camera.setExposureMode(.auto)
}

func testSetExposurePoint_setsExposurePointOfInterest() {
let (camera, mockDevice, mockDeviceOrientationProvider) = createCamera()
// UI is currently in landscape left orientation.
mockDeviceOrientationProvider.orientation = .landscapeLeft
// Exposure point of interest is supported.
mockDevice.exposurePointOfInterestSupported = true

// Verify the focus point of interest has been set.
var setPoint = CGPoint.zero
mockDevice.setExposurePointOfInterestStub = { point in
if point == CGPoint(x: 1, y: 1) {
setPoint = point
}
}

let expectation = expectation(description: "Completion called")
camera.setExposurePoint(FCPPlatformPoint.makeWith(x: 1, y: 1)) { error in
XCTAssertNil(error)
expectation.fulfill()
}

waitForExpectations(timeout: 30, handler: nil)
XCTAssertEqual(setPoint, CGPoint(x: 1.0, y: 1.0))
}

func testSetExposurePoint_returnsError_ifNotSupported() {
let (camera, mockDevice, mockDeviceOrientationProvider) = createCamera()
// UI is currently in landscape left orientation.
mockDeviceOrientationProvider.orientation = .landscapeLeft
// Exposure point of interest is not supported.
mockDevice.exposurePointOfInterestSupported = false

let expectation = expectation(description: "Completion with error")

camera.setExposurePoint(FCPPlatformPoint.makeWith(x: 1, y: 1)) { error in
XCTAssertNotNil(error)
XCTAssertEqual(error?.code, "setExposurePointFailed")
XCTAssertEqual(error?.message, "Device does not have exposure point capabilities")
expectation.fulfill()
}

waitForExpectations(timeout: 30, handler: nil)
}

func testSetExposureOffset_setsExposureTargetBias() {
let (camera, mockDevice, _) = createCamera()

let targetOffset = CGFloat(1.0)

var setExposureTargetBiasCalled = false
mockDevice.setExposureTargetBiasStub = { bias, handler in
XCTAssertEqual(bias, Float(targetOffset))
setExposureTargetBiasCalled = true
}

camera.setExposureOffset(targetOffset)

XCTAssertTrue(setExposureTargetBiasCalled)
}

func testMaximumExposureOffset_returnsDeviceMaxExposureTargetBias() {
let (camera, mockDevice, _) = createCamera()

let targetOffset = CGFloat(1.0)

mockDevice.maxExposureTargetBias = Float(targetOffset)

XCTAssertEqual(camera.maximumExposureOffset, targetOffset)
}

func testMinimumExposureOffset_returnsDeviceMinExposureTargetBias() {
let (camera, mockDevice, _) = createCamera()

let targetOffset = CGFloat(1.0)

mockDevice.minExposureTargetBias = Float(targetOffset)

XCTAssertEqual(camera.minimumExposureOffset, targetOffset)
}
}
Loading