From 026feeeedff39a03ed83baf896ec5eea579831ac Mon Sep 17 00:00:00 2001 From: abilan Date: Thu, 1 Dec 2022 14:14:11 -0500 Subject: [PATCH] Fix mocks in Mqttv5AdapterTests The logic in the `Mqttv5PahoMessageDrivenChannelAdapter` of version `5.5.x` is based on a `subscribe(String[] topics, int[] qos)` API --- .../integration/mqtt/Mqttv5AdapterTests.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java index b2d9577062..924f3e8c86 100644 --- a/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java +++ b/spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java @@ -23,11 +23,9 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import org.eclipse.paho.mqttv5.client.IMqttAsyncClient; -import org.eclipse.paho.mqttv5.client.IMqttMessageListener; import org.eclipse.paho.mqttv5.client.IMqttToken; import org.eclipse.paho.mqttv5.client.MqttConnectionOptions; import org.eclipse.paho.mqttv5.common.MqttException; -import org.eclipse.paho.mqttv5.common.MqttSubscription; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.BeanFactory; @@ -56,7 +54,7 @@ public class Mqttv5AdapterTests { adapter.stop(); verify(client).connect(any(MqttConnectionOptions.class)); - verify(client).subscribe(any(MqttSubscription[].class), any(), any(), any(IMqttMessageListener[].class), any()); + verify(client).subscribe(any(String[].class), any(int[].class)); verify(client).unsubscribe(any(String[].class)); } @@ -70,7 +68,7 @@ public class Mqttv5AdapterTests { adapter.stop(); verify(client).connect(any(MqttConnectionOptions.class)); - verify(client).subscribe(any(MqttSubscription[].class), any(), any(), any(IMqttMessageListener[].class), any()); + verify(client).subscribe(any(String[].class), any(int[].class)); verify(client, never()).unsubscribe(any(String[].class)); } @@ -85,7 +83,7 @@ public class Mqttv5AdapterTests { IMqttToken token = mock(IMqttToken.class); given(client.disconnect()).willReturn(token); given(client.connect(any(MqttConnectionOptions.class))).willReturn(token); - given(client.subscribe(any(MqttSubscription[].class), any(), any(), any(IMqttMessageListener[].class), any())) + given(client.subscribe(any(String[].class), any(int[].class))) .willReturn(token); given(client.unsubscribe(any(String[].class))).willReturn(token); Mqttv5PahoMessageDrivenChannelAdapter adapter =