ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Fixe some buggs in MQTT, it works now

Browse source
This commit is contained in:
Ziver Koc 2024-09-09 23:35:26 +02:00
parent b7ee6b16dc
commit 34e6843d91
5 changed files with 60 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

92
plugins/hal-mqtt/test/se/hal/plugin/mqtt/detector/GenericMqttDetectorTest.java
View file

@ -1,6 +1,7 @@
package se.hal.plugin.mqtt.detector;
import org.junit.Test;
import se.hal.plugin.mqtt.device.HalMqttDeviceConfig;
import se.hal.plugin.mqtt.device.HalMqttHumidityDeviceConfig;
import se.hal.plugin.mqtt.device.HalMqttParticularMatterDeviceConfig;
import se.hal.plugin.mqtt.device.HalMqttTemperatureDeviceConfig;
@ -11,6 +12,7 @@ import se.hal.test.MockHalDeviceReportListener;
import zutil.converter.Converter;
import java.nio.charset.StandardCharsets;
import java.util.List;
import static org.junit.Assert.*;
@ -19,123 +21,73 @@ public class GenericMqttDetectorTest {
@Test
public void ignoredTopics() {
MockHalDeviceReportListener listener = new MockHalDeviceReportListener();
GenericMqttDetector detector = new GenericMqttDetector();
detector.addListener(listener);
listener.reset();
detector.parseTopic("", new byte[]{});
assertEquals(0, listener.getNumberOfReports());
listener.reset();
detector.parseTopic("invalid/topic", new byte[]{});
assertEquals(0, listener.getNumberOfReports());
assertEquals(0, detector.parseTopic("", new byte[]{}).size());
assertEquals(0, detector.parseTopic("invalid/topic", new byte[]{}).size());
}
@Test
public void parseTemperature() {
MockHalDeviceReportListener listener = new MockHalDeviceReportListener();
GenericMqttDetector detector = new GenericMqttDetector();
detector.addListener(listener);
listener.reset();
detector.parseTopic(
List<HalMqttDeviceConfig> devices = detector.parseTopic(
"zigbee2mqtt/Kitchen air quality/temperature",
Converter.toBytes(26));
assertEquals(1, listener.getNumberOfReports());
assertEquals(1, devices.size());
assertEquals(
new HalMqttTemperatureDeviceConfig("zigbee2mqtt/Kitchen air quality/temperature"),
listener.getReport(0).config);
listener.getReport(0).data.setTimestamp(0);
assertEquals(
new TemperatureSensorData(26, 0),
listener.getReport(0).data);
devices.get(0));
listener.reset();
detector.parseTopic(
devices = detector.parseTopic(
"zigbee2mqtt/Kitchen air quality",
"{\"temperature\": 26}".getBytes(StandardCharsets.UTF_8));
assertEquals(1, listener.getNumberOfReports());
assertEquals(1, devices.size());
assertEquals(
new HalMqttTemperatureDeviceConfig("zigbee2mqtt/Kitchen air quality", "$.temperature"),
listener.getReport(0).config);
listener.getReport(0).data.setTimestamp(0);
assertEquals(
new TemperatureSensorData(26, 0),
listener.getReport(0).data);
devices.get(0));
}
@Test
public void parseHumidity() {
MockHalDeviceReportListener listener = new MockHalDeviceReportListener();
GenericMqttDetector detector = new GenericMqttDetector();
detector.addListener(listener);
listener.reset();
detector.parseTopic(
List<HalMqttDeviceConfig> devices = detector.parseTopic(
"zigbee2mqtt/Kitchen air quality/humidity",
Converter.toBytes(51));
assertEquals(1, listener.getNumberOfReports());
assertEquals(1, devices.size());
assertEquals(
new HalMqttHumidityDeviceConfig("zigbee2mqtt/Kitchen air quality/humidity"),
listener.getReport(0).config);
listener.getReport(0).data.setTimestamp(0);
assertEquals(
new HumiditySensorData(51, 0),
listener.getReport(0).data);
devices.get(0));
listener.reset();
detector.parseTopic(
devices = detector.parseTopic(
"zigbee2mqtt/Kitchen air quality",
"{\"humidity\": 51}".getBytes(StandardCharsets.UTF_8));
assertEquals(1, listener.getNumberOfReports());
assertEquals(1, devices.size());
assertEquals(
new HalMqttHumidityDeviceConfig("zigbee2mqtt/Kitchen air quality", "$.humidity"),
listener.getReport(0).config);
listener.getReport(0).data.setTimestamp(0);
assertEquals(
new HumiditySensorData(51, 0),
listener.getReport(0).data);
devices.get(0));
}
@Test
public void parseParticularMatter() {
MockHalDeviceReportListener listener = new MockHalDeviceReportListener();
GenericMqttDetector detector = new GenericMqttDetector();
detector.addListener(listener);
listener.reset();
detector.parseTopic(
List<HalMqttDeviceConfig> devices = detector.parseTopic(
"zigbee2mqtt/Kitchen air quality/pm25",
Converter.toBytes(1));
assertEquals(1, listener.getNumberOfReports());
assertEquals(1, devices.size());
assertEquals(
new HalMqttParticularMatterDeviceConfig("zigbee2mqtt/Kitchen air quality/pm25"),
listener.getReport(0).config);
listener.getReport(0).data.setTimestamp(0);
assertEquals(
new ParticulateMatterSensorData(1, 0),
listener.getReport(0).data);
devices.get(0));
listener.reset();
detector.parseTopic(
devices = detector.parseTopic(
"zigbee2mqtt/Kitchen air quality",
"{\"pm25\": 1}".getBytes(StandardCharsets.UTF_8));
assertEquals(1, listener.getNumberOfReports());
assertEquals(1, devices.size());
assertEquals(
new HalMqttParticularMatterDeviceConfig("zigbee2mqtt/Kitchen air quality", "$.pm25"),
listener.getReport(0).config);
listener.getReport(0).data.setTimestamp(0);
assertEquals(
new ParticulateMatterSensorData(1, 0),
listener.getReport(0).data);
devices.get(0));
}
}

14
plugins/hal-mqtt/test/se/hal/plugin/mqtt/detector/Zigbee2mqttDetectorTest.java
View file

@ -1,10 +1,12 @@
package se.hal.plugin.mqtt.detector;
import org.junit.Test;
import se.hal.plugin.mqtt.device.HalMqttDeviceConfig;
import se.hal.plugin.mqtt.device.HalMqttParticularMatterDeviceConfig;
import se.hal.test.MockHalDeviceReportListener;
import java.nio.charset.StandardCharsets;
import java.util.List;
import static org.junit.Assert.*;
@ -13,17 +15,13 @@ public class Zigbee2mqttDetectorTest {
@Test
public void ignoredTopics() {
MockHalDeviceReportListener listener = new MockHalDeviceReportListener();
Zigbee2mqttDetector detector = new Zigbee2mqttDetector();
detector.addListener(listener);
listener.reset();
detector.parseTopic("", new byte[]{});
assertEquals(0, listener.getNumberOfReports());
List<HalMqttDeviceConfig> devices = detector.parseTopic("", new byte[]{});
assertEquals(0, devices.size());
listener.reset();
detector.parseTopic("invalid/topic", new byte[]{});
assertEquals(0, listener.getNumberOfReports());
devices = detector.parseTopic("invalid/topic", new byte[]{});
assertEquals(0, devices.size());
}
/*
@Test