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.

Sign up for GitHub

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

Jump to bottom

Improvement of Replace PowerMockito with Mockito static mocking #312

Merged
merged 29 commits into from
Feb 13, 2023
Merged

Improvement of Replace PowerMockito with Mockito static mocking #312

merged 29 commits into from
Feb 13, 2023

Conversation

klauerm
Copy link
Contributor

@klauerm klauerm commented Feb 9, 2023 •
edited by timtebeek

Fixes #293

klauerm and others added 22 commits January 27, 2023 15:07
@klauerm
Unit Test for replacing mockStatic method.
246e416
@klauerm
Modified recipe list
95abee1
@klauerm
Tried to use org.powermock for unit test
8c576bd
@klauerm @timtebeek
Update src/test/java/org/openrewrite/java/testing/mockito/ReplacePowe…
15f5f99 
…rMockitoIntegrationTest.java

Co-authored-by: Tim te Beek <timtebeek@gmail.com>
@sambsnyd
Update src/test/java/org/openrewrite/java/testing/mockito/ReplacePowe…
38061bc 
…rMockitoIntegrationTest.java
@klauerm
added unit test parser dependency to powermock
24e1209
@timtebeek
Add powermock jars for classpathFromResources
dea6eeb
@klauerm
Removed additional Powermock annotations
e36f38d
@klauerm
Exclude Visual Studio Code settings from git
69a84c0
@klauerm
New Recipe PowerMockitoMockStaticToMockito
c660098 
- First it removes the PowerMockTestCaseConfig extension
@klauerm
Try to replace @PrepareForTest annotation with new MockedStatic fields
0df451e
@klauerm
Give the test method a meaningful name
82c9c62
@sambsnyd
Mostly get the test cases passing. There is still a problem with the …
b109223 
…template which I think is a bug in OpenRewrite.
@sambsnyd
Get tests passing
9866036
@sambsnyd
Add missing license headers
9b1b3f3
@klauerm
Updated mockito.yml and IntegrationTest to reflect changes from last …
0d1dfae 
…commit of code review
@klauerm
Added tearDown() methods to the refactored tests
a081505
@klauerm
Refactoring and code clean up
7fb043a
@klauerm
Fixed issue with missing statements in tearDown method.
f9c188f 
- Unit tests are failing because of missing type
@klauerm
Merge branch 'main' into feature/replace-power-mockito-recipe
cbb5fb4 
# Conflicts:
#	build.gradle.kts
#	src/main/java/org/openrewrite/java/testing/mockito/PowerMockitoMockStaticToMockito.java
#	src/test/java/org/openrewrite/java/testing/mockito/PowerMockitoMockStaticToMockitoTest.java
@klauerm
Tried to replace Mockito.when with MockedStatic.when
a94a114 
- Unit tests are failing because of missing type
@klauerm
Specified requirements in ReplacePowerMockitoIntegrationTest
c778cbc 
- Unit tests are failing because of missing type
@klauerm klauerm mentioned this pull request Feb 9, 2023
Closed
@klauerm
Copy link
Contributor Author

klauerm commented Feb 9, 2023

Hi @sambsnyd @timtebeek,
Can you have a look. The integration test src/test/java/org/openrewrite/java/testing/mockito/ReplacePowerMockitoIntegrationTest.java holds all the requirement we need for our code base. But it is still failing. I don't know how to fix the issue I mentioned in slack

@klauerm
Fixed unit tests and 1 integration test
3f00589 
- The testNG case is still missing

- Unit tests are failing because of missing type
@klauerm
Copy link
Contributor Author

klauerm commented Feb 10, 2023

@timtebeek I've fixed all tests except for 1 in src/test/java/org/openrewrite/java/testing/mockito/ReplacePowerMockitoIntegrationTest.java
Here the feature for using testng annotations, if the mockito tests are written with testng is still missng. Can you please activate this integration test for the pipeline again?
Thank you, Matthias

@timtebeek
Copy link
Contributor

As discussed on Slack

ReplacePowerMockitoIntegrationTest > testThatPowerMockitoIsReplacedInTestNGTests() FAILED
it seems to use @AfterEach instead of @AfterMethod
I think the maybeAddTearDownMethodBody function either needs to be aware of TestNG, and then add the corresponding AfterEach/AfterMethod annotation, or needs a twin to handle TestNG tear down.. now it seems specific to JUnit, and I'm not seeing an equivalent for TestNG

@timtebeek timtebeek marked this pull request as ready for review February 13, 2023 18:16
@sambsnyd sambsnyd merged commit 594a3df into openrewrite:main Feb 13, 2023
@sambsnyd
Copy link
Member

I haven't reviewed this in great detail, so there may be suggestions or improvements to come later, but for now we can merge and iterate on it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
design-partner 3 recipe Recipe request
Projects
OpenRewrite
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Recipe - Replace PowerMockito with raw Mockito
4 participants
@klauerm @timtebeek @sambsnyd @tpoeppke