Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #1853: Allow @MockitoSettings to be inherited #1854

Merged

Conversation

fabianMendez
Copy link
Contributor

  • 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

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

Could you add a regression test in the junit-jupiter-test testsuite?

@codecov-io
Copy link

codecov-io commented Jan 2, 2020

Codecov Report

Merging #1854 into release/3.x will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff               @@
##             release/3.x    #1854   +/-   ##
==============================================
  Coverage          86.87%   86.87%           
  Complexity          2518     2518           
==============================================
  Files                314      314           
  Lines               6620     6620           
  Branches             831      831           
==============================================
  Hits                5751     5751           
  Misses               671      671           
  Partials             198      198

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 11552b8...9c0bce0. Read the comment docs.

@fabianMendez
Copy link
Contributor Author

Could you add a regression test in the junit-jupiter-test testsuite?

I've just amended the commit with a test

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

1 more nit.

private Function<Integer, String> rootMock;

@Test
void should_throw_an_exception_on_strict_stubs_configured_by_default() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: test name should be updated to state that it properly inherits from the MockitoSettings on the superclass.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

Copy link
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 692b126 into mockito:release/3.x Jan 2, 2020
@fabianMendez fabianMendez deleted the inherit-mockito-settings branch January 2, 2020 22:47
epeee pushed a commit to epeee/mockito that referenced this pull request Jun 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants