Merge `package:mockito` #2293

mosuem · 2024-10-17T14:06:29Z

Move and fix workflow files, labeler.yaml, and badges in the README.md
Rev the version of the package, so that pub.dev points to the correct site
Add a line to the changelog:

* Move to `dart-lang/test` monorepo.

Add the package to the top-level readme of the monorepo:

| [mockito](pkgs/mockito/) | A mock framework inspired by Mockito with APIs for Fakes, Mocks, behavior verification, and stubbing. | [![pub package](https://img.shields.io/pub/v/mockito.svg)](https://pub.dev/packages/mockito) |

Important! Merge the PR with 'Create a merge commit' (enabling then disabling the Allow merge commits admin setting)
Update the auto-publishing settings on https://pub.dev/packages/mockito/admin
Add the following text to https://github.com/dart-lang/mockito/:'

> [!IMPORTANT]  
> This repo has moved to https://github.com/dart-lang/test/tree/master/pkgs/mockito

Publish using the autopublish workflow
Push tags to GitHub using git tag --list 'mockito*' | xargs git push origin
Close open PRs in dart-lang/mockito with the following message:

Closing as the [dart-lang/mockito](https://github.com/dart-lang/mockito) repository is merged into the [dart-lang/test](https://github.com/dart-lang/test) monorepo. Please re-open this PR there!

Transfer issues by running dart run pkgs/repo_manage/bin/report.dart transfer-issues --source-repo dart-lang/mockito --target-repo dart-lang/test --add-label package:mockito --apply-changes
Archive https://github.com/dart-lang/mockito/
Import to g3

I’ve reviewed the contributor guide and applied the relevant portions to this PR.

Contribution guidelines:

See our contributor guide for general expectations for PRs.
Larger or significant changes should be discussed in an issue before creating a PR.
Contributions to our repos should follow the Dart style guide and use dart format.
Most changes should add an entry to the changelog and may need to rev the pubspec package version.
Changes to packages require corresponding tests.

Note that many Dart repos have a weekly cadence for reviewing PRs - please allow for some latency before initial review feedback.

Also add another test for fallback generators Also bump to 5.0.9 PiperOrigin-RevId: 375738620

* Fix typo in README * Fix typo in NULL_SAFETY_README regarding fallback generators. * Add text in various argument matchers clarifying positional vs named arguments. * Add links in each argument matcher (`any`, `anyNamed`, `argThat`, `captureAny`, etc) back to their respective sections in the README. An alternative to the last item would be to inline the examples. I'd love to do this, but only via automated build... not sure how to do that yet. PiperOrigin-RevId: 375955488

…ld of pubspec.yaml. Use 60 to 180 characters to describe the package, what it does, and its target use case.

It is just DartType, specifically because we want to make FunctionType just a DartType. PiperOrigin-RevId: 376206358

A fallback generator must have _approximately_ the same signature, but parameter types must all be nullable. Fixes dart-lang/mockito#417 PiperOrigin-RevId: 376213042

…g`, `hashCode`, or `operator==`. Calling `super.noSuchMethod` in any of these situations triggers the "missing stub" checks, and also conflicts with mockito behavior which relies on being able to use the [Mock] implementations. PiperOrigin-RevId: 376895132

PiperOrigin-RevId: 376900671

…ch the signature of an overriding method which adds optional parameters. Fixes dart-lang/mockito#371 PiperOrigin-RevId: 377388828

… "custom mock" annotation with implicit type arguments. Given a method which references type variables defined on their enclosing class (for example, `T` in `class Foo<T>`), mockito will now correctly reference `T` in generated code. Fixes dart-lang/mockito#422 PiperOrigin-RevId: 377571931

This uses the commands we're deprecating, and I don't think it's being used anymore after we migrated to Github Actions?

Delete travis.sh

* Allow two mocks of the same class (with different type arguments) to be specified with different fallback generators. * Allow fallback generators on super types of a mocked class. This change strongly suggested a code restructuring, moving the bulk of the code-building into a new "MockClassInfo" class, extracted from MockLibraryInfo. I've incorporated this change; most of the fields on MockLibraryInfo is moved to MockClassInfo; only a few fields remain, which are fields important to be shared across class-building code. PiperOrigin-RevId: 378307281

https://dart-review.googlesource.com/c/sdk/+/205140 PiperOrigin-RevId: 382130899

dart-lang/mockito@cc1b0c8 Fix spelling and grammar typos in README.md PiperOrigin-RevId: 382620480

dart-lang/mockito@825e213 Follow Dart file conventions | Add more detail to the description field of pubspec.yaml. Use 60 to 180 characters to describe the package, what it does, and its target use case. PiperOrigin-RevId: 382634050

PiperOrigin-RevId: 382755039

Generated code may import 'src' files. PiperOrigin-RevId: 382756565

The inference_failure_on_instance_creation error will trigger on code like ``` returnValueForMissingStub: Future.value() ``` because, even though no value has been given to `value()`, that does not affect the Future's type (it still defaults to `void`). Explicitly using `Future<void>.value()` satisfies the check. PiperOrigin-RevId: 382770034

Without this support, mockito tried to create a FakeFunction which implemented Function, which is not allowed. Fixes dart-lang/mockito#442 PiperOrigin-RevId: 384852004

…e<T>`. Before this fix, we would only return `[]` which had an implicit dynamic: `<dynamic>[]`. The proper return value should explicitly include the expected type argument. Existing test cases cover the desired behavior. Also replace `var` with `final` in surrounding code. Fixes dart-lang/mockito#445 PiperOrigin-RevId: 384965296

PiperOrigin-RevId: 385356711

If the generated code needs to represent a type, `T`, and that type is declared in library `L`, then we now prefer to import a library which _exports_ `L` (if one exists), over importing `L` directly. To find such a library, we look at the type, `U` which references `T`. Perhaps `U` is a class to mocked, and `U` has a method with a return type `T`, or `U` is a supertype of a class to be mocked, which has a method with a parameter type `T`, etc. We examine all of the import libraries, `IL`, of the library in which `U` is declared, and all of the libraries which are exported by the libraries `IL`. If the type `T` is declared in a library which is exported as a conditional export, this strategy avoids complications with the conditional export. Additionally, as a heuristic, it generally leads to public libraries which export private implementation, avoiding importing the private implementation directly. Fixes dart-lang/mockito#443 PiperOrigin-RevId: 385425794

PiperOrigin-RevId: 385440655

We might generate setters without getters. PiperOrigin-RevId: 385802287

* Properly reference types in overridden `toString` implementations. Fixes dart-lang/mockito#438 * Override `toString` in a Fake implementation when the class-to-be-faked has a superclass which overrides `toString` with additional parameters. Fixes dart-lang/mockito#371 PiperOrigin-RevId: 385852381

…rarchy. Previously, mixins were being applied in the wrong order. By using analyzer's InheritanceManager3, instead of my homespun inheritance-walking algorithm, we solve this problem, and perhaps other unreported issues. Fixes dart-lang/mockito#456 PiperOrigin-RevId: 387741287

Without this fix, the generator could generate multiple classes with the same name. Fixes dart-lang/mockito#441 PiperOrigin-RevId: 388959500

…art-lang/mockito#460)

* comment fix, long string fix * bump version and add to CHANGELOG PiperOrigin-RevId: 390005036

PiperOrigin-RevId: 646496713

…le change. This lint rule currently measures from the end of the condition, but needs to measure from the start of the if-statement. E.g. if ("long condition and other long condition" != "another long condition" && "more tests".isNotEmpty) return null; This is currently allowed, but should not be, as per Effective Dart. This will be fixed in a Dart SDK CL. PiperOrigin-RevId: 647347218

…-lang/mockito#761) Bumps the github-actions group with 2 updates in the / directory: [actions/checkout](https://github.com/actions/checkout) and [dart-lang/setup-dart](https://github.com/dart-lang/setup-dart). Updates `actions/checkout` from 4.1.1 to 4.1.7 - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](actions/checkout@b4ffde6...692973e) Updates `dart-lang/setup-dart` from 1.6.2 to 1.6.5 - [Release notes](https://github.com/dart-lang/setup-dart/releases) - [Changelog](https://github.com/dart-lang/setup-dart/blob/main/CHANGELOG.md) - [Commits](dart-lang/setup-dart@fedb126...0a8a0fc) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: dart-lang/setup-dart dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Mostly fixes dart-lang/mockito#697. I'm still not quite satisfied with the documentation for `provideDummyBuilder` since the `DummyBuilder` `typedef` remains undocumented, but I can't write documentation for that because I don't understand its arguments.

Also remove some unused elements. PiperOrigin-RevId: 673093545

This will be required in an upcoming version of the Dart formatter. PiperOrigin-RevId: 673452282

PiperOrigin-RevId: 674448702

PiperOrigin-RevId: 681769728

PiperOrigin-RevId: 684477097

github-actions · 2024-10-17T14:07:51Z

PR Health

Changelog Entry ✔️

Package	Changed Files

Changes to files need to be accounted for in their respective changelogs.

.github/workflows/mockito.yaml

mosuem · 2024-10-21T11:42:59Z

@srawlins, the analyze job is failing, which seems to already have been the case in the other repository. Is this a bug which needs to be investigated, or is this a known behavior?

srawlins · 2024-10-21T14:43:33Z

I don't see the pubspec, but I imagine the deps just need to be bumped. Or mockito in google3 might be using unpublished elements from analyzer.

mosuem · 2024-10-29T16:07:44Z

I don't see the pubspec, but I imagine the deps just need to be bumped. Or mockito in google3 might be using unpublished elements from analyzer.

It seems like stable Dart does not yet support some features. I would advise to move this package with the failing CI, and fix the issue in a follow up. IIUC, fixing would require depending on a dev version of Dart, or removing the use of these features.

srawlins and others added 30 commits May 25, 2021 11:25

Add notes to CHANGELOG and NULL_SAFETY_README re: fallback generators

4edae1a

Also add another test for fallback generators Also bump to 5.0.9 PiperOrigin-RevId: 375738620

Follow Dart file conventions | Add more detail to the description fie…

825e213

…ld of pubspec.yaml. Use 60 to 180 characters to describe the package, what it does, and its target use case.

Stop expecting that DartObject.type is ParameterizedType.

eb921b5

It is just DartType, specifically because we want to make FunctionType just a DartType. PiperOrigin-RevId: 376206358

Fix test about fallback generator signature.

c3eb1c7

A fallback generator must have _approximately_ the same signature, but parameter types must all be nullable. Fixes dart-lang/mockito#417 PiperOrigin-RevId: 376213042

Migrate off deprecated analyzer API: nonSubtypableClasses.

e032616

PiperOrigin-RevId: 376900671

Override toString implementation on generated Fakes in order to mat…

1208c23

…ch the signature of an overriding method which adds optional parameters. Fixes dart-lang/mockito#371 PiperOrigin-RevId: 377388828

Delete travis.sh

bf0d7ec

This uses the commands we're deprecating, and I don't think it's being used anymore after we migrated to Github Actions?

Merge pull request dart-lang/mockito#432 from dart-lang/mit-mit-patch-1

cafe331

Delete travis.sh

Fix spelling and grammar typos in README.md

cc1b0c8

Prepare to make LibraryElement.name non-nullable.

edfba5e

https://dart-review.googlesource.com/c/sdk/+/205140 PiperOrigin-RevId: 382130899

Import cc1b0c8 from GitHub

f4e9a6a

dart-lang/mockito@cc1b0c8 Fix spelling and grammar typos in README.md PiperOrigin-RevId: 382620480

Import 825e213 from GitHub

c3d042c

dart-lang/mockito@825e213 Follow Dart file conventions | Add more detail to the description field of pubspec.yaml. Use 60 to 180 characters to describe the package, what it does, and its target use case. PiperOrigin-RevId: 382634050

Wrap and improve package description.

cbd969b

PiperOrigin-RevId: 382755039

Ignore implementation_imports

0bfd051

Generated code may import 'src' files. PiperOrigin-RevId: 382756565

Support Function and Future<Function> return types

f409901

Without this support, mockito tried to create a FakeFunction which implemented Function, which is not allowed. Fixes dart-lang/mockito#442 PiperOrigin-RevId: 384852004

Support analyzer >=1.0.0 <3.0.0

96c0929

PiperOrigin-RevId: 385356711

Fix null check required for analyzer <2.0.0

8a6de13

PiperOrigin-RevId: 385440655

Ignore avoid_setters_without_getters lint in generated code.

59019a6

We might generate setters without getters. PiperOrigin-RevId: 385802287

Ensure that generated Fake classes have unique names.

5195e49

Without this fix, the generator could generate multiple classes with the same name. Fixes dart-lang/mockito#441 PiperOrigin-RevId: 388959500

Fix wrong import for method parameters with default value factories (d…

70ecfa8

…art-lang/mockito#460)

Default value w/ redirecting constructor fix followups:

d949d35

* comment fix, long string fix * bump version and add to CHANGELOG PiperOrigin-RevId: 390005036

srawlins and others added 13 commits June 25, 2024 08:58

Fix lint in examples.

fc0f7ce

PiperOrigin-RevId: 646496713

Update with review feedback from srawlins

3516c47

mockito: stop using deprecated analyzer APIs.

585c07e

Also remove some unused elements. PiperOrigin-RevId: 673093545

Pass a Dart language version to the Dart formatter.

a18de65

This will be required in an upcoming version of the Dart formatter. PiperOrigin-RevId: 673452282

Bump CI tasks to use Dart 3.5.0 as stable

11fc929

Migration for analyzer APIs.

2a627e5

PiperOrigin-RevId: 674448702

Add "topics" to package mockito

08b8104

PiperOrigin-RevId: 681769728

Migration for analyzer APIs.

6b42a76

PiperOrigin-RevId: 684477097

Merge package:mockito into the test monorepo

0734fe2

Add issue template and other fixes

7835193

mosuem requested a review from a team as a code owner October 17, 2024 14:06

Moving fixes

aa0eb2e

mosuem requested review from srawlins, devoncarew and natebosch and removed request for a team October 17, 2024 14:20

mosuem mentioned this pull request Oct 17, 2024

Merge package:fake_async #2291

Merged

13 tasks

jakemac53 reviewed Oct 17, 2024

View reviewed changes

.github/workflows/mockito.yaml Show resolved Hide resolved

mosuem added 3 commits October 21, 2024 13:34

Fix analysis errors

ee75bd1

Merge branch 'master' into merge-mockito-package

61d344a

Fix WF

7c4bf82

mosuem force-pushed the merge-mockito-package branch from 4dd33dd to 7c4bf82 Compare October 29, 2024 16:08

mosuem mentioned this pull request Nov 6, 2024

Resolve for typedefs/aliases and records in typeArguments & resolve duplicate typedefs dart-lang/mockito#776

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge `package:mockito` #2293

Merge `package:mockito` #2293

mosuem commented Oct 17, 2024 •

edited

Loading

github-actions bot commented Oct 17, 2024

mosuem commented Oct 21, 2024

srawlins commented Oct 21, 2024

mosuem commented Oct 29, 2024

Merge package:mockito #2293

Are you sure you want to change the base?

Merge package:mockito #2293

Conversation

mosuem commented Oct 17, 2024 • edited Loading

github-actions bot commented Oct 17, 2024

PR Health

mosuem commented Oct 21, 2024

srawlins commented Oct 21, 2024

mosuem commented Oct 29, 2024

Merge `package:mockito` #2293

Merge `package:mockito` #2293

mosuem commented Oct 17, 2024 •

edited

Loading