Repository navigation
Only add the Mockito type import when spying statically - #1204
Merged
Merged
Conversation
Mockito type import in PowerMockitoMockStaticToMockito when spying staticallyMockito type import when spying statically
This file contains hidden or 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
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.
Restores the
spiedStaticallyguard aroundmaybeAddImport("org.mockito.Mockito")that 18c9f6f removed as redundant. Without it,maybeAddImportcounts the statically importedmock(..)/mockStatic(..)calls as references to theMockitotype, so the recipe adds an unusedimport org.mockito.Mockito;next toimport static org.mockito.Mockito.*;. The type import is only needed for theMockito.mockStatic(.., Mockito.CALLS_REAL_METHODS)template used when spying statically. This fixesPowerMockitoMockStaticToMockitoTest.tearDownMethodOfTestNGHasAnnotationWithSameArgumentsAsTheTestThatCallsMockStaticon main.