Make MockUtil.getMockMaker() public Mockito API #3129

AndreasTu · 2023-10-05T06:42:58Z

The MockitoPlugins interface now provides access to the MockUtil.getMockMaker() method.

Fixes #3128

Checklist

Read the contributing guide
PR should be motivated, i.e. what does it fix, why, and if relevant how
If possible / relevant include an example in the description, that could help all readers
including project members to get a better picture of the change
Avoid other runtime dependencies
Meaningful commit history ; intention is important please rebase your commit history so that each
commit is meaningful and help the people that will explore a change in 2 years
The pull request follows coding style
Mention Fixes #<issue number> in the description if relevant
At least one commit should mention Fixes #<issue number> if relevant

codecov-commenter · 2023-10-05T06:52:38Z

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (edc6243) 85.48% compared to head (7857798) 85.51%.

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #3129      +/-   ##
============================================
+ Coverage     85.48%   85.51%   +0.02%     
- Complexity     2892     2894       +2     
============================================
  Files           329      330       +1     
  Lines          8826     8828       +2     
  Branches       1095     1095              
============================================
+ Hits           7545     7549       +4     
+ Misses          994      992       -2     
  Partials        287      287

Files	Coverage Δ
...l/configuration/plugins/DefaultMockitoPlugins.java	`92.68% <100.00%> (+0.18%)`	⬆️
.../main/java/org/mockito/internal/util/MockUtil.java	`95.18% <ø> (+2.40%)`	⬆️
.../main/java/org/mockito/plugins/MockitoPlugins.java	`100.00% <100.00%> (ø)`

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

mockito/mockito#3129

src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java

src/main/java/org/mockito/plugins/MockitoPlugins.java

The MockitoPlugins interface now provides access to the getMockMaker() method. Fixes mockito#3128

MockitoInlineMockMaker supports to mock static methods of Java classes with the new Spec API: `MockStatic()` `StubStatic()` `SpyStatic()` This also supports Java callers of the static methods. Added MockUtil.isStaticMock() Added code to use public Mockito API introduced with mockito/mockito#3129

TimvdLippe

Thanks!

AndreasTu · 2023-10-06T14:42:29Z

@TimvdLippe thanks for the help and the merge!

MockitoInlineMockMaker supports to mock static methods of Java classes with the new Spec API: `MockStatic()` `StubStatic()` `SpyStatic()` This also supports Java callers of the static methods. Added MockUtil.isStaticMock() Added code to use public Mockito API introduced with mockito/mockito#3129

MockitoMockMaker supports to mock static methods of Java classes with the new Spec API: `MockStatic()` `StubStatic()` `SpyStatic()` This also supports Java callers of the static methods. Added MockUtil.isStaticMock() Added code to use public Mockito API introduced with mockito/mockito#3129 Co-authored-by: Leonard Brünings <lord_damokles@gmx.net>

MockitoMockMaker supports to mock static methods of Java classes with the new Spec API: `MockStatic()` `StubStatic()` `SpyStatic()` This also supports Java callers of the static methods. Added MockUtil.isStaticMock() Added code to use public Mockito API introduced with mockito/mockito#3129 Moved IMockMakerSettings and MockMakerId to package spock.mock. Co-authored-by: Leonard Brünings <lord_damokles@gmx.net>

MockitoMockMaker supports to mock static methods of Java classes with the new Spec API: `MockStatic()` `StubStatic()` `SpyStatic()` This also supports Java callers of the static methods. Added MockUtil.isStaticMock() Added code to use public Mockito API introduced with mockito/mockito#3129 Co-authored-by: Leonard Brünings <lord_damokles@gmx.net>

MockitoMockMaker supports to mock static methods of Java classes with the new Spec API: `MockStatic()` `StubStatic()` `SpyStatic()` This also supports Java callers of the static methods. Added MockUtil.isStaticMock() Added code to use public Mockito API introduced with mockito/mockito#3129 Co-authored-by: Leonard Brünings <lord_damokles@gmx.net> Co-authored-by: Marc Philipp <marc@gradle.com>

AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 5, 2023

Added code to use public Mockito API introduced with

5f81e3a

mockito/mockito#3129

TimvdLippe requested changes Oct 5, 2023

View reviewed changes

src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java Show resolved Hide resolved

src/main/java/org/mockito/plugins/MockitoPlugins.java Show resolved Hide resolved

src/main/java/org/mockito/plugins/MockitoPlugins.java Outdated Show resolved Hide resolved

AndreasTu force-pushed the fix_3128 branch from 35345e1 to 4139f53 Compare October 5, 2023 07:33

AndreasTu requested a review from TimvdLippe October 5, 2023 07:34

Make MockUtil.getMockMaker() public Mockito API

7857798

The MockitoPlugins interface now provides access to the getMockMaker() method. Fixes mockito#3128

AndreasTu force-pushed the fix_3128 branch from 4139f53 to 7857798 Compare October 5, 2023 10:27

TimvdLippe approved these changes Oct 6, 2023

View reviewed changes

TimvdLippe merged commit fb48e09 into mockito:main Oct 6, 2023
13 checks passed

AndreasTu deleted the fix_3128 branch October 6, 2023 14:39

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make MockUtil.getMockMaker() public Mockito API #3129

Make MockUtil.getMockMaker() public Mockito API #3129

AndreasTu commented Oct 5, 2023

codecov-commenter commented Oct 5, 2023 •

edited

TimvdLippe left a comment

AndreasTu commented Oct 6, 2023

Make MockUtil.getMockMaker() public Mockito API #3129

Make MockUtil.getMockMaker() public Mockito API #3129

Conversation

AndreasTu commented Oct 5, 2023

Checklist

codecov-commenter commented Oct 5, 2023 • edited

Codecov Report

TimvdLippe left a comment

Choose a reason for hiding this comment

AndreasTu commented Oct 6, 2023

codecov-commenter commented Oct 5, 2023 •

edited