Bump test dependencies: Mockito 2.23.4, JUnit 5.3.2

Author: acogoluegnes

build.gradle

@@ -42,10 +42,9 @@ ext {
 	rabbitMqJavaClientVersion = '5.5.1'
 
 	// Testing
-	mockitoVersion = '1.10.19'
-	awaitilityVersion = '3.1.0'
-	junitPlatformVersion = '1.3.1'
-	junitJupiterVersion  = '5.3.1'
+	mockitoVersion = '2.23.4'
+	junitPlatformVersion = '1.3.2'
+	junitJupiterVersion  = '5.3.2'
 
 	javadocLinks = ["http://docs.oracle.com/javase/7/docs/api/",
 					"http://docs.oracle.com/javaee/6/api/",
@@ -174,8 +173,7 @@ configure(allprojects) { project ->
 		testRuntime("org.junit.platform:junit-platform-launcher:${junitPlatformVersion}")
 
 		testCompile "io.projectreactor:reactor-test:$reactorCoreVersion"
-		testCompile "org.awaitility:awaitility:$awaitilityVersion",
-				"org.mockito:mockito-core:$mockitoVersion"
+		testCompile "org.mockito:mockito-core:$mockitoVersion"
 		testRuntime "org.slf4j:jcl-over-slf4j:$slf4jVersion"
 		testRuntime "org.slf4j:slf4j-api:$slf4jVersion"
 		testRuntime "ch.qos.logback:logback-classic:$logbackVersion"

src/test/java/reactor/rabbitmq/ConnectionRecoveryTests.java

@@ -58,10 +58,10 @@
 import static java.time.Duration.ofMillis;
 import static java.time.Duration.ofSeconds;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
@@ -182,7 +182,7 @@ void consumeAutoAckRetryOnAck() throws Exception {
         when(mockChannel.basicConsume(
             anyString(), anyBoolean(), any(DeliverCallback.class), any(CancelCallback.class)
         )).thenAnswer(answer -> {
-            deliverCallbackAtomicReference.set(answer.getArgumentAt(2, DeliverCallback.class));
+            deliverCallbackAtomicReference.set(answer.getArgument(2));
             consumerRegisteredLatch.countDown();
             return "ctag";
         });
@@ -240,7 +240,7 @@ void consumeManualAckRetryOnAck() throws Exception {
         when(mockChannel.basicConsume(
             anyString(), anyBoolean(), any(DeliverCallback.class), any(CancelCallback.class)
         )).thenAnswer(answer -> {
-            deliverCallbackAtomicReference.set(answer.getArgumentAt(2, DeliverCallback.class));
+            deliverCallbackAtomicReference.set(answer.getArgument(2));
             consumerRegisteredLatch.countDown();
             return "ctag";
         });

src/test/java/reactor/rabbitmq/RabbitFluxTests.java

@@ -55,8 +55,8 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.params.provider.Arguments.of;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.*;
 import static reactor.rabbitmq.RabbitFlux.createReceiver;
 import static reactor.rabbitmq.RabbitFlux.createSender;
@@ -550,20 +550,28 @@ public void senderWithCustomChannelCloseHandler() throws Exception {
     }
 
     @Test
-    public void senderWithCustomChannelCloseHandlerPriority() {
+    public void senderWithCustomChannelCloseHandlerPriority() throws InterruptedException {
         int nbMessages = 10;
         Flux<OutboundMessage> msgFlux = Flux.range(0, nbMessages).map(i -> new OutboundMessage("", queue, "".getBytes()));
 
         SenderChannelCloseHandler channelCloseHandlerInSenderOptions = mock(SenderChannelCloseHandler.class);
         SenderChannelCloseHandler channelCloseHandlerInSendOptions = mock(SenderChannelCloseHandler.class);
 
+        CountDownLatch latch = new CountDownLatch(1);
+        doAnswer(answer -> {
+            latch.countDown();
+            return null;
+        }).when(channelCloseHandlerInSendOptions).accept(any(SignalType.class), any(Channel.class));
+
         SenderOptions senderOptions = new SenderOptions().channelCloseHandler(channelCloseHandlerInSenderOptions);
         sender = createSender(senderOptions);
         SendOptions sendOptions = new SendOptions().channelCloseHandler(channelCloseHandlerInSendOptions);
 
         StepVerifier.create(sender.send(msgFlux, sendOptions))
                 .verifyComplete();
 
+        assertTrue(latch.await(1, TimeUnit.SECONDS));
+
         verify(channelCloseHandlerInSenderOptions, never()).accept(any(SignalType.class), any(Channel.class));
         verify(channelCloseHandlerInSendOptions, times(1)).accept(any(SignalType.class), any(Channel.class));
     }
@@ -611,7 +619,8 @@ public void publishConfirmsErrorWhilePublishing() throws Exception {
 
         doNothing()
                 .doThrow(new IOException("simulated error while publishing"))
-                .when(mockChannel).basicPublish(anyString(), anyString(), any(AMQP.BasicProperties.class), any(byte[].class));
+                .when(mockChannel).basicPublish(anyString(), anyString(), nullable(AMQP.BasicProperties.class), any(byte[].class));
+
 
         int nbMessages = 10;
         Flux<OutboundMessage> msgFlux = Flux.range(0, nbMessages).map(i -> new OutboundMessage("", queue, "".getBytes()));