InstanceOf matcher does not accept null values -> mockedObject.setValue(null) is not possible

I don’t know if this is Mockito or GwtMockito related (https://github.com/google/gwtmock https://github.com/google/gwtmockito/issues/62). I mocked a text field and used an answer object to connect the getValue() and setValue() methods. Both methods work with a string. This worked fine with Mockito 1.10.19 but since Mockito 2.1.0 the following case is broken: textField.setValue(null);

I debugged the code and saw that the answer object is never been called. The reason is, that the InstanceOf.matches() method does not accept a null value:

public boolean matches(Object actual) {
    return (actual != null) &&
            (Primitives.isAssignableFromWrapper(actual.getClass(), clazz)
                    || clazz.isAssignableFrom(actual.getClass()));
}

textField.setValue(null); -> actual is null and therefore the answer object is not called.

In other words: It is not possible to set a null string.

My answer implementation:

public class ValueAnswer implements Answer<Object> {

  private Object value;

  @Override
  public Object answer(final InvocationOnMock invocation) throws Throwable {

    if ((invocation != null) && (invocation.getArguments() != null) && (invocation.getArguments().length == 1)) {
      value = invocation.getArguments()[0];
    }

    return value;
  }

}

[bric3]

@Martin-Wegner Yes there is in AdditionalMatchers

[Martin-Luft]

@bric3 thanks for your reply. Yes I think in my case it is not a problem. Is there an or operator for matchers?