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

Update Mockito version number for deletion of deprecated classes #1868

Merged
merged 1 commit into from
Jan 31, 2020
Merged

Update Mockito version number for deletion of deprecated classes #1868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/org/mockito/internal/InternalMockHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* Since this class is internal, e.g. it resides in "org.mockito.internal" package,
* Mockito team can change it without the need for major version release of Mockito.
* <p>
* This interface was deprecated in Mockito 2.10.0 and will be deleted in Mockito 3.0.
* This interface was deprecated in Mockito 2.10.0 and will be deleted in Mockito 4.0.
*/
@Deprecated
public interface InternalMockHandler<T> extends MockHandler {}
2 changes: 0 additions & 2 deletions src/main/java/org/mockito/internal/handler/InvocationNotifierHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
/**
* Handler, that call all listeners wanted for this mock, before delegating it
* to the parameterized handler.
*
* Also imposterize MockHandlerImpl, delegate all call of InternalMockHandler to the real mockHandler
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This seemed to be a stale comment but I can restore it if it is not.

*/
class InvocationNotifierHandler<T> implements MockHandler<T> {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mockito/runners/MockitoJUnitRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/**
* Runner moved to a new place see {@link org.mockito.junit.MockitoJUnitRunner}
*
* @deprecated Moved to {@link org.mockito.junit.MockitoJUnitRunner}, this class will be removed with Mockito 3
* @deprecated Moved to {@link org.mockito.junit.MockitoJUnitRunner}, this class will be removed with Mockito 4
*/
@Deprecated
public class MockitoJUnitRunner extends org.mockito.junit.MockitoJUnitRunner {
Expand Down