X Tutup
Skip to content

Commit ca3e6db

Browse files
PascalSchumacherjnape
authored andcommitted
Update Mockito version to 2.28.2 (fixes palatable#57).
1 parent e3d13b7 commit ca3e6db

File tree

9 files changed

+11
-9
lines changed

9 files changed

+11
-9
lines changed

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@
7272
</dependency>
7373
<dependency>
7474
<groupId>org.mockito</groupId>
75-
<artifactId>mockito-all</artifactId>
75+
<artifactId>mockito-core</artifactId>
76+
<version>2.28.2</version>
7677
</dependency>
7778
<dependency>
7879
<groupId>com.jnape.palatable</groupId>

src/test/java/com/jnape/palatable/lambda/internal/iteration/CombinatorialIteratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.junit.Test;
55
import org.junit.runner.RunWith;
66
import org.mockito.Mock;
7-
import org.mockito.runners.MockitoJUnitRunner;
7+
import org.mockito.junit.MockitoJUnitRunner;
88

99
import java.util.Iterator;
1010

src/test/java/com/jnape/palatable/lambda/internal/iteration/DroppingIteratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.junit.Test;
55
import org.junit.runner.RunWith;
66
import org.mockito.Mock;
7-
import org.mockito.runners.MockitoJUnitRunner;
7+
import org.mockito.junit.MockitoJUnitRunner;
88

99
import java.util.Iterator;
1010

src/test/java/com/jnape/palatable/lambda/internal/iteration/GroupingIteratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.junit.Test;
55
import org.junit.runner.RunWith;
66
import org.mockito.Mock;
7-
import org.mockito.runners.MockitoJUnitRunner;
7+
import org.mockito.junit.MockitoJUnitRunner;
88

99
import java.util.Iterator;
1010

src/test/java/com/jnape/palatable/lambda/internal/iteration/PredicatedDroppingIteratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.junit.Test;
66
import org.junit.runner.RunWith;
77
import org.mockito.Mock;
8-
import org.mockito.runners.MockitoJUnitRunner;
8+
import org.mockito.junit.MockitoJUnitRunner;
99

1010
import java.util.Iterator;
1111
import java.util.NoSuchElementException;

src/test/java/com/jnape/palatable/lambda/internal/iteration/ReversingIteratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.junit.Test;
55
import org.junit.runner.RunWith;
66
import org.mockito.Mock;
7-
import org.mockito.runners.MockitoJUnitRunner;
7+
import org.mockito.junit.MockitoJUnitRunner;
88

99
import java.util.Iterator;
1010

src/test/java/com/jnape/palatable/lambda/internal/iteration/RewindableIteratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import org.junit.Test;
55
import org.junit.runner.RunWith;
66
import org.mockito.Mock;
7-
import org.mockito.runners.MockitoJUnitRunner;
7+
import org.mockito.junit.MockitoJUnitRunner;
88

99
import java.util.Iterator;
1010
import java.util.NoSuchElementException;

src/test/java/com/jnape/palatable/lambda/internal/iteration/ZippingIteratorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.junit.Test;
66
import org.junit.runner.RunWith;
77
import org.mockito.Mock;
8-
import org.mockito.runners.MockitoJUnitRunner;
8+
import org.mockito.junit.MockitoJUnitRunner;
99

1010
import java.util.Iterator;
1111

src/test/java/testsupport/matchers/ZeroInvocationsMatcher.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.hamcrest.Matcher;
66
import org.mockito.exceptions.misusing.NotAMockException;
77
import org.mockito.exceptions.verification.NoInteractionsWanted;
8+
import org.mockito.internal.stubbing.InvocationContainerImpl;
89
import org.mockito.internal.util.MockUtil;
910
import org.mockito.invocation.Invocation;
1011

@@ -26,7 +27,7 @@ public boolean matches(Object item) {
2627
@Override
2728
public void describeMismatch(Object item, final Description description) {
2829
description.appendText("had these: ");
29-
for (Invocation invocation : new MockUtil().getMockHandler(item).getInvocationContainer().getInvocations())
30+
for (Invocation invocation : ((InvocationContainerImpl) MockUtil.getMockHandler(item).getInvocationContainer()).getInvocations())
3031
description.appendText(invocation.toString());
3132
}
3233

0 commit comments

Comments
 (0)
X Tutup