Skip to content

Commit fcb33ef

Browse files
Bump mockito-core from 3.12.4 to 4.10.0 (#587)
* Bump mockito-core from 3.12.4 to 4.10.0 Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.4 to 4.10.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v3.12.4...v4.10.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * updated code to Mockito 4 * updated code to Mockito 4 Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Christoph John <christoph.john@macd.com>
1 parent 5bca738 commit fcb33ef

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

quickfixj-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<dependency>
2929
<groupId>org.mockito</groupId>
3030
<artifactId>mockito-core</artifactId>
31-
<version>3.12.4</version>
31+
<version>4.10.0</version>
3232
<scope>test</scope>
3333
</dependency>
3434
<dependency>

quickfixj-core/src/test/java/quickfix/ApplicationExtendedFunctionalAdapterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void testRemovedCanLogonPredicateNotInvoked() {
5050

5151
verify(predicate2).test(sessionID);
5252
verifyNoMoreInteractions(predicate2);
53-
verifyZeroInteractions(predicate);
53+
verifyNoInteractions(predicate);
5454
}
5555

5656
@Test
@@ -146,7 +146,7 @@ public void testRemovedOnBeforeSessionResetListenersNotInvoked() {
146146
adapter.removeBeforeSessionResetListener(listener);
147147
adapter.onBeforeSessionReset(sessionID);
148148

149-
verifyZeroInteractions(listener);
149+
verifyNoInteractions(listener);
150150
}
151151

152152

quickfixj-core/src/test/java/quickfix/ApplicationFunctionalAdapterTest.java

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void testRemovedOnCreateListenersNotInvoked() {
4444

4545
verify(listener2).accept(sessionID);
4646
verifyNoMoreInteractions(listener2);
47-
verifyZeroInteractions(listener);
47+
verifyNoInteractions(listener);
4848
}
4949

5050
@Test
@@ -80,7 +80,7 @@ public void testRemovedOnLogonListenersNotInvoked() {
8080

8181
verify(listener2).accept(sessionID);
8282
verifyNoMoreInteractions(listener2);
83-
verifyZeroInteractions(listener);
83+
verifyNoInteractions(listener);
8484
}
8585

8686
@Test
@@ -116,7 +116,7 @@ public void testRemovedOnLogoutListenersNotInvoked() {
116116

117117
verify(listener2).accept(sessionID);
118118
verifyNoMoreInteractions(listener2);
119-
verifyZeroInteractions(listener);
119+
verifyNoInteractions(listener);
120120
}
121121

122122
@Test
@@ -154,7 +154,7 @@ public void testRemovedToAdminListenersNotInvoked() {
154154

155155
verify(listener2).accept(message, sessionID);
156156
verifyNoMoreInteractions(listener2);
157-
verifyZeroInteractions(listener);
157+
verifyNoInteractions(listener);
158158
}
159159

160160
@Test
@@ -191,7 +191,7 @@ public void testToAdminTypeSafeListenersNotInvokedForUnmatchedMessageType() {
191191

192192
verify(listener).accept(message, sessionID);
193193
verifyNoMoreInteractions(listener);
194-
verifyZeroInteractions(listener2);
194+
verifyNoInteractions(listener2);
195195
}
196196

197197
@Test
@@ -210,7 +210,7 @@ public void testRemovedToAdminTypeSafeListenersNotInvoked() {
210210

211211
verify(listener2).accept(message, sessionID);
212212
verifyNoMoreInteractions(listener2);
213-
verifyZeroInteractions(listener);
213+
verifyNoInteractions(listener);
214214
}
215215

216216
@Test
@@ -248,7 +248,7 @@ public void testRemovedFromAdminListenersNotInvoked() throws FieldNotFound, Inco
248248

249249
verify(listener2).accept(message, sessionID);
250250
verifyNoMoreInteractions(listener2);
251-
verifyZeroInteractions(listener);
251+
verifyNoInteractions(listener);
252252
}
253253

254254
@Test
@@ -296,7 +296,7 @@ private void assertFromAdminListenersFailFast(Exception exception) throws FieldN
296296
verify(listener).accept(message, sessionID);
297297
verify(listener2).accept(message, sessionID);
298298
verifyNoMoreInteractions(listener, listener2);
299-
verifyZeroInteractions(listener3);
299+
verifyNoInteractions(listener3);
300300
}
301301

302302
@Test
@@ -333,7 +333,7 @@ public void testFromAdminTypeSafeListenersNotInvokedForUnmatchedMessageType() th
333333

334334
verify(listener).accept(message, sessionID);
335335
verifyNoMoreInteractions(listener);
336-
verifyZeroInteractions(listener2);
336+
verifyNoInteractions(listener2);
337337
}
338338

339339
@Test
@@ -399,7 +399,7 @@ private <T extends Message> void assertFromAdminTypeSafeListenersFailFast(Except
399399
verify(listener).accept(message, sessionID);
400400
verify(listener2).accept(message, sessionID);
401401
verifyNoMoreInteractions(listener, listener2);
402-
verifyZeroInteractions(listener3);
402+
verifyNoInteractions(listener3);
403403
}
404404

405405
@Test
@@ -437,7 +437,7 @@ public void testRemovedToAppListenersNotInvoked() throws DoNotSend {
437437

438438
verify(listener2).accept(message, sessionID);
439439
verifyNoMoreInteractions(listener2);
440-
verifyZeroInteractions(listener);
440+
verifyNoInteractions(listener);
441441
}
442442

443443
@Test
@@ -467,7 +467,7 @@ public void testToAppListenersFailFastForDoNotSend() throws DoNotSend {
467467
verify(listener).accept(message, sessionID);
468468
verify(listener2).accept(message, sessionID);
469469
verifyNoMoreInteractions(listener, listener2);
470-
verifyZeroInteractions(listener3);
470+
verifyNoInteractions(listener3);
471471
}
472472

473473
@Test
@@ -504,7 +504,7 @@ public void testToAppTypeSafeListenersNotInvokedForUnmatchedMessageType() throws
504504

505505
verify(listener).accept(message, sessionID);
506506
verifyNoMoreInteractions(listener);
507-
verifyZeroInteractions(listener2);
507+
verifyNoInteractions(listener2);
508508
}
509509

510510
@Test
@@ -553,7 +553,7 @@ public void testToAppTypeSafeListenersFailFastForFieldNotFound() throws DoNotSen
553553
verify(listener).accept(message, sessionID);
554554
verify(listener2).accept(message, sessionID);
555555
verifyNoMoreInteractions(listener, listener2);
556-
verifyZeroInteractions(listener3);
556+
verifyNoInteractions(listener3);
557557
}
558558

559559
@Test
@@ -591,7 +591,7 @@ public void testRemovedFromAppListenersNotInvoked() throws FieldNotFound, Incorr
591591

592592
verify(listener2).accept(message, sessionID);
593593
verifyNoMoreInteractions(listener2);
594-
verifyZeroInteractions(listener);
594+
verifyNoInteractions(listener);
595595
}
596596

597597
@Test
@@ -639,7 +639,7 @@ private void assertFromAppListenersFailFast(Exception exception) throws FieldNot
639639
verify(listener).accept(message, sessionID);
640640
verify(listener2).accept(message, sessionID);
641641
verifyNoMoreInteractions(listener, listener2);
642-
verifyZeroInteractions(listener3);
642+
verifyNoInteractions(listener3);
643643
}
644644

645645
@Test
@@ -676,7 +676,7 @@ public void testFromAppTypeSafeListenersNotInvokedForUnmatchedMessageType() thro
676676

677677
verify(listener).accept(message, sessionID);
678678
verifyNoMoreInteractions(listener);
679-
verifyZeroInteractions(listener2);
679+
verifyNoInteractions(listener2);
680680
}
681681

682682
@Test
@@ -742,7 +742,7 @@ private <T extends Message> void assertFromAppTypeSafeListenersFailFast(Exceptio
742742
verify(listener).accept(message, sessionID);
743743
verify(listener2).accept(message, sessionID);
744744
verifyNoMoreInteractions(listener, listener2);
745-
verifyZeroInteractions(listener3);
745+
verifyNoInteractions(listener3);
746746
}
747747

748748
private static class MyMessage1 extends Message {

quickfixj-core/src/test/java/quickfix/MessageUtilsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import static org.junit.Assert.assertThat;
4141
import static org.junit.Assert.fail;
4242
import org.junit.Test;
43-
import static org.mockito.Matchers.any;
43+
import static org.mockito.ArgumentMatchers.any;
4444
import static org.mockito.Mockito.mock;
4545
import static org.mockito.Mockito.when;
4646

quickfixj-core/src/test/java/quickfix/SessionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
import static org.junit.Assert.assertNull;
6363
import static org.junit.Assert.assertTrue;
6464
import static org.junit.Assert.fail;
65-
import static org.mockito.Matchers.anyString;
65+
import static org.mockito.ArgumentMatchers.anyString;
6666
import static org.mockito.Mockito.atLeastOnce;
6767
import static org.mockito.Mockito.mock;
6868
import static org.mockito.Mockito.times;

quickfixj-core/src/test/java/quickfix/mina/WatermarkTrackerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.junit.Test;
2424
import org.junit.runner.RunWith;
2525
import org.mockito.Mock;
26-
import org.mockito.runners.MockitoJUnitRunner;
26+
import org.mockito.junit.MockitoJUnitRunner;
2727

2828
import java.util.concurrent.ArrayBlockingQueue;
2929
import java.util.concurrent.BlockingQueue;

0 commit comments

Comments
 (0)