public
/
openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[mqtt] Try to make tests more stable (#9297) 

* [mqtt] Try to make tests more stable
* Increase timeout from 10ms to 10sec

Signed-off-by: Fabian Wolter <github@fabian-wolter.de>
This commit is contained in:
Fabian Wolter 2020-12-09 13:21:58 +01:00 committed by GitHub
parent f152a58a31
commit 34a9c5482a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
bundles/org.openhab.binding.mqtt/src/test/java/org/openhab/binding/mqtt/handler/BrokerHandlerTest.java
View File

@ -35,6 +35,7 @@ import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
import org.openhab.core.io.transport.mqtt.MqttConnectionState; import org.openhab.core.io.transport.mqtt.MqttConnectionState;
import org.openhab.core.io.transport.mqtt.MqttException; import org.openhab.core.io.transport.mqtt.MqttException;
import org.openhab.core.io.transport.mqtt.MqttService; import org.openhab.core.io.transport.mqtt.MqttService;
import org.openhab.core.test.java.JavaTest;
import org.openhab.core.thing.Bridge; import org.openhab.core.thing.Bridge;
import org.openhab.core.thing.ThingStatus; import org.openhab.core.thing.ThingStatus;
import org.openhab.core.thing.ThingStatusInfo; import org.openhab.core.thing.ThingStatusInfo;
@ -48,7 +49,7 @@ import org.osgi.service.cm.ConfigurationException;
*/ */
@ExtendWith(MockitoExtension.class) @ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.WARN) @MockitoSettings(strictness = Strictness.WARN)
public class BrokerHandlerTest { public class BrokerHandlerTest extends JavaTest {
private ScheduledExecutorService scheduler; private ScheduledExecutorService scheduler;
private @Mock ThingHandlerCallback callback; private @Mock ThingHandlerCallback callback;
@ -60,10 +61,10 @@ public class BrokerHandlerTest {
private BrokerHandler handler; private BrokerHandler handler;
@BeforeEach @BeforeEach
public void setUp() throws ConfigurationException, MqttException { public void setUp() {
scheduler = new ScheduledThreadPoolExecutor(1); scheduler = new ScheduledThreadPoolExecutor(1);
connection = spy(new MqttBrokerConnectionEx("10.10.0.10", 80, false, "BrokerHandlerTest")); connection = spy(new MqttBrokerConnectionEx("10.10.0.10", 80, false, "BrokerHandlerTest"));
connection.setTimeoutExecutor(scheduler, 10); connection.setTimeoutExecutor(scheduler, 10000);
connection.setConnectionCallback(connection); connection.setConnectionCallback(connection);
Configuration config = new Configuration(); Configuration config = new Configuration();
@ -79,8 +80,7 @@ public class BrokerHandlerTest {
} }
@Test @Test
public void handlerInitWithoutUrl() public void handlerInitWithoutUrl() throws IllegalArgumentException {
throws InterruptedException, IllegalArgumentException, MqttException, ConfigurationException {
// Assume it is a real handler and not a mock as defined above // Assume it is a real handler and not a mock as defined above
handler = new BrokerHandler(thing); handler = new BrokerHandler(thing);
assertThrows(IllegalArgumentException.class, () -> initializeHandlerWaitForTimeout()); assertThrows(IllegalArgumentException.class, () -> initializeHandlerWaitForTimeout());
@ -97,8 +97,7 @@ public class BrokerHandlerTest {
} }
@Test @Test
public void handlerInit() public void handlerInit() throws InterruptedException, IllegalArgumentException {
throws InterruptedException, IllegalArgumentException, MqttException, ConfigurationException {
assertThat(initializeHandlerWaitForTimeout(), is(true)); assertThat(initializeHandlerWaitForTimeout(), is(true));
ArgumentCaptor<ThingStatusInfo> statusInfoCaptor = ArgumentCaptor.forClass(ThingStatusInfo.class); ArgumentCaptor<ThingStatusInfo> statusInfoCaptor = ArgumentCaptor.forClass(ThingStatusInfo.class);
@ -116,8 +115,7 @@ public class BrokerHandlerTest {
* @throws MqttException * @throws MqttException
* @throws ConfigurationException * @throws ConfigurationException
*/ */
boolean initializeHandlerWaitForTimeout() boolean initializeHandlerWaitForTimeout() throws InterruptedException, IllegalArgumentException {
throws InterruptedException, IllegalArgumentException, MqttException, ConfigurationException {
MqttBrokerConnection c = connection; MqttBrokerConnection c = connection;
MqttConnectionObserverEx o = new MqttConnectionObserverEx(); MqttConnectionObserverEx o = new MqttConnectionObserverEx();
@ -125,13 +123,13 @@ public class BrokerHandlerTest {
assertThat(connection.connectionState(), is(MqttConnectionState.DISCONNECTED)); assertThat(connection.connectionState(), is(MqttConnectionState.DISCONNECTED));
handler.initialize(); handler.initialize();
verify(connection, times(2)).addConnectionObserver(any()); waitForAssert(() -> verify(connection, times(2)).addConnectionObserver(any()));
verify(connection, times(1)).start(); waitForAssert(() -> verify(connection, times(1)).start());
// First we expect a CONNECTING state and then a CONNECTED unique state change // First we expect a CONNECTING state and then a CONNECTED unique state change
assertThat(o.counter, is(2)); waitForAssert(() -> assertThat(o.counter, is(2)));
// First we expect a CONNECTING state and then a CONNECTED state change // First we expect a CONNECTING state and then a CONNECTED state change
// (and other CONNECTED after the future completes) // (and other CONNECTED after the future completes)
verify(handler, times(3)).connectionStateChanged(any(), any()); waitForAssert(() -> verify(handler, times(3)).connectionStateChanged(any(), any()));
return true; return true;
} }
} }