Skip to content

J2ObjC: Fix Mockito 5 MockMaker interface compatibility. #2753

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

Closed
copybara-service wants to merge 1 commit into from
+6 −2
Closed

J2ObjC: Fix Mockito 5 MockMaker interface compatibility. #2753

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions testing/mockito/src/main/java/com/google/j2objc/mockito/IosMockMaker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,10 @@ public final class IosMockMaker implements MockMaker {

private static int nextClassNameIndex = 0;

// Mockito 5's MockMaker interface uses raw MockHandler and MockCreationSettings types.
@Override
public <T> T createMock(MockCreationSettings<T> settings, MockHandler<T> handler) {
@SuppressWarnings("rawtypes")
public <T> T createMock(MockCreationSettings<T> settings, MockHandler handler) {
Class<T> typeToMock = settings.getTypeToMock();
@SuppressWarnings("rawtypes")
Set<Class<?>> interfacesSet = settings.getExtraInterfaces();
Expand Down Expand Up @@ -79,13 +81,15 @@ public <T> T createMock(MockCreationSettings<T> settings, MockHandler<T> handler
}

@Override
@SuppressWarnings("rawtypes")
public MockHandler getHandler(Object mock) {
InvocationHandlerAdapter adapter = getInvocationHandlerAdapter(mock);
return adapter != null ? adapter.getHandler() : null;
}

@Override
public void resetMock(Object mock, MockHandler<?> newHandler, MockCreationSettings<?> settings) {
@SuppressWarnings("rawtypes")
public void resetMock(Object mock, MockHandler newHandler, MockCreationSettings settings) {
InvocationHandlerAdapter adapter = getInvocationHandlerAdapter(mock);
adapter.setHandler(newHandler);
}
Expand Down