Skip to content

Commit 026feee

Browse files
committed
Fix mocks in Mqttv5AdapterTests
The logic in the `Mqttv5PahoMessageDrivenChannelAdapter` of version `5.5.x` is based on a `subscribe(String[] topics, int[] qos)` API
1 parent 36e4fe1 commit 026feee

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/Mqttv5AdapterTests.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,9 @@
2323
import static org.mockito.Mockito.verify;
2424

2525
import org.eclipse.paho.mqttv5.client.IMqttAsyncClient;
26-
import org.eclipse.paho.mqttv5.client.IMqttMessageListener;
2726
import org.eclipse.paho.mqttv5.client.IMqttToken;
2827
import org.eclipse.paho.mqttv5.client.MqttConnectionOptions;
2928
import org.eclipse.paho.mqttv5.common.MqttException;
30-
import org.eclipse.paho.mqttv5.common.MqttSubscription;
3129
import org.junit.jupiter.api.Test;
3230

3331
import org.springframework.beans.factory.BeanFactory;
@@ -56,7 +54,7 @@ public void testStop() throws Exception {
5654
adapter.stop();
5755

5856
verify(client).connect(any(MqttConnectionOptions.class));
59-
verify(client).subscribe(any(MqttSubscription[].class), any(), any(), any(IMqttMessageListener[].class), any());
57+
verify(client).subscribe(any(String[].class), any(int[].class));
6058
verify(client).unsubscribe(any(String[].class));
6159
}
6260

@@ -70,7 +68,7 @@ public void testStopNotClean() throws Exception {
7068
adapter.stop();
7169

7270
verify(client).connect(any(MqttConnectionOptions.class));
73-
verify(client).subscribe(any(MqttSubscription[].class), any(), any(), any(IMqttMessageListener[].class), any());
71+
verify(client).subscribe(any(String[].class), any(int[].class));
7472
verify(client, never()).unsubscribe(any(String[].class));
7573
}
7674

@@ -85,7 +83,7 @@ private static Mqttv5PahoMessageDrivenChannelAdapter buildAdapterIn(IMqttAsyncCl
8583
IMqttToken token = mock(IMqttToken.class);
8684
given(client.disconnect()).willReturn(token);
8785
given(client.connect(any(MqttConnectionOptions.class))).willReturn(token);
88-
given(client.subscribe(any(MqttSubscription[].class), any(), any(), any(IMqttMessageListener[].class), any()))
86+
given(client.subscribe(any(String[].class), any(int[].class)))
8987
.willReturn(token);
9088
given(client.unsubscribe(any(String[].class))).willReturn(token);
9189
Mqttv5PahoMessageDrivenChannelAdapter adapter =

0 commit comments

Comments
 (0)