[google_maps_flutter] Remove use of OCMock #10863

stuartmorgan-g · 2026-01-23T20:35:41Z

Eliminates usage of OCMock in the native iOS unit tests:

Creates a protocol for image asset loading that wraps that part of the registrar and the UIImage class method to replace mocking with injecting a protocol implementation.
Creates an abstract delegate for event reporting, instead of all of the sub-controllers communicating directly with the FlutterAPI instance.
Creates an abstract delegate for tile queries, instead of all of the tile controller communicating directly with the FlutterAPI instance.
Replaces mocking of our test subclass of the Google Maps view object with slightly more logic on that existing test subclass.
Replaces mocking of our existing protocols with simple manual fakes that lets us test the same assertions.
Eliminates static mock testing of GMSCameraUpdate.

Unblocks flutter/flutter#119108

Pre-Review Checklist

Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the gemini-code-assist bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.

Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling. ↩ ↩² ↩³

gemini-code-assist

Code Review

This pull request refactors the iOS native unit tests for google_maps_flutter by eliminating the use of OCMock. It introduces new protocols (FGMAssetProvider, FGMMapEventDelegate, FGMTileProviderDelegate) and their concrete implementations to allow for dependency injection, thereby improving testability. The changes include updating controller initializers to use these new delegates/providers and replacing OCMock-based test setups with custom fakes and direct assertions. The CHANGELOG.md and pubspec.yaml have been updated to reflect these changes. The refactoring is comprehensive and aligns well with the stated objective of improving testability.

stuartmorgan-g · 2026-01-23T20:39:18Z

...ogle_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/FGMConversionsUtilsTests.m

+  // GMSCameraUpdate is not inspectable, so this test just ensures that the codepath
+  // doesn't throw. FGMGetCameraUpdateForPigeonCameraUpdate is simple enough that
+  // injecting a wrapper would not meaningfully improve test coverage, since the non-test
+  // implementation would be about as complex as the conversion function itself.


This set of changes is the only place where this PR actually removes test coverage. The only way to test this without the static class mock (the worst kind of OCMock mocking, so I would want to eliminate this even without OCMock being problematic for Swift migration) would be to make a factory protocol that wraps all of the static factor methods on GMSCameraUpdate.

I did seriously consider that, but the implementation being tested is almost as simple as the wrapper class we would need to write—by intentional design of FGMPlatformCameraUpdate being a direct parallel of GMSCameraUpdate. That wrapper class wouldn't be testable, so it felt like it would be improving test coverage on paper without meaningfully adding any real coverage.

If anyone feels strongly the other way, I can add the wrapper.

stuartmorgan-g · 2026-01-23T20:40:43Z

(Ideally I would have done this before #10852 rather than after, but I didn't think about that until it was too late. Once #10852 it'll be easy to sync this change across all the copies before landing this.)

...es/google_maps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/TestMapEventHandler.h

...er_ios/Sources/google_maps_flutter_ios/include/google_maps_flutter_ios/FGMMapEventDelegate.h

vashworth · 2026-02-03T20:34:28Z

...ter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsGroundOverlayControllerTests.m

                            zoomLevel:nil]
                    withMapView:[GoogleMapsGroundOverlayControllerTests mapView]
-                      registrar:nil
+                  assetProvider:[[TestAssetProvider alloc] init]


Why is this not nil?

It's supposed to be a non-nullable parameter (IIRC I fix all the missing NS_ASSUME_NONNULL_BEGIN in test headers in a follow-up PR I have ready; I didn't notice them in this one).

Historically we have a lot of places where we play fast and loose in tests with passing nil in places that are (explicitly declared or just assumed in implementations) non-nullable, which generally works because Obj-C, but it makes Swift migrations more painful. So I tried to provide stubs instead of taking shortcuts.

...ps_flutter/google_maps_flutter_ios/example/ios/RunnerTests/GoogleMapsMarkerControllerTests.m

vashworth

LGTM with a couple small comments

…s#10863)

flutter/packages@5b1bea8...3bddf2c 2026-02-04 ivan-vanyusho@yandex-team.ru [camera_avfoundation] ios saving path (flutter/packages#10832) 2026-02-04 stuartmorgan@google.com [video_player] Remove OCMock (flutter/packages#10932) 2026-02-04 stuartmorgan@google.com [google_maps_flutter] Remove use of OCMock (flutter/packages#10863) 2026-02-04 32538273+ValentinVignal@users.noreply.github.com [go_router_builder] Add support for `@TypedGoRouteParameter` to customize parameter names (flutter/packages#10793) 2026-02-03 engine-flutter-autoroll@skia.org Roll Flutter from c305f1f to bf701fe (9 revisions) (flutter/packages#10957) 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

…r#181918) flutter/packages@5b1bea8...3bddf2c 2026-02-04 ivan-vanyusho@yandex-team.ru [camera_avfoundation] ios saving path (flutter/packages#10832) 2026-02-04 stuartmorgan@google.com [video_player] Remove OCMock (flutter/packages#10932) 2026-02-04 stuartmorgan@google.com [google_maps_flutter] Remove use of OCMock (flutter/packages#10863) 2026-02-04 32538273+ValentinVignal@users.noreply.github.com [go_router_builder] Add support for `@TypedGoRouteParameter` to customize parameter names (flutter/packages#10793) 2026-02-03 engine-flutter-autoroll@skia.org Roll Flutter from c305f1f to bf701fe (9 revisions) (flutter/packages#10957) 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

In #10863 I intermediated asset loading through an asset loader, so that individual controllers weren't using the plugin registrar directly. In doing that, I just updated the types of the ivars, but—incorrectly—not their memory models. Registrar references are generally `weak` to avoid possible cycles (the registrar may internally be the same thing in the engine that owns the plugin instance), so the result was a weak reference to the new wrapper object. However, unlike the registrar, which has an externally enforced lifetime longer than the plugin, the wrapper was just an object created locally during map controller initialization, so was invalidated almost as soon as it was passed in. This fixes the controllers to keep strong references to the wrapper (which doesn't own anything, and has a weak registrar pointer, so can't create any cycles). Fixes flutter/flutter#182149 ## Pre-Review Checklist [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.

…r#181918) flutter/packages@5b1bea8...3bddf2c 2026-02-04 ivan-vanyusho@yandex-team.ru [camera_avfoundation] ios saving path (flutter/packages#10832) 2026-02-04 stuartmorgan@google.com [video_player] Remove OCMock (flutter/packages#10932) 2026-02-04 stuartmorgan@google.com [google_maps_flutter] Remove use of OCMock (flutter/packages#10863) 2026-02-04 32538273+ValentinVignal@users.noreply.github.com [go_router_builder] Add support for `@TypedGoRouteParameter` to customize parameter names (flutter/packages#10793) 2026-02-03 engine-flutter-autoroll@skia.org Roll Flutter from c305f1f to bf701fe (9 revisions) (flutter/packages#10957) 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

stuartmorgan-g added 9 commits January 23, 2026 15:21

Abstract asset lookup

181bcf9

Wrap UIImage imageNamed:

4981e49

Remove mock-based camera update testing

bc5fd46

Add a protocol for tile provider to remove OCMock requirement

87cae17

Switch to a generalized event delegate

23e65c0

Switch mocks to simple test objects

9cbd64a

Remove the remaining OCMock usage

b25f78a

Remove OCMock from the build

4484e09

Version bump

638ec3e

stuartmorgan-g requested review from LongCatIsLooong and vashworth as code owners January 23, 2026 20:35

github-actions bot added p: google_maps_flutter platform-ios labels Jan 23, 2026

gemini-code-assist bot reviewed Jan 23, 2026

View reviewed changes

stuartmorgan-g commented Jan 23, 2026

View reviewed changes

vashworth reviewed Feb 3, 2026

View reviewed changes

vashworth approved these changes Feb 3, 2026

View reviewed changes

stuartmorgan-g added 3 commits February 3, 2026 16:08

copypasta

e54d6ae

Explain event delegate

bb1733b

Merge branch 'main' into maps-ocmock-removal

3db91b4

stuartmorgan-g added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 4, 2026

auto-submit bot merged commit f3ee98a into flutter:main Feb 4, 2026
81 checks passed

stuartmorgan-g deleted the maps-ocmock-removal branch February 4, 2026 14:56

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 4, 2026

f3ee98a82 [google_maps_flutter] Remove use of OCMock (flutter/package…

5a68142

…s#10863)

engine-flutter-autoroll mentioned this pull request Feb 4, 2026

Roll Packages from 5b1bea87e8b9 to f4ea763b251e (4 revisions) flutter/flutter#181912

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 4, 2026

f3ee98a82 [google_maps_flutter] Remove use of OCMock (flutter/package…

48d31c9

…s#10863)

engine-flutter-autoroll mentioned this pull request Feb 4, 2026

Roll Packages from 5b1bea87e8b9 to 3bddf2c57eed (5 revisions) flutter/flutter#181918

Merged

stuartmorgan-g mentioned this pull request Feb 10, 2026

[google_maps_flutter] Fix custom marker icons on iOS #10993

Merged

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[google_maps_flutter] Remove use of OCMock #10863

[google_maps_flutter] Remove use of OCMock #10863

stuartmorgan-g commented Jan 23, 2026

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

stuartmorgan-g Jan 23, 2026

Uh oh!

stuartmorgan-g commented Jan 23, 2026

Uh oh!

Uh oh!

Uh oh!

vashworth Feb 3, 2026

Uh oh!

stuartmorgan-g Feb 3, 2026

Uh oh!

Uh oh!

vashworth left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

[google_maps_flutter] Remove use of OCMock #10863

[google_maps_flutter] Remove use of OCMock #10863

Conversation

stuartmorgan-g commented Jan 23, 2026

Pre-Review Checklist

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

stuartmorgan-g Jan 23, 2026

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g commented Jan 23, 2026

Uh oh!

Uh oh!

Uh oh!

vashworth Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

vashworth left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants