Fixes #3219: Add support for static mocks on DoNotMockEnforcer #3220
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
TimvdLippe
requested changes
Jan 2, 2024
.../extTest/src/test/java/org/mockitousage/plugins/donotmockenforcer/DoNotmockEnforcerTest.java
Show resolved
Hide resolved
andrebrait
commented
Jan 5, 2024
TimvdLippe
reviewed
Jan 7, 2024
andrebrait
force-pushed
the
gh-pr-3219
branch
2 times, most recently
from
9c58028
to
f3e2bef
Compare
|
@TimvdLippe changes performed. It's technically missing a test project, though. Let me know if you'd still like to have it and I'll make it on Monday. |
TimvdLippe
approved these changes
Jan 22, 2024
src/main/java/org/mockito/internal/configuration/plugins/PluginRegistry.java
Outdated
Show resolved
Hide resolved
TimvdLippe
reviewed
Jan 22, 2024
andrebrait
force-pushed
the
gh-pr-3219
branch
2 times, most recently
from
b5cd2c8
to
01b32ab
Compare
Fixes mockito#3219 Fix mockStatic bypassing DoNotMockEnforcer Add (optional) method on DoNotMockEnforcer for static mocks
andrebrait
force-pushed
the
gh-pr-3219
branch
from
01b32ab
to
8c0239c
Compare
andrebrait
added a commit
to andrebrait/mockito
that referenced
this pull request
Jan 23, 2024
- Follow up to mockito#3220 - Make the method return the lowest common denominator type
andrebrait
added a commit
to andrebrait/mockito
that referenced
this pull request
Jan 23, 2024
- Follow up to mockito#3220 - Make the method return the lowest common denominator type
8 tasks
TimvdLippe
pushed a commit
that referenced
this pull request
Jan 23, 2024
Make the method return the lowest common denominator type Follow up to #3220
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.
Fixes #3219
Fix mockStatic bypassing DoNotMockEnforcer
Add (optional) method on DoNotMockEnforcer for static mocks
Checklist
including project members to get a better picture of the change
commit is meaningful and help the people that will explore a change in 2 years
Fixes #<issue number>in the description if relevantFixes #<issue number>if relevant