Skip to content

Roll mockito to 5.4.0 #3544

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 15 commits into from
Mar 30, 2023
Merged

Roll mockito to 5.4.0 #3544

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8a6595d
Avoid pinning mockito to single version
natebosch Mar 24, 2023
73035f2
Pin to 5.4.0
natebosch Mar 27, 2023
25c601d
Update to a newer pigeon
natebosch Mar 27, 2023
4614b03
Merge branch 'main' into mockito-range
natebosch Mar 27, 2023
3fcc7fd
Merge branch 'main' into mockito-range
natebosch Mar 28, 2023
281f1df
Set minimum Flutter versions to 3.3
stuartmorgan-g Mar 28, 2023
174c280
Updates changelogs for SDK bump
stuartmorgan-g Mar 28, 2023
1708c66
Relax repo tooling mockito slightly to allow tooling to run on Flutte…
stuartmorgan-g Mar 28, 2023
765d159
Regenerate mockito mocks
natebosch Mar 28, 2023
338f7c6
Merge branch 'main' into mockito-range
natebosch Mar 28, 2023
57a3352
Generate more mockito mocks
natebosch Mar 29, 2023
5a01b05
Make a custom mock class private
natebosch Mar 29, 2023
4e28976
Regenerate mocks at an older flutter SDK
natebosch Mar 29, 2023
349a2fc
Regenerate mocks at an older flutter SDK
natebosch Mar 29, 2023
989cc93
Merge branch 'main' into mockito-range
natebosch Mar 29, 2023
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
Generate more mockito mocks 
In a couple packages that are generating in a directory named
`integration_test/` instead of `test/`, add a `generate_for` argument to
run mockito against those tests.

Remove a stale unused mock file. If a `build_runner build` had been run
following the removal of the source file, with an asset graph from the
build that included the file, it would have been removed. If the source
file is removed and no builds are ever run with the asset graph from the
build including it, the output will be ignored by the build system.
  • Loading branch information
@natebosch
natebosch committed Mar 29, 2023
commit 57a3352bf6407e5aa3fa20025fe969e91ed0d585
4 changes: 4 additions & 0 deletions packages/google_maps_flutter/google_maps_flutter_web/example/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ targets:
- integration_test/*.dart
- lib/$lib$
- $package$
builders:
mockito|mockBuilder:
generate_for:
- integration_test/**
2 changes: 1 addition & 1 deletion ...r/google_maps_flutter_web/example/integration_test/google_maps_controller_test.mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in google_maps_flutter_web_integration_tests/integration_test/google_maps_controller_test.dart.
// Do not manually edit this file.

Expand Down
2 changes: 1 addition & 1 deletion ...utter/google_maps_flutter_web/example/integration_test/google_maps_plugin_test.mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in google_maps_flutter_web_integration_tests/integration_test/google_maps_plugin_test.dart.
// Do not manually edit this file.

Expand Down
4 changes: 4 additions & 0 deletions packages/google_sign_in/google_sign_in_web/example/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ targets:
- integration_test/*.dart
- lib/$lib$
- $package$
builders:
mockito|mockBuilder:
generate_for:
- integration_test/**
2 changes: 1 addition & 1 deletion ...le_sign_in/google_sign_in_web/example/integration_test/google_sign_in_web_test.mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in google_sign_in_web_integration_tests/integration_test/google_sign_in_web_test.dart.
// Do not manually edit this file.

Expand Down
42 changes: 0 additions & 42 deletions ...ges/pigeon/platform_tests/flutter_null_safe_unit_tests/test/all_datatypes_test.mocks.dart
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions packages/url_launcher/url_launcher_web/example/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@ targets:
- integration_test/*.dart
- lib/$lib$
- $package$
builders:
mockito|mockBuilder:
generate_for:
- integration_test/**
2 changes: 1 addition & 1 deletion ...s/url_launcher/url_launcher_web/example/integration_test/url_launcher_web_test.mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in regular_integration_tests/integration_test/url_launcher_web_test.dart.
// Do not manually edit this file.

Expand Down
2 changes: 1 addition & 1 deletion script/tool/test/common/package_command_test.mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Mocks generated by Mockito 5.3.2 from annotations
// Mocks generated by Mockito 5.4.0 from annotations
// in flutter_plugin_tools/test/common/package_command_test.dart.
// Do not manually edit this file.

Expand Down