Update to junit5 and mockito #1550
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Rebased with buildx tests |
Codecov Report
@@ Coverage Diff @@
## master #1550 +/- ##
============================================
- Coverage 62.88% 62.64% -0.24%
+ Complexity 2155 2139 -16
============================================
Files 170 170
Lines 9894 9882 -12
Branches 1354 1354
============================================
- Hits 6222 6191 -31
- Misses 3159 3176 +17
- Partials 513 515 +2
|
|
OK, finally works on windows. |
|
Could you please review Sonar code smells and address whichever seem appropriate to you? |
|
All SQ issues removed from 'new' code. |
|
@rohanKanojia Ready to merge? |
|
Thanks, let me give it a quick review in a few days. |
rohanKanojia
approved these changes
May 21, 2022
| result = "linux/amd64"; | ||
| }}; | ||
| Mockito.doReturn(buildXService).when(serviceHub).getBuildXService(); | ||
| // Mockito.doReturn(null).when(authConfigFactory).createAuthConfig(false, false, null, null, null, null); |
There was a problem hiding this comment.
Is this comment really needed?
| Assertions.assertEquals("Response", response); | ||
| verifyHttpClientExecute((HttpUriRequest request, ResponseHandler responseHandler) -> { | ||
| Assertions.assertEquals(Collections.singletonMap("Accept", "*/*"), headersAsMap(request.getAllHeaders())); | ||
| /* assertThat(responseHandler) |
There was a problem hiding this comment.
why is this assertion commented? was it failing?
| /* Mockito.verify(mockDelegate) | ||
| .post(Mockito.anyString(), Mockito.isNull(), Mockito.anyMap(), Mockito.any(ResponseHandler.class), Mockito.eq(200)); | ||
|
|
||
| */ |
There was a problem hiding this comment.
Is this comment necessary?
There was a problem hiding this comment.
already verified in method thenPushSucceeded()
| result = Collections.emptyList(); | ||
| }}; | ||
| Mockito.doReturn(oldImageId, newImageId).when(queryService).getImageId(name); | ||
| // Mockito.doReturn(Collections.emptyList()).when(docker).getImageTags("oldimage"); |
There was a problem hiding this comment.
excess mocking. I have removed line
|
Kudos, SonarCloud Quality Gate passed! |
|
@chonton : Thanks a lot 💪 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mojo classes have many private fields changed to package-protected for unit tests to manipulate values.
junit updated from 4 to 5
jmockit migrated to mockito
multiple test frameworks removed in favor of junit5 capabilities