Fix unmockkAll to work if constructor was mocked multiple times #870
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks a lot for putting this together! The code LGTM, can you just add some test coverage for cases when I think that may interfere with constructor mocking behavior as well and we may want to test that Thanks again! |
|
Hi @Raibaz I updated it to include some testing for |
|
Thanks a lot! |
3 tasks
kodiakhq bot
pushed a commit
to RBusarow/Dispatch
that referenced
this pull request
Aug 23, 2022
[](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [io.mockk:mockk](https://mockk.io) ([source](https://togithub.com/mockk/mockk)) | `1.12.5` -> `1.12.7` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>mockk/mockk</summary> ### [`v1.12.7`](https://togithub.com/mockk/mockk/releases/tag/1.12.7) [Compare Source](https://togithub.com/mockk/mockk/compare/1.12.6...1.12.7) #### What's Changed - Update android-sdk-detector.settings.gradle.kts by [@​aSemy](https://togithub.com/aSemy) in [mockk/mockk#886 - only sign if the signing properties are present by [@​aSemy](https://togithub.com/aSemy) in [mockk/mockk#885 - Fix an issue that Android libraries was not published by [@​kubode](https://togithub.com/kubode) in [mockk/mockk#887 #### New Contributors - [@​kubode](https://togithub.com/kubode) made their first contribution in [mockk/mockk#887 **Full Changelog**: mockk/mockk@1.12.6...1.12.7 ### [`v1.12.6`](https://togithub.com/mockk/mockk/releases/tag/1.12.6) [Compare Source](https://togithub.com/mockk/mockk/compare/1.12.5...1.12.6) #### What's Changed - Dependency updates, JDK17 v2 by [@​aSemy](https://togithub.com/aSemy) in [mockk/mockk#863 - Dependency updates, JDK17 by [@​hduerkop](https://togithub.com/hduerkop) in [mockk/mockk#829 - Fix unmockkAll to work if constructor was mocked multiple times by [@​Chrostoq](https://togithub.com/Chrostoq) in [mockk/mockk#870 - fix: fix value class field determination by [@​qoomon](https://togithub.com/qoomon) in [mockk/mockk#872 - [#​854](https://togithub.com/mockk/mockk/issues/854) update projects to use new Kotlin Multiplatform Gradle plugin by [@​aSemy](https://togithub.com/aSemy) in [mockk/mockk#855 #### New Contributors - [@​hduerkop](https://togithub.com/hduerkop) made their first contribution in [mockk/mockk#829 - [@​Chrostoq](https://togithub.com/Chrostoq) made their first contribution in [mockk/mockk#870 **Full Changelog**: mockk/mockk@1.12.5...1.12.6 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://app.renovatebot.com/dashboard#github/RBusarow/Dispatch). PR-URL: #564
](https://renovatebot.com){kind=link}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi all!
This PR is to fix the Issue #838
I changed
internalMockkConstructorto work likeinternalMockkObjectandinternalMockkStaticby changing it to usecancelPutI added a new test but I had to remove
test2.I'm unsure what exactly they test, but with my change the mocked instance in
ExampleObjectprivate val exampleClassis reset once mockkConstructor is called again in test2. And since it's in an object which is not reset between test1 and test2, test2 fails because it is not re-instantiated with the mocked class.