GH-1312: Fix Deprecation Warnings in Tests

Author: garyrussell

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateDirectReplyToContainerIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.Mockito.mock;
 
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
@@ -37,6 +38,8 @@
 import org.springframework.amqp.utils.test.TestUtils;
 import org.springframework.util.ErrorHandler;
 
+import com.rabbitmq.client.Channel;
+
 /**
  * @author Gary Russell
  * @since 2.0
@@ -74,11 +77,11 @@ public void channelReleasedOnTimeout() throws Exception {
 		assertThat(TestUtils.getPropertyValue(container, "inUseConsumerChannels", Map.class)).hasSize(0);
 		assertThat(TestUtils.getPropertyValue(container, "errorHandler")).isSameAs(replyErrorHandler);
 		Message replyMessage = new Message("foo".getBytes(), new MessageProperties());
-		assertThatThrownBy(() -> rabbitTemplate.onMessage(replyMessage))
+		assertThatThrownBy(() -> rabbitTemplate.onMessage(replyMessage, mock(Channel.class)))
 			.isInstanceOf(AmqpRejectAndDontRequeueException.class)
 			.hasMessage("No correlation header in reply");
 		replyMessage.getMessageProperties().setCorrelationId("foo");
-		assertThatThrownBy(() -> rabbitTemplate.onMessage(replyMessage))
+		assertThatThrownBy(() -> rabbitTemplate.onMessage(replyMessage, mock(Channel.class)))
 			.isInstanceOf(AmqpRejectAndDontRequeueException.class)
 			.hasMessage("Reply received after timeout");
 

spring-rabbit/src/test/java/org/springframework/amqp/rabbit/core/RabbitTemplateHeaderTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2020 the original author or authors.
+ * Copyright 2002-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,7 +96,7 @@ private void testNoExistingReplyToOrCorrelationGuts(final boolean standardHeader
 			MessageProperties springProps = new DefaultMessagePropertiesConverter()
 					.toMessageProperties(basicProps, null, "UTF-8");
 			Message replyMessage = new Message("!dlrow olleH".getBytes(), springProps);
-			template.onMessage(replyMessage);
+			template.onMessage(replyMessage, mock(Channel.class));
 			return null;
 		}).given(mockChannel).basicPublish(any(String.class), any(String.class), Mockito.anyBoolean(),
 				any(BasicProperties.class), any(byte[].class));
@@ -146,7 +146,7 @@ public void testReplyToOneDeep() throws Exception {
 			MessageProperties springProps = new DefaultMessagePropertiesConverter()
 					.toMessageProperties(basicProps, null, "UTF-8");
 			Message replyMessage = new Message("!dlrow olleH".getBytes(), springProps);
-			template.onMessage(replyMessage);
+			template.onMessage(replyMessage, mock(Channel.class));
 			return null;
 		}).given(mockChannel).basicPublish(any(String.class), any(String.class), Mockito.anyBoolean(),
 				any(BasicProperties.class), any(byte[].class));
@@ -201,7 +201,7 @@ public void testReplyToThreeDeep() throws Exception {
 				nestedReplyTo.add(replyMessage.getMessageProperties().getReplyTo());
 				nestedCorrelation.add(replyMessage.getMessageProperties().getCorrelationId());
 			}
-			template.onMessage(replyMessage);
+			template.onMessage(replyMessage, mock(Channel.class));
 			return null;
 		}).given(mockChannel).basicPublish(any(String.class), any(String.class), Mockito.anyBoolean(),
 				any(BasicProperties.class), any(byte[].class));
@@ -251,7 +251,7 @@ public void testReplyToOneDeepCustomCorrelationKey() throws Exception {
 			MessageProperties springProps = new DefaultMessagePropertiesConverter()
 					.toMessageProperties(basicProps, null, "UTF-8");
 			Message replyMessage = new Message("!dlrow olleH".getBytes(), springProps);
-			template.onMessage(replyMessage);
+			template.onMessage(replyMessage, mock(Channel.class));
 			return null;
 		}).given(mockChannel).basicPublish(any(String.class), any(String.class), Mockito.anyBoolean(),
 				any(BasicProperties.class), any(byte[].class));
@@ -308,7 +308,7 @@ public void testReplyToThreeDeepCustomCorrelationKey() throws Exception {
 				nestedReplyTo.add(replyMessage.getMessageProperties().getReplyTo());
 				nestedCorrelation.add((String) replyMessage.getMessageProperties().getHeaders().get(CORRELATION_HEADER));
 			}
-			template.onMessage(replyMessage);
+			template.onMessage(replyMessage, mock(Channel.class));
 			return null;
 		}).given(mockChannel).basicPublish(any(String.class), any(String.class), Mockito.anyBoolean(),
 				any(BasicProperties.class), any(byte[].class));