Skip to content

Make MockUtil.getMockMaker() public Mockito API#3129

Merged
TimvdLippe merged 1 commit intomockito:mainfrom
AndreasTu:fix_3128
Oct 6, 2023
Merged

Make MockUtil.getMockMaker() public Mockito API#3129
TimvdLippe merged 1 commit intomockito:mainfrom
AndreasTu:fix_3128

Conversation

@AndreasTu
Copy link
Copy Markdown
Contributor

@AndreasTu AndreasTu commented Oct 5, 2023

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
Copy link
Copy Markdown

codecov-commenter commented Oct 5, 2023 •
edited
Loading

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.

AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 5, 2023
@AndreasTu
Added code to use public Mockito API introduced with
5f81e3a 
mockito/mockito#3129
TimvdLippe
TimvdLippe requested changes Oct 5, 2023
View reviewed changes
Comment thread src/test/java/org/mockito/internal/configuration/plugins/DefaultMockitoPluginsTest.java
Comment thread src/main/java/org/mockito/plugins/MockitoPlugins.java
Comment thread src/main/java/org/mockito/plugins/MockitoPlugins.java Outdated
@AndreasTu AndreasTu requested a review from TimvdLippe October 5, 2023 07:34
@AndreasTu
Make MockUtil.getMockMaker() public Mockito API
7857798 
The MockitoPlugins interface now provides access to the getMockMaker()
method.

Fixes mockito#3128
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 6, 2023
@AndreasTu
MockitoInlineMockMaker provides mocking of static methods
be7dadf 
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
TimvdLippe approved these changes Oct 6, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@TimvdLippe TimvdLippe left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@TimvdLippe TimvdLippe merged commit fb48e09 into mockito:main Oct 6, 2023
@AndreasTu AndreasTu deleted the fix_3128 branch October 6, 2023 14:39
@AndreasTu
Copy link
Copy Markdown
Contributor Author

AndreasTu commented Oct 6, 2023

@TimvdLippe thanks for the help and the merge!

AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 9, 2023
@AndreasTu
MockitoInlineMockMaker provides mocking of static methods
f135b60 
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
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 11, 2023
@AndreasTu
MockitoInlineMockMaker provides mocking of static methods
ef30dfe 
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
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 11, 2023
@AndreasTu
MockitoInlineMockMaker provides mocking of static methods
155b00a 
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
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 11, 2023
@AndreasTu
MockitoInlineMockMaker provides mocking of static methods
fa28c2e 
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
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 12, 2023
@AndreasTu @leonard84
MockitoMockMaker provides mocking of static methods
03c27d4 
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>
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 13, 2023
@AndreasTu @leonard84
MockitoMockMaker provides mocking of static methods
14ebb17 
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>
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 22, 2023
@AndreasTu @leonard84
MockitoMockMaker provides mocking of static methods
60a3fbd 
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>
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Oct 25, 2023
@AndreasTu @leonard84
MockitoMockMaker provides mocking of static methods
4257692 
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>
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Nov 6, 2023
@AndreasTu @leonard84
MockitoMockMaker provides mocking of static methods
59ea5d2 
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>
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Nov 12, 2023
@AndreasTu @leonard84
MockitoMockMaker provides mocking of static methods
84bac2c 
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>
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Nov 12, 2023
@AndreasTu @leonard84
MockitoMockMaker provides mocking of static methods
3abddfe 
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>
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Dec 17, 2023
@AndreasTu @leonard84
MockitoMockMaker provides mocking of static methods
992d854 
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>
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Jan 23, 2024
@AndreasTu @leonard84
MockitoMockMaker provides mocking of static methods
2992ae3 
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>
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Jan 24, 2024
@AndreasTu @leonard84
MockitoMockMaker provides mocking of static methods
07a4d24 
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>
AndreasTu added a commit to AndreasTu/spock that referenced this pull request Feb 8, 2024
@AndreasTu @leonard84 @marcphilipp
MockitoMockMaker provides mocking of static methods
c910381 
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@TimvdLippe TimvdLippe TimvdLippe approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Make MockUtil.getMockMaker() public or public Mockito API

3 participants

@AndreasTu @codecov-commenter @TimvdLippe