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

Fix disabled integration tests (#8609)

Browse Source 
* Fix disabled integration tests

Fixes and enables:

* org.openhab.binding.mqtt.homeassistant.tests
* org.openhab.binding.mqtt.homie.tests
* org.openhab.io.mqttembeddedbroker.tests

Fixes #8537 
* Address review comment

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-09-29 23:05:39 +02:00
committed by GitHub
parent 831eaeb026
commit d72a077ba9
15 changed files with 117 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
View File

@@ -9,6 +9,10 @@ Fragment-Host: org.openhab.binding.mqtt.homie
bnd.identity;id='org.openhab.core.thing.xml',\
bnd.identity;id='org.openhab.io.mqttembeddedbroker'
# We would like to use the "volatile" storage only
-runblacklist: \
bnd.identity;id='org.openhab.core.storage.json'
#
# done
#
@@ -83,5 +87,6 @@ Fragment-Host: org.openhab.binding.mqtt.homie
org.openhab.core.transform;version='[3.0.0,3.0.1)',\
org.openhab.io.mqttembeddedbroker;version='[3.0.0,3.0.1)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)'
org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)',\
moquette-broker;version='[0.13.0,0.13.1)'
-runvm: -Dio.netty.noUnsafe=true

5
itests/org.openhab.binding.mqtt.homie.tests/src/main/java/org/openhab/binding/mqtt/EmbeddedBrokerTools.java
View File

@@ -17,7 +17,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.openhab.core.io.transport.mqtt.MqttBrokerConnection;
@@ -53,7 +52,7 @@ public class EmbeddedBrokerTools {
MqttServiceObserver observer = new MqttServiceObserver() {
@Override
public void brokerAdded(@NonNull String brokerID, @NonNull MqttBrokerConnection broker) {
public void brokerAdded(String brokerID, MqttBrokerConnection broker) {
if (brokerID.equals(Constants.CLIENTID)) {
embeddedConnection = broker;
semaphore.release();
@@ -61,7 +60,7 @@ public class EmbeddedBrokerTools {
}
@Override
public void brokerRemoved(@NonNull String brokerID, @NonNull MqttBrokerConnection broker) {
public void brokerRemoved(String brokerID, MqttBrokerConnection broker) {
}
};
mqttService.addBrokersListener(observer);

68
itests/org.openhab.binding.mqtt.homie.tests/src/main/java/org/openhab/binding/mqtt/HomieImplementationTest.java
View File

@@ -20,7 +20,6 @@ import static org.mockito.Mockito.*;
import static org.mockito.MockitoAnnotations.openMocks;
import java.nio.charset.StandardCharsets;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -32,6 +31,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -65,25 +65,26 @@ import org.openhab.core.types.UnDefType;
*
* @author David Graeff - Initial contribution
*/
@NonNullByDefault
public class HomieImplementationTest extends JavaOSGiTest {
private static final String BASE_TOPIC = "homie";
private static final String DEVICE_ID = ThingChannelConstants.testHomieThing.getId();
private static final String DEVICE_TOPIC = BASE_TOPIC + "/" + DEVICE_ID;
private MqttService mqttService;
private MqttBrokerConnection embeddedConnection;
private MqttBrokerConnection connection;
private @NonNullByDefault({}) MqttService mqttService;
private @NonNullByDefault({}) MqttBrokerConnection embeddedConnection;
private @NonNullByDefault({}) MqttBrokerConnection connection;
private int registeredTopics = 100;
private AutoCloseable mocksCloseable;
private @NonNullByDefault({}) AutoCloseable mocksCloseable;
// The handler is not tested here, so just mock the callback
private @Mock DeviceCallback callback;
private @Mock @NonNullByDefault({}) DeviceCallback callback;
// A handler mock is required to verify that channel value changes have been received
private @Mock HomieThingHandler handler;
private @Mock @NonNullByDefault({}) HomieThingHandler handler;
private ScheduledExecutorService scheduler;
private @NonNullByDefault({}) ScheduledExecutorService scheduler;
/**
* Create an observer that fails the test as soon as the broker client connection changes its connection state
@@ -92,7 +93,7 @@ public class HomieImplementationTest extends JavaOSGiTest {
private MqttConnectionObserver failIfChange = (state, error) -> assertThat(state,
is(MqttConnectionState.CONNECTED));
private String propertyTestTopic;
private String propertyTestTopic = "";
@BeforeEach
public void beforeEach() throws Exception {
@@ -102,50 +103,47 @@ public class HomieImplementationTest extends JavaOSGiTest {
embeddedConnection = new EmbeddedBrokerTools().waitForConnection(mqttService);
embeddedConnection.setQos(1);
embeddedConnection.setRetain(true);
connection = new MqttBrokerConnection(embeddedConnection.getHost(), embeddedConnection.getPort(),
embeddedConnection.isSecure(), "homie");
connection.setQos(1);
connection.setPersistencePath(Paths.get("subconn"));
connection.start().get(500, TimeUnit.MILLISECONDS);
assertThat(connection.connectionState(), is(MqttConnectionState.CONNECTED));
// If the connection state changes in between -> fail
connection.addConnectionObserver(failIfChange);
List<CompletableFuture<Boolean>> futures = new ArrayList<>();
futures.add(embeddedConnection.publish(DEVICE_TOPIC + "/$homie", "3.0".getBytes()));
futures.add(embeddedConnection.publish(DEVICE_TOPIC + "/$name", "Name".getBytes()));
futures.add(embeddedConnection.publish(DEVICE_TOPIC + "/$state", "ready".getBytes()));
futures.add(embeddedConnection.publish(DEVICE_TOPIC + "/$nodes", "testnode".getBytes()));
futures.add(publish(DEVICE_TOPIC + "/$homie", "3.0"));
futures.add(publish(DEVICE_TOPIC + "/$name", "Name"));
futures.add(publish(DEVICE_TOPIC + "/$state", "ready"));
futures.add(publish(DEVICE_TOPIC + "/$nodes", "testnode"));
// Add homie node topics
final String testNode = DEVICE_TOPIC + "/testnode";
futures.add(embeddedConnection.publish(testNode + "/$name", "Testnode".getBytes()));
futures.add(embeddedConnection.publish(testNode + "/$type", "Type".getBytes()));
futures.add(
embeddedConnection.publish(testNode + "/$properties", "temperature,doorbell,testRetain".getBytes()));
futures.add(publish(testNode + "/$name", "Testnode"));
futures.add(publish(testNode + "/$type", "Type"));
futures.add(publish(testNode + "/$properties", "temperature,doorbell,testRetain"));
// Add homie property topics
final String property = testNode + "/temperature";
futures.add(embeddedConnection.publish(property, "10".getBytes()));
futures.add(embeddedConnection.publish(property + "/$name", "Testprop".getBytes()));
futures.add(embeddedConnection.publish(property + "/$settable", "true".getBytes()));
futures.add(embeddedConnection.publish(property + "/$unit", "°C".getBytes(StandardCharsets.UTF_8)));
futures.add(embeddedConnection.publish(property + "/$datatype", "float".getBytes()));
futures.add(embeddedConnection.publish(property + "/$format", "-100:100".getBytes()));
futures.add(publish(property, "10"));
futures.add(publish(property + "/$name", "Testprop"));
futures.add(publish(property + "/$settable", "true"));
futures.add(publish(property + "/$unit", "°C"));
futures.add(publish(property + "/$datatype", "float"));
futures.add(publish(property + "/$format", "-100:100"));
final String propertyBellTopic = testNode + "/doorbell";
futures.add(embeddedConnection.publish(propertyBellTopic + "/$name", "Doorbell".getBytes()));
futures.add(embeddedConnection.publish(propertyBellTopic + "/$settable", "false".getBytes()));
futures.add(embeddedConnection.publish(propertyBellTopic + "/$retained", "false".getBytes()));
futures.add(embeddedConnection.publish(propertyBellTopic + "/$datatype", "boolean".getBytes()));
futures.add(publish(propertyBellTopic + "/$name", "Doorbell"));
futures.add(publish(propertyBellTopic + "/$settable", "false"));
futures.add(publish(propertyBellTopic + "/$retained", "false"));
futures.add(publish(propertyBellTopic + "/$datatype", "boolean"));
this.propertyTestTopic = testNode + "/testRetain";
futures.add(embeddedConnection.publish(propertyTestTopic + "/$name", "Test".getBytes()));
futures.add(embeddedConnection.publish(propertyTestTopic + "/$settable", "true".getBytes()));
futures.add(embeddedConnection.publish(propertyTestTopic + "/$retained", "false".getBytes()));
futures.add(embeddedConnection.publish(propertyTestTopic + "/$datatype", "boolean".getBytes()));
futures.add(publish(propertyTestTopic + "/$name", "Test"));
futures.add(publish(propertyTestTopic + "/$settable", "true"));
futures.add(publish(propertyTestTopic + "/$retained", "false"));
futures.add(publish(propertyTestTopic + "/$datatype", "boolean"));
registeredTopics = futures.size();
CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).get(1000, TimeUnit.MILLISECONDS);
@@ -153,6 +151,10 @@ public class HomieImplementationTest extends JavaOSGiTest {
scheduler = new ScheduledThreadPoolExecutor(6);
}
private CompletableFuture<Boolean> publish(String topic, String message) {
return embeddedConnection.publish(topic, message.getBytes(StandardCharsets.UTF_8), 0, true);
}
@AfterEach
public void afterEach() throws Exception {
if (connection != null) {

2
itests/org.openhab.binding.mqtt.homie.tests/src/main/java/org/openhab/binding/mqtt/ThingChannelConstants.java
View File

@@ -14,6 +14,7 @@ package org.openhab.binding.mqtt;
import static org.openhab.binding.mqtt.homie.generic.internal.MqttBindingConstants.HOMIE300_MQTT_THING;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.openhab.core.thing.ThingUID;
/**
@@ -21,6 +22,7 @@ import org.openhab.core.thing.ThingUID;
*
* @author David Graeff - Initial contribution
*/
@NonNullByDefault
public class ThingChannelConstants {
// Common ThingUID and ChannelUIDs
public final static ThingUID testHomieThing = new ThingUID(HOMIE300_MQTT_THING, "device123");