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

migrate to mockito 3 #753

Merged
merged 10 commits into from
Feb 17, 2021
Merged

migrate to mockito 3 #753

merged 10 commits into from
Feb 17, 2021

Conversation

AlexElin
Copy link
Contributor

@AlexElin AlexElin commented Apr 7, 2020

migrate to mockito 3: update versions, fix tests and deprecated API usage.

AlexElin added 2 commits May 8, 2020 21:08
# Conflicts:
#	pitest-entry/src/test/java/org/pitest/mutationtest/incremental/IncrementalAnalyserTest.java
@AlexElin AlexElin requested a review from hcoles July 3, 2020 18:12
@AlexElin
Copy link
Contributor Author

@StefanPenndorf, @hcoles I've fixed all your comments.
Could you re-review changes and merge it (if there will be no new comments)?

@AlexElin
Copy link
Contributor Author

AlexElin commented Dec 9, 2020

I've updated mockito to the latest version 3.6.28
Additionaly I replaced deprecated MockitoAnnotations.initMocks with MockitoAnnotations.openMocks

# Conflicts:
#	pitest-entry/src/test/java/org/pitest/mutationtest/build/MutationSourceTest.java
#	pitest-entry/src/test/java/org/pitest/mutationtest/tooling/JarCreatingJarFinderTest.java
#	pitest-maven/src/test/java/org/pitest/maven/MojoToReportOptionsConverterTest.java
#	pitest-maven/src/test/java/org/pitest/maven/PitMojoTest.java
#	pitest/src/test/java/org/pitest/mutationtest/execute/MutationTimeoutDecoratorTest.java
Copy link
Contributor

@StefanPenndorf StefanPenndorf left a comment

Choose a reason for hiding this comment

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

@AlexElin Thank you for your patience!

@hcoles LGTM -- If you like the change too, it's worth merging it soon, otherwise there will likely be merge conflicts to resolve sooner or later.

# Conflicts:
#	pitest-entry/src/test/java/org/pitest/mutationtest/config/CompoundListenerFactoryTest.java
@AlexElin
Copy link
Contributor Author

@hcoles could you merge the changes? if you have no objections, of course

@hcoles
Copy link
Owner

hcoles commented Feb 17, 2021

Hi @AlexElin, thanks for the MR and sorry for the long delay. Fortunately I finally have a bit of time available for pitest.

This was referenced Mar 12, 2021
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.

3 participants