Further Polish Mockito 2 support

See gh-7770
This commit is contained in:
Phillip Webb
2017-01-05 14:29:29 -08:00
parent 1169f69390
commit 77f9bb09ca
60 changed files with 96 additions and 103 deletions

View File

@@ -32,8 +32,8 @@ import org.springframework.boot.loader.data.RandomAccessData;
import org.springframework.boot.loader.data.RandomAccessDataFile;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.mock;
@@ -61,7 +61,7 @@ public class CentralDirectoryParserTests {
@Test
public void visitsInOrder() throws Exception {
CentralDirectoryVisitor visitor = mock(TestCentralDirectoryVisitor.class);
CentralDirectoryVisitor visitor = mock(CentralDirectoryVisitor.class);
CentralDirectoryParser parser = new CentralDirectoryParser();
parser.addVisitor(visitor);
parser.parse(this.jarData, false);
@@ -118,8 +118,4 @@ public class CentralDirectoryParserTests {
}
public interface TestCentralDirectoryVisitor extends CentralDirectoryVisitor {
}
}