Skip to content

[camera] Remove OCMock from AvailableCamerasTests, CameraOrientationTests and ThreadSafeEventChannelTests #8363

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 33 commits into from
Feb 7, 2025
Merged

[camera] Remove OCMock from AvailableCamerasTests, CameraOrientationTests and ThreadSafeEventChannelTests #8363

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
5070536
Introduce protocols and remove OCMock from CameraFocusTests
mchudy Dec 27, 2024
335deed
Migrate CameraExposureTests
mchudy Dec 6, 2024
ca581d7
Format code
mchudy Dec 27, 2024
2e3c8e7
Use DI for mocking dependencies
mchudy Dec 30, 2024
c96e9da
Fix CI
mchudy Dec 30, 2024
7155838
Fix imports
mchudy Dec 30, 2024
3cd5341
Fix imports
mchudy Dec 30, 2024
8256579
Another try to fix imports
mchudy Dec 30, 2024
27f31c0
Change order in modulemap
mchudy Dec 30, 2024
7a25909
Add FLTCamMediaSettingsAVWrapper to module map
mchudy Dec 30, 2024
cdb1578
Remove new protocols from modulemap
mchudy Dec 31, 2024
486686a
Add header search path
mchudy Dec 31, 2024
2a070ca
Fix formatting
mchudy Dec 31, 2024
04f1e8b
Flatten the structure
mchudy Jan 2, 2025
0d81c7f
Remove OCMock from CameraOrientationTests
mchudy Jan 2, 2025
bb1cf1a
Add protocol for event channel
mchudy Jan 2, 2025
de26f9c
Remove OCMock from ThreadSafeEventChannelTests
mchudy Jan 2, 2025
4b45f30
Introduce FLTCameraDeviceDiscovering
mchudy Jan 2, 2025
abb1fdb
Update changelog
mchudy Jan 2, 2025
96e300a
Make default implementations for protocols and clean up the DI to mak…
mchudy Jan 3, 2025
88f9fe6
Introduce new protocol for creating capture inputs
mchudy Jan 6, 2025
0063b6f
Fix DI and tests
mchudy Jan 7, 2025
327233d
Rename FLTCaptureDeviceControlling to FLTCaptureDevice
mchudy Jan 9, 2025
8235080
Merge remote-tracking branch 'upstream/main' into feature/camera-ocmo…
mchudy Jan 14, 2025
37bb576
Merge remote-tracking branch 'upstream/main' into feature/camera-ocmo…
mchudy Jan 24, 2025
6cdf473
Fix conflicts
mchudy Jan 24, 2025
469bc8e
Add doc comments
mchudy Jan 24, 2025
5ea3480
Rename property
mchudy Jan 24, 2025
7f20088
Fix formatting
mchudy Jan 24, 2025
64c3d1f
Code cleanup
mchudy Jan 30, 2025
1ad5966
Fix warning with nils being passed in tests by introducing new mocks
mchudy Jan 31, 2025
40cce59
Reintroduce default protocol wrappers and rely on NSObject for safer …
mchudy Feb 2, 2025
fc0e826
Fix nits
mchudy Feb 6, 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
Another try to fix imports
  • Loading branch information
@mchudy
mchudy committed Dec 30, 2024
commit 8256579dfa2fe02b18aea90ec8cf15fef17dc597
3 changes: 2 additions & 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 @@ -6,9 +6,10 @@
@import Foundation;
@import Flutter;

#import "FLTCaptureDeviceControlling.h"

#import "CameraProperties.h"
#import "FLTCamMediaSettingsAVWrapper.h"
#import "Protocols/FLTCaptureDeviceControlling.h"
#import "messages.g.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
4 changes: 2 additions & 2 deletions ...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,8 +3,8 @@
// found in the LICENSE file.

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

/// Determines the video dimensions (width and height) for a given capture device format.
Expand Down
Loading