[camera] Remove OCMock from CameraExposureTests and CameraFocusTests by mchudy · Pull Request #8351 · flutter/packages

mchudy · 2024-12-27T13:24:39Z

Extracted from #8342 to keep PRs smaller

Introduces FLTDeviceOrientationProviding and FLTCaptureDeviceControlling protocols
Removes OCMock.h reference from CameraExposureTests.h and CameraFocusTests.h

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

hellohuanlin

Overall looks very good!

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraExposureTests.m

hellohuanlin · 2024-12-27T19:08:09Z

CC @LouiseHsu who recently did a pretty big swift migration for in-app purchase plugin.

mchudy · 2024-12-30T13:54:15Z

I'm not sure why the CI build fails. Locally it builds successfully. Do you have any tip maybe what can be the cause of this issue?

Failed to build iOS app
Lexical or Preprocessor Issue (Xcode): 'FLTCaptureDeviceControlling.h' file not found
/Volumes/Work/s/w/ir/x/w/packages/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/include/camera_avfoundation/FLTCamMediaSettingsAVWrapper.h:7:8

hellohuanlin · 2024-12-30T19:38:47Z

I'm not sure why the CI build fails. Locally it builds successfully. Do you have any tip maybe what can be the cause of this issue?
Failed to build iOS app
Lexical or Preprocessor Issue (Xcode): 'FLTCaptureDeviceControlling.h' file not found
/Volumes/Work/s/w/ir/x/w/packages/packages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/include/camera_avfoundation/FLTCamMediaSettingsAVWrapper.h:7:8

it's been a while since i touched this, but it sounds like either module map or umbrella header. I'd look into a similar header and see how it is setup.

hellohuanlin · 2024-12-30T19:42:16Z

I don't find a 2nd reviewer from the CODEOWNER for this plugin. Maybe @LouiseHsu who recently did a similar swift migration?

mchudy · 2025-01-02T09:47:41Z

I fixed the CI, kind of a workaround (for some reason I cannot get this to work with subfolders). I'm gonna try to fix that in further PRs, but I don't want to block this one.

packages/camera/camera_avfoundation/CHANGELOG.md

...dation/Sources/camera_avfoundation/include/camera_avfoundation/FLTCaptureDeviceControlling.h

...tion/Sources/camera_avfoundation/include/camera_avfoundation/FLTDeviceOrientationProviding.h

...ages/camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/FLTCam.m

packages/camera/camera_avfoundation/example/ios/RunnerTests/MockDeviceOrientationProvider.m

packages/camera/camera_avfoundation/example/ios/RunnerTests/MockCaptureDeviceController.m

packages/camera/camera_avfoundation/example/ios/RunnerTests/MockCaptureDeviceController.h

packages/camera/camera_avfoundation/example/ios/RunnerTests/MockCaptureDeviceController.m

stuartmorgan-g

LGTM, thanks!

…usTests (flutter/packages#8351)

flutter/packages@3d3ab7b...258f6dc 2025-01-24 adsonpleal@gmail.com [shared_preferences] Add shared preferences devtool (flutter/packages#8494) 2025-01-24 tarrinneal@gmail.com [shared_preferences] update List<String> encode/decode (flutter/packages#8335) 2025-01-24 engine-flutter-autoroll@skia.org Manual roll Flutter from c1561a4 to c1ffaa9 (21 revisions) (flutter/packages#8498) 2025-01-24 stuartmorgan@google.com [ios_platform_images] Switch to `loadImage` (flutter/packages#8216) 2025-01-24 mchudy@users.noreply.github.com [camera] Remove OCMock from CameraExposureTests and CameraFocusTests (flutter/packages#8351) 2025-01-24 tarrinneal@gmail.com [shared_preferences] Tool for migrating from legacy shared_preferences to shared_preferences_async (flutter/packages#8229) 2025-01-23 stuartmorgan@google.com Revert "[shared_preferences] Add shared preferences devtool" (flutter/packages#8493) 2025-01-23 20254485+kaboc@users.noreply.github.com [go_router] Fix return type of current state getter to be non-nullable (flutter/packages#8173) 2025-01-23 engine-flutter-autoroll@skia.org Manual roll Flutter from b2f515f to c1561a4 (18 revisions) (flutter/packages#8491) 2025-01-23 tarrinneal@gmail.com [pigeon] fixes event channel dart instance name usage and adds test (flutter/packages#8483) 2025-01-23 51104750+AffanShaikhsurab@users.noreply.github.com [go _route] fragment parameter added (flutter/packages#8232) 2025-01-23 mchudy@users.noreply.github.com [in_app_purchase] Update in_app_purchase_android version in in_app_purchase (flutter/packages#8463) 2025-01-23 stuartmorgan@google.com [image_picker] Reference alternate macOS implementations (flutter/packages#8487) 2025-01-23 32538273+ValentinVignal@users.noreply.github.com [rfw] Activate leak testing (flutter/packages#8370) 2025-01-23 32538273+ValentinVignal@users.noreply.github.com [video_player] Activate leak testing (flutter/packages#8379) 2025-01-23 engine-flutter-autoroll@skia.org Manual roll Flutter from b9e86a5 to b2f515f (42 revisions) (flutter/packages#8482) 2025-01-23 olli.helenius@codemate.com [camera] Add API support query for image streaming (app-facing) (flutter/packages#8422) 2025-01-23 engine-flutter-autoroll@skia.org Manual roll Flutter from b9e86a5 to eb6af3d (13 revisions) (flutter/packages#8473) 2025-01-23 adsonpleal@gmail.com [shared_preferences] Add shared preferences devtool (flutter/packages#8322) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages-flutter-autoroll Please CC flutter-ecosystem@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md

…ests and ThreadSafeEventChannelTests (#8363) Follow-up on #8342. This should be merged after #8351 - Removes OCMock dependency in `AvailableCamerasTests.m`, `CameraOrientationTests.m` and `ThreadSafeEventChannelTests.m` - Introduces new protocol wrappers to enable mocking `FLTEventChannel` and `FLTCameraDeviceDiscovering`

…lutter#8351) Extracted from flutter#8342 to keep PRs smaller - Introduces `FLTDeviceOrientationProviding` and `FLTCaptureDeviceControlling` protocols - Removes `OCMock.h` reference from `CameraExposureTests.h` and `CameraFocusTests.h`

…ests and ThreadSafeEventChannelTests (flutter#8363) Follow-up on flutter#8342. This should be merged after flutter#8351 - Removes OCMock dependency in `AvailableCamerasTests.m`, `CameraOrientationTests.m` and `ThreadSafeEventChannelTests.m` - Introduces new protocol wrappers to enable mocking `FLTEventChannel` and `FLTCameraDeviceDiscovering`

…lutter#8351) Extracted from flutter#8342 to keep PRs smaller - Introduces `FLTDeviceOrientationProviding` and `FLTCaptureDeviceControlling` protocols - Removes `OCMock.h` reference from `CameraExposureTests.h` and `CameraFocusTests.h`

…ests and ThreadSafeEventChannelTests (flutter#8363) Follow-up on flutter#8342. This should be merged after flutter#8351 - Removes OCMock dependency in `AvailableCamerasTests.m`, `CameraOrientationTests.m` and `ThreadSafeEventChannelTests.m` - Introduces new protocol wrappers to enable mocking `FLTEventChannel` and `FLTCameraDeviceDiscovering`

mchudy requested a review from hellohuanlin as a code owner December 27, 2024 13:24

github-actions bot added p: camera platform-ios platform-macos labels Dec 27, 2024

mchudy mentioned this pull request Dec 27, 2024

[camera] Remove OCMock from tests #8342

Closed

11 tasks

hellohuanlin reviewed Dec 27, 2024

View reviewed changes

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraExposureTests.m Outdated Show resolved Hide resolved

mchudy force-pushed the feature/camera-ocmock-refactoring-part2 branch 2 times, most recently from e7d6b59 to c597ad3 Compare December 30, 2024 12:40

hellohuanlin approved these changes Dec 30, 2024

View reviewed changes

hellohuanlin requested a review from LouiseHsu December 30, 2024 19:42

mchudy force-pushed the feature/camera-ocmock-refactoring-part2 branch from 840af1d to 8256579 Compare December 30, 2024 22:47

hellohuanlin requested a review from jmagman December 30, 2024 23:20

mchudy force-pushed the feature/camera-ocmock-refactoring-part2 branch 8 times, most recently from d65a805 to 04f1e8b Compare January 2, 2025 09:12

mchudy mentioned this pull request Jan 2, 2025

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

Merged

11 tasks

mchudy added 4 commits January 14, 2025 10:59

Introduce protocols and remove OCMock from CameraFocusTests

1185f80

Migrate CameraExposureTests

34980c5

Format code

a0a0f72

Use DI for mocking dependencies

c0b986c

Flatten the structure

d4c4f3a

mchudy force-pushed the feature/camera-ocmock-refactoring-part2 branch from 04f1e8b to d4c4f3a Compare January 14, 2025 10:01

stuartmorgan-g requested changes Jan 15, 2025

View reviewed changes

Add comments and use the same names for protocol properties

f58fb9b

mchudy requested a review from stuartmorgan-g January 16, 2025 14:47

mchudy force-pushed the feature/camera-ocmock-refactoring-part2 branch from 81fe294 to 0670369 Compare January 17, 2025 14:14

Remove logic from mock methods

e3f1afd

mchudy force-pushed the feature/camera-ocmock-refactoring-part2 branch from 0670369 to e3f1afd Compare January 17, 2025 14:15

stuartmorgan-g reviewed Jan 23, 2025

View reviewed changes

mchudy added 2 commits January 24, 2025 09:44

Clean up stub methods

cd58a88

Fix formatting

4107bee

mchudy requested a review from stuartmorgan-g January 24, 2025 09:52

stuartmorgan-g approved these changes Jan 24, 2025

View reviewed changes

stuartmorgan-g added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 24, 2025

auto-submit bot merged commit 73857c6 into flutter:main Jan 24, 2025
77 checks passed

mchudy deleted the feature/camera-ocmock-refactoring-part2 branch January 24, 2025 11:32

engine-flutter-autoroll mentioned this pull request Jan 24, 2025

Roll Packages from 3d3ab7bcb07e to 73857c68c1ce (15 revisions) flutter/flutter#162160

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2025

73857c6 [camera] Remove OCMock from CameraExposureTests and CameraFoc…

a9ee09a

…usTests (flutter/packages#8351)

engine-flutter-autoroll mentioned this pull request Jan 24, 2025

Roll Packages from 3d3ab7bcb07e to 73857c68c1ce (15 revisions) flutter/flutter#162169

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2025

73857c6 [camera] Remove OCMock from CameraExposureTests and CameraFoc…

ce6c6ec

…usTests (flutter/packages#8351)

engine-flutter-autoroll mentioned this pull request Jan 24, 2025

Roll Packages from 3d3ab7bcb07e to 1833b326a1d0 (16 revisions) flutter/flutter#162175

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 24, 2025

73857c6 [camera] Remove OCMock from CameraExposureTests and CameraFoc…

ddd9b37

…usTests (flutter/packages#8351)

engine-flutter-autoroll mentioned this pull request Jan 27, 2025

Roll Packages from 3d3ab7bcb07e to 258f6dce6a49 (19 revisions) flutter/flutter#162254

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Jan 27, 2025

73857c6 [camera] Remove OCMock from CameraExposureTests and CameraFoc…

77246b4

…usTests (flutter/packages#8351)

Conversation

mchudy commented Dec 27, 2024

Pre-launch Checklist

Uh oh!

hellohuanlin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

hellohuanlin commented Dec 27, 2024

Uh oh!

mchudy commented Dec 30, 2024

Uh oh!

hellohuanlin commented Dec 30, 2024

Uh oh!

hellohuanlin commented Dec 30, 2024

Uh oh!

mchudy commented Jan 2, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

stuartmorgan-g left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants