Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[google_maps_flutter] Clean Java test, consolidate Marker example. #4400

Merged
merged 5 commits into from
Oct 20, 2021
Merged

[google_maps_flutter] Clean Java test, consolidate Marker example. #4400

merged 5 commits into from
Oct 20, 2021

Conversation

@JamesMcIntosh
Copy link
Contributor

@JamesMcIntosh JamesMcIntosh commented Oct 1, 2021 •
edited by ditman
Loading

  • Do not mock internal class in Java tests (zzt)
  • Consolidate drag_marker.dart demo into place_marker.dart demo. Remove drag_marker.dart demo.

Fixes comments in #2838

Pre-launch Checklist

  • [/] I read the [Contributor Guide] and followed the process outlined there for submitting PRs.
  • [/] I read the [Tree Hygiene] wiki page, which explains my responsibilities.
  • [/] I read and followed the [relevant style guides] and ran [the auto-formatter]. (Note that unlike the flutter/flutter repo, the flutter/plugins repo does use dart format.)
  • [/] I signed the [CLA].
  • [/] The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
  • [N/A] I listed at least one issue that this PR fixes in the description above.
  • [N/A] I updated pubspec.yaml with an appropriate new version according to the [pub versioning philosophy].
  • [N/A] I updated CHANGELOG.md to add a description of the change.
  • [/] I updated/added relevant documentation (doc comments with ///).
  • [/] I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt.
  • [/] All existing and new tests are passing.

@google-cla google-cla bot added the cla: yes label Oct 1, 2021
@JamesMcIntosh JamesMcIntosh mentioned this pull request Oct 1, 2021
Merged
13 tasks
@ditman ditman self-assigned this Oct 1, 2021
@ditman ditman self-requested a review October 1, 2021 22:06
@ditman ditman changed the title [google_maps_flutter] Improve usage of mock [google_maps_flutter] Clean Java test, consolidate Marker example. Oct 1, 2021
@JamesMcIntosh
Copy link
Contributor Author

JamesMcIntosh commented Oct 14, 2021

@ditman Hope things are going well! Any chance to sneak that review in?

@ditman
Copy link
Member

ditman commented Oct 15, 2021

Yes! I got swamped with a cross_file issue. I'll get this reviewed by EOD Friday!

ditman
ditman approved these changes Oct 15, 2021
View reviewed changes
Copy link
Member

@ditman ditman left a comment

Choose a reason for hiding this comment

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

LGTM, let's go!

@google-cla

This comment has been minimized.

Sign in to view
@google-cla google-cla bot added cla: no and removed cla: yes labels Oct 15, 2021
@ditman

This comment has been minimized.

Sign in to view
@google-cla google-cla bot added cla: yes and removed cla: no labels Oct 15, 2021
@ditman ditman added the waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land. label Oct 15, 2021
@ditman
Copy link
Member

ditman commented Oct 15, 2021 •
edited
Loading

(This should land as soon as checks pass. Thanks for revisiting this contribution @JamesMcIntosh!)

@ditman
Copy link
Member

ditman commented Oct 15, 2021

Actually, needs this to properly land: #4432 (I updated with master a few minutes too early!)

@fluttergithubbot
Copy link

fluttergithubbot commented Oct 16, 2021

This pull request is not suitable for automatic merging in its current state.

  • The status or check suite android-build_all_plugins has failed. Please fix the issues identified (or deflake) before re-applying this label.

@fluttergithubbot fluttergithubbot removed the waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land. label Oct 16, 2021
@ditman ditman added the waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land. label Oct 16, 2021
@ditman
Copy link
Member

ditman commented Oct 16, 2021

Let's try the auto-merge again, after the latest merge from master.

@ditman
Copy link
Member

ditman commented Oct 16, 2021

(This is a continuation of 2.0.11 and only modifies a Java test and a page of the example app, so not even a NEXT version bump seems necessary)

@ditman ditman removed the waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land. label Oct 16, 2021
@ditman
Copy link
Member

ditman commented Oct 16, 2021

(It's too late to land this. I'll merge on monday.)

@ditman ditman added the waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land. label Oct 18, 2021
@ditman
Copy link
Member

ditman commented Oct 20, 2021 •
edited
Loading

I'm manually landing this now. The "submit-queue" is green now.

@ditman ditman merged commit fecd22e into flutter:master Oct 20, 2021
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Oct 20, 2021
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 20, 2021
@engine-flutter-autoroll
fecd22e [google_maps_flutter] Clean Java test, consolidate Marker exa…
8bf9102 
…mple. (flutter/plugins#4400)
@JamesMcIntosh
Copy link
Contributor Author

JamesMcIntosh commented Oct 21, 2021

Thanks @ditman for all your work getting these 4 PRs landed!

@ditman
Copy link
Member

ditman commented Oct 21, 2021

No problem! Keep 'em coming @JamesMcIntosh!

NickalasB added a commit to NickalasB/plugins that referenced this pull request Oct 21, 2021
@NickalasB
Merge branch 'master' into implement_zoomEnabled_for_ios_and_android
6672b4f 
* master:
  [webview] Fix typos in the README (flutter#4249)
  [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180)
  [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
  [shared_preferences] Switch to new analysis options (flutter#4384)
  [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413)
  [camera] Run iOS methods on UI thread by default (flutter#4140)
  [ci] Always run all `format` steps (flutter#4427)
  [flutter_plugin_tools] Fix license-check on Windows (flutter#4425)
  [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400)
  [image_picker][android] suppress unchecked warning (flutter#4408)
  [ci] Replace Firebase Test Lab deprecated Pixel 4 device with Pixel 5 (flutter#4436)
  [image_picker_for_web] Added support for maxWidth, maxHeight and imageQuality  (flutter#4389)
  Bump compileSdkVersion to 31 (flutter#4432)
  [camera] Update [CameraOrientationTests testOrientationNotifications] unit test to work on Xcode 13 (flutter#4426)
  Update integration_test README  (flutter#3824)
  [webview_flutter] Adjust test URLs again (flutter#4407)
  [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179)
  [camera] Add filter for unsupported cameras on Android (flutter#4418)
NickalasB added a commit to NickalasB/plugins that referenced this pull request Oct 21, 2021
@NickalasB
Merge branch 'master' into add_zoom_to_android_webview
eab9765 
* master:
  [webview] Fix typos in the README (flutter#4249)
  [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180)
  [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
  [shared_preferences] Switch to new analysis options (flutter#4384)
  [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413)
  [camera] Run iOS methods on UI thread by default (flutter#4140)
  [ci] Always run all `format` steps (flutter#4427)
  [flutter_plugin_tools] Fix license-check on Windows (flutter#4425)
  [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400)
  [image_picker][android] suppress unchecked warning (flutter#4408)
  [ci] Replace Firebase Test Lab deprecated Pixel 4 device with Pixel 5 (flutter#4436)
  [image_picker_for_web] Added support for maxWidth, maxHeight and imageQuality  (flutter#4389)
  Bump compileSdkVersion to 31 (flutter#4432)
  [camera] Update [CameraOrientationTests testOrientationNotifications] unit test to work on Xcode 13 (flutter#4426)
  Update integration_test README  (flutter#3824)
  [webview_flutter] Adjust test URLs again (flutter#4407)
  [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179)
  [camera] Add filter for unsupported cameras on Android (flutter#4418)

# Conflicts:
#	packages/webview_flutter/webview_flutter/CHANGELOG.md
#	packages/webview_flutter/webview_flutter/pubspec.yaml
yasargil added a commit to yasargil/plugins that referenced this pull request Oct 25, 2021
@yasargil
Merge branch 'master' into gmain
d37dd69 
* master: (364 commits)
  Use OpenJDK 11 in CI jobs  (flutter#4419)
  [google_sign_in] remove the commented out code in tests (flutter#4442)
  [webview] Fix typos in the README (flutter#4249)
  [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180)
  [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
  [shared_preferences] Switch to new analysis options (flutter#4384)
  [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413)
  [camera] Run iOS methods on UI thread by default (flutter#4140)
  [ci] Always run all `format` steps (flutter#4427)
  [flutter_plugin_tools] Fix license-check on Windows (flutter#4425)
  [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400)
  [image_picker][android] suppress unchecked warning (flutter#4408)
  [ci] Replace Firebase Test Lab deprecated Pixel 4 device with Pixel 5 (flutter#4436)
  [image_picker_for_web] Added support for maxWidth, maxHeight and imageQuality  (flutter#4389)
  Bump compileSdkVersion to 31 (flutter#4432)
  [camera] Update [CameraOrientationTests testOrientationNotifications] unit test to work on Xcode 13 (flutter#4426)
  Update integration_test README  (flutter#3824)
  [webview_flutter] Adjust test URLs again (flutter#4407)
  [google_sign_in] Add serverAuthCode attribute to google_sign_in_platform_interface user data (flutter#4179)
  [camera] Add filter for unsupported cameras on Android (flutter#4418)
  ...

# Conflicts:
#	packages/google_maps_flutter/google_maps_flutter/android/src/main/java/io/flutter/plugins/googlemaps/GoogleMapController.java
hofmannfelix pushed a commit to hofmannfelix/plugins that referenced this pull request Oct 30, 2021
Merge commit '76e84c0679dbab7bfaaaa553b17bb0dbdb9a3c33' into update_v…
1c83c0a 
…ideo_src_on_same_controller

* commit '76e84c0679dbab7bfaaaa553b17bb0dbdb9a3c33': (537 commits)
  [video_player] Initialize player when size and duration become available (flutter#4438)
  [webview_flutter] Implement zoom enabled for ios and android (flutter#4417)
  Partial revert of "upgraded usage of BinaryMessenger (flutter#4451)" (flutter#4453)
  Implement Android WebView api with pigeon (Java portion) (flutter#4441)
  [in_app_purchase] Update to the latest pkg:json_serializable (flutter#4434)
  Implement Android WebView api with pigeon (Dart portion)  (flutter#4435)
  upgraded usage of BinaryMessenger (flutter#4451)
  [flutter_plugin_tools] Fix pubspec-check on Windows (flutter#4428)
  Use OpenJDK 11 in CI jobs  (flutter#4419)
  [google_sign_in] remove the commented out code in tests (flutter#4442)
  [webview] Fix typos in the README (flutter#4249)
  [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180)
  [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
  [shared_preferences] Switch to new analysis options (flutter#4384)
  [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413)
  [camera] Run iOS methods on UI thread by default (flutter#4140)
  [ci] Always run all `format` steps (flutter#4427)
  [flutter_plugin_tools] Fix license-check on Windows (flutter#4425)
  [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400)
  [image_picker][android] suppress unchecked warning (flutter#4408)
  ...

# Conflicts:
#	packages/video_player/video_player/pubspec.yaml
#	packages/video_player/video_player_web/lib/video_player_web.dart
#	packages/video_player/video_player_web/pubspec.yaml
amantoux pushed a commit to amantoux/plugins that referenced this pull request Dec 11, 2021
@JamesMcIntosh @amantoux
[google_maps_flutter] Clean Java test, consolidate Marker example. (f…
33f7540 
…lutter#4400)

* Do not mock internal class
* Merge "Marker" examples into a single page.
KyleFin pushed a commit to KyleFin/plugins that referenced this pull request Dec 21, 2021
@JamesMcIntosh @KyleFin
[google_maps_flutter] Clean Java test, consolidate Marker example. (f…
1f25acf 
…lutter#4400)

* Do not mock internal class
* Merge "Marker" examples into a single page.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@cyanglaz cyanglaz Awaiting requested review from cyanglaz

1 more reviewer

@ditman ditman ditman approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@ditman ditman

Labels

cla: yes p: google_maps_flutter platform-android waiting for tree to go green (Use "autosubmit") This PR is approved and tested, but waiting for the tree to be green to land.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@JamesMcIntosh @ditman @fluttergithubbot