Commit b85eed4b authored by Andy Wilkinson's avatar Andy Wilkinson

Polish

parent bcd34bca
...@@ -37,7 +37,7 @@ import org.junit.Rule; ...@@ -37,7 +37,7 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.rules.ExpectedException; import org.junit.rules.ExpectedException;
import org.junit.rules.TemporaryFolder; import org.junit.rules.TemporaryFolder;
import org.mockito.internal.util.MockUtil; import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock; import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer; import org.mockito.stubbing.Answer;
...@@ -47,9 +47,9 @@ import org.springframework.test.util.ReflectionTestUtils; ...@@ -47,9 +47,9 @@ import org.springframework.test.util.ReflectionTestUtils;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail; import static org.junit.Assert.fail;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.BDDMockito.willAnswer; import static org.mockito.BDDMockito.willAnswer;
import static org.mockito.BDDMockito.willThrow; import static org.mockito.BDDMockito.willThrow;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
/** /**
...@@ -333,7 +333,7 @@ public class RandomAccessDataFileTests { ...@@ -333,7 +333,7 @@ public class RandomAccessDataFileTests {
public RandomAccessFile answer(InvocationOnMock invocation) throws Throwable { public RandomAccessFile answer(InvocationOnMock invocation) throws Throwable {
RandomAccessFile originalFile = (RandomAccessFile) invocation RandomAccessFile originalFile = (RandomAccessFile) invocation
.callRealMethod(); .callRealMethod();
if (new MockUtil().isSpy(originalFile)) { if (Mockito.isSpy(originalFile)) {
return originalFile; return originalFile;
} }
RandomAccessFile spiedFile = spy(originalFile); RandomAccessFile spiedFile = spy(originalFile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment