Skip to content

[camera] Remove OCMock from CameraExposureTests and CameraFocusTests #8351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 18 commits into from
Jan 24, 2025
Merged

[camera] Remove OCMock from CameraExposureTests and CameraFocusTests #8351

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1185f80
Introduce protocols and remove OCMock from CameraFocusTests
mchudy Dec 27, 2024
34980c5
Migrate CameraExposureTests
mchudy Dec 6, 2024
a0a0f72
Format code
mchudy Dec 27, 2024
c0b986c
Use DI for mocking dependencies
mchudy Dec 30, 2024
d24ca23
Fix CI
mchudy Dec 30, 2024
efc892f
Fix imports
mchudy Dec 30, 2024
323ea39
Fix imports
mchudy Dec 30, 2024
a3817a0
Another try to fix imports
mchudy Dec 30, 2024
3b6e455
Change order in modulemap
mchudy Dec 30, 2024
defd0ba
Add FLTCamMediaSettingsAVWrapper to module map
mchudy Dec 30, 2024
0556d26
Remove new protocols from modulemap
mchudy Dec 31, 2024
09241f4
Add header search path
mchudy Dec 31, 2024
fa8f495
Fix formatting
mchudy Dec 31, 2024
d4c4f3a
Flatten the structure
mchudy Jan 2, 2025
f58fb9b
Add comments and use the same names for protocol properties
mchudy Jan 16, 2025
e3f1afd
Remove logic from mock methods
mchudy Jan 16, 2025
cd58a88
Clean up stub methods
mchudy Jan 24, 2025
4107bee
Fix formatting
mchudy Jan 24, 2025
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
Prev Previous commit
Next Next commit
Add header search path
  • Loading branch information
@mchudy
mchudy committed Jan 14, 2025
commit 09241f414a1e6e16384d5b0663d748e283e27755
1 change: 1 addition & 0 deletions packages/camera/camera_avfoundation/ios/camera_avfoundation/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ let package = Package(
],
cSettings: [
.headerSearchPath("include/camera_avfoundation")
.headerSearchPath("include/camera_avfoundation/Protocols")
]
)
]
Expand Down
2 changes: 1 addition & 1 deletion .../ios/camera_avfoundation/Sources/camera_avfoundation/include/camera_avfoundation/FLTCam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#import "CameraProperties.h"
#import "FLTCamMediaSettingsAVWrapper.h"
#import "messages.g.h"
#import "Protocols/FLTCaptureDeviceControlling.h"
#import "FLTCaptureDeviceControlling.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion ...on/Sources/camera_avfoundation/include/camera_avfoundation/FLTCamMediaSettingsAVWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@import AVFoundation;
@import Foundation;

#import "Protocols/FLTCaptureDeviceControlling.h"
#import "FLTCaptureDeviceControlling.h"

NS_ASSUME_NONNULL_BEGIN

Expand Down
2 changes: 1 addition & 1 deletion ...camera_avfoundation/Sources/camera_avfoundation/include/camera_avfoundation/FLTCam_Test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
// found in the LICENSE file.

#import "FLTCam.h"
#import "FLTCaptureDeviceControlling.h"
#import "FLTDeviceOrientationProviding.h"
#import "FLTSavePhotoDelegate.h"
#import "Protocols/FLTCaptureDeviceControlling.h"

/// Determines the video dimensions (width and height) for a given capture device format.
/// Used in tests to mock CMVideoFormatDescriptionGetDimensions.
Expand Down