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

Migrate tests to JUnit 5 (#8519)

Browse Source 
Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-09-21 18:21:26 +02:00
committed by GitHub
parent 6df6783b60
commit bd82ca82df
478 changed files with 3996 additions and 4419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComBBQTemperatureMessageTest.java
View File

@@ -12,11 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBBQTemperatureMessage.SubType.BBQ1;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -32,16 +32,16 @@ public class RFXComBBQTemperatureMessageTest {
String hexMessage = "0A4E012B2955001A002179";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComBBQTemperatureMessage msg = (RFXComBBQTemperatureMessage) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", BBQ1, msg.subType);
assertEquals("Seq Number", 43, msg.seqNbr);
assertEquals("Sensor Id", "10581", msg.getDeviceId());
assertEquals("Food Temperature", 26, msg.foodTemperature, 0.1);
assertEquals("BBQ Temperature", 33, msg.bbqTemperature, 0.1);
assertEquals("Signal Level", 7, msg.signalLevel);
assertEquals("Battery Level", 9, msg.batteryLevel);
assertEquals(BBQ1, msg.subType, "SubType");
assertEquals(43, msg.seqNbr, "Seq Number");
assertEquals("10581", msg.getDeviceId(), "Sensor Id");
assertEquals(26, msg.foodTemperature, 0.1, "Food Temperature");
assertEquals(33, msg.bbqTemperature, 0.1, "BBQ Temperature");
assertEquals(7, msg.signalLevel, "Signal Level");
assertEquals(9, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComBarometricMessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -24,8 +26,9 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
*/
@NonNullByDefault
public class RFXComBarometricMessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(PacketType.BAROMETRIC);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.BAROMETRIC));
}
}

16
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComBlinds1MessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBlinds1Message.Commands;
import org.openhab.binding.rfxcom.internal.messages.RFXComBlinds1Message.SubType;
@@ -32,15 +32,15 @@ public class RFXComBlinds1MessageTest {
RFXComBlinds1Message.Commands command) throws RFXComException {
final RFXComBlinds1Message msg = (RFXComBlinds1Message) RFXComMessageFactory
.createMessage(HexUtils.hexToBytes(hexMsg));
assertEquals("SubType", subType, msg.subType);
assertEquals("Seq Number", seqNbr, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", deviceId, msg.getDeviceId());
assertEquals("Command", command, msg.command);
assertEquals("Signal Level", signalLevel, msg.signalLevel);
assertEquals(subType, msg.subType, "SubType");
assertEquals(seqNbr, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals(deviceId, msg.getDeviceId(), "Sensor Id");
assertEquals(command, msg.command, "Command");
assertEquals(signalLevel, msg.signalLevel, "Signal Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMsg, HexUtils.bytesToHex(decoded));
assertEquals(hexMsg, HexUtils.bytesToHex(decoded), "Message converted back");
}
@Test

12
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComCamera1MessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -24,9 +26,9 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
*/
@NonNullByDefault
public class RFXComCamera1MessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(PacketType.CAMERA1);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.CAMERA1));
}
}

14
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComChimeMessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.messages.RFXComChimeMessage.SubType;
import org.openhab.core.util.HexUtils;
@@ -34,13 +34,13 @@ public class RFXComChimeMessageTest {
String hexMessage = "0716020900A1F350";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComChimeMessage msg = (RFXComChimeMessage) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", SubType.SELECTPLUS, msg.subType);
assertEquals("Seq Number", 9, msg.seqNbr);
assertEquals("Sensor Id", "41459", msg.getDeviceId());
assertEquals("Signal Level", 5, msg.signalLevel);
assertEquals(SubType.SELECTPLUS, msg.subType, "SubType");
assertEquals(9, msg.seqNbr, "Seq Number");
assertEquals("41459", msg.getDeviceId(), "Sensor Id");
assertEquals(5, msg.signalLevel, "Signal Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

26
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComCurrentEnergyMessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -31,20 +31,20 @@ public class RFXComCurrentEnergyMessageTest {
int batteryLevel) throws RFXComException {
final RFXComCurrentEnergyMessage msg = (RFXComCurrentEnergyMessage) RFXComMessageFactory
.createMessage(HexUtils.hexToBytes(hexMsg));
assertEquals("SubType", subType, msg.subType);
assertEquals("Seq Number", seqNbr, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", deviceId, msg.getDeviceId());
assertEquals("Count", count, msg.count);
assertEquals("Channel 1", channel1, msg.channel1Amps, 0.01);
assertEquals("Channel 2", channel2, msg.channel2Amps, 0.01);
assertEquals("Channel 3", channel3, msg.channel3Amps, 0.01);
assertEquals("Total usage", totalUsage, msg.totalUsage, 0.05);
assertEquals("Signal Level", signalLevel, msg.signalLevel);
assertEquals("Battery Level", batteryLevel, msg.batteryLevel);
assertEquals(subType, msg.subType, "SubType");
assertEquals(seqNbr, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals(deviceId, msg.getDeviceId(), "Sensor Id");
assertEquals(count, msg.count, "Count");
assertEquals(channel1, msg.channel1Amps, 0.01, "Channel 1");
assertEquals(channel2, msg.channel2Amps, 0.01, "Channel 2");
assertEquals(channel3, msg.channel3Amps, 0.01, "Channel 3");
assertEquals(totalUsage, msg.totalUsage, 0.05, "Total usage");
assertEquals(signalLevel, msg.signalLevel, "Signal Level");
assertEquals(batteryLevel, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMsg, HexUtils.bytesToHex(decoded));
assertEquals(hexMsg, HexUtils.bytesToHex(decoded), "Message converted back");
}
@Test

24
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComCurrentMessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.messages.RFXComCurrentMessage.SubType;
import org.openhab.core.util.HexUtils;
@@ -34,18 +34,18 @@ public class RFXComCurrentMessageTest {
final RFXComCurrentMessage msg = (RFXComCurrentMessage) RFXComMessageFactory
.createMessage(HexUtils.hexToBytes(message));
assertEquals("SubType", SubType.ELEC1, msg.subType);
assertEquals("Seq Number", 15, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", "34304", msg.getDeviceId());
assertEquals("Count", 4, msg.count);
assertEquals("Channel 1", 2.9d, msg.channel1Amps, 0.01);
assertEquals("Channel 2", 0d, msg.channel2Amps, 0.01);
assertEquals("Channel 3", 0d, msg.channel3Amps, 0.01);
assertEquals("Signal Level", 4, msg.signalLevel);
assertEquals("Battery Level", 9, msg.batteryLevel);
assertEquals(SubType.ELEC1, msg.subType, "SubType");
assertEquals(15, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals("34304", msg.getDeviceId(), "Sensor Id");
assertEquals(4, msg.count, "Count");
assertEquals(2.9d, msg.channel1Amps, 0.01, "Channel 1");
assertEquals(0d, msg.channel2Amps, 0.01, "Channel 2");
assertEquals(0d, msg.channel3Amps, 0.01, "Channel 3");
assertEquals(4, msg.signalLevel, "Signal Level");
assertEquals(9, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", message, HexUtils.bytesToHex(decoded));
assertEquals(message, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

2
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComCurtain1MessageTest.java
View File

@@ -15,7 +15,7 @@ package org.openhab.binding.rfxcom.internal.messages;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType.CURTAIN1;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
/**

20
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComDateTimeMessageTest.java
View File

@@ -12,11 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.RFXComBindingConstants.*;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.library.types.DateTimeType;
import org.openhab.core.util.HexUtils;
@@ -33,17 +33,17 @@ public class RFXComDateTimeMessageTest {
String hexMessage = "0D580117B90003041D030D150A69";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComDateTimeMessage msg = (RFXComDateTimeMessage) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", RFXComDateTimeMessage.SubType.RTGR328N, msg.subType);
assertEquals("Seq Number", 23, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", "47360", msg.getDeviceId());
assertEquals("Date time", "2003-04-29T13:21:10", msg.dateTime);
assertEquals("Signal Level", 2, RFXComTestHelper.getActualIntValue(msg, CHANNEL_SIGNAL_LEVEL));
assertEquals(RFXComDateTimeMessage.SubType.RTGR328N, msg.subType, "SubType");
assertEquals(23, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals("47360", msg.getDeviceId(), "Sensor Id");
assertEquals("2003-04-29T13:21:10", msg.dateTime, "Date time");
assertEquals(2, RFXComTestHelper.getActualIntValue(msg, CHANNEL_SIGNAL_LEVEL), "Signal Level");
assertEquals("Converted value", DateTimeType.valueOf("2003-04-29T13:21:10"),
msg.convertToState(CHANNEL_DATE_TIME, new MockDeviceState()));
assertEquals(DateTimeType.valueOf("2003-04-29T13:21:10"),
msg.convertToState(CHANNEL_DATE_TIME, new MockDeviceState()), "Converted value");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

9
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComEdisioTest.java
View File

@@ -12,10 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType.EDISIO;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
/**
@@ -25,8 +26,8 @@ import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplemente
*/
@NonNullByDefault
public class RFXComEdisioTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(EDISIO);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class, () -> RFXComMessageFactory.createMessage(EDISIO));
}
}

22
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComEnergyMessageTest.java
View File

@@ -12,11 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.messages.RFXComEnergyMessage.SubType.ELEC2;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -32,17 +32,17 @@ public class RFXComEnergyMessageTest {
String hexMessage = "115A01071A7300000003F600000000350B89";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComEnergyMessage msg = (RFXComEnergyMessage) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", ELEC2, msg.subType);
assertEquals("Seq Number", 7, msg.seqNbr);
assertEquals("Sensor Id", "6771", msg.getDeviceId());
assertEquals("Count", 0, msg.count);
assertEquals("Instant usage", 1014d / 230, msg.instantAmp, 0.01);
assertEquals("Total usage", 60.7d / 230, msg.totalAmpHour, 0.01);
assertEquals("Signal Level", (byte) 8, msg.signalLevel);
assertEquals("Battery Level", (byte) 9, msg.batteryLevel);
assertEquals(ELEC2, msg.subType, "SubType");
assertEquals(7, msg.seqNbr, "Seq Number");
assertEquals("6771", msg.getDeviceId(), "Sensor Id");
assertEquals(0, msg.count, "Count");
assertEquals(1014d / 230, msg.instantAmp, 0.01, "Instant usage");
assertEquals(60.7d / 230, msg.totalAmpHour, 0.01, "Total usage");
assertEquals((byte) 8, msg.signalLevel, "Signal Level");
assertEquals((byte) 9, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComFS20MessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -25,8 +27,9 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
@NonNullByDefault
public class RFXComFS20MessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(PacketType.FS20);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.FS20));
}
}

2
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComFanFalmecMessageTest.java
View File

@@ -18,7 +18,7 @@ import static org.openhab.binding.rfxcom.internal.messages.RFXComFanMessage.SubT
import static org.openhab.binding.rfxcom.internal.messages.RFXComFanMessageTest.testCommand;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;

2
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComFanLucciAirDc2MessageTest.java
View File

@@ -18,7 +18,7 @@ import static org.openhab.binding.rfxcom.internal.messages.RFXComFanMessage.SubT
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.library.types.DecimalType;
import org.openhab.core.library.types.OnOffType;

2
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComFanLucciAirDcMessageTest.java
View File

@@ -18,7 +18,7 @@ import static org.openhab.binding.rfxcom.internal.messages.RFXComFanMessage.SubT
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.StringType;

12
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComFanMessageTest.java
View File

@@ -12,14 +12,14 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.RFXComBindingConstants.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType.FAN;
import static org.openhab.binding.rfxcom.internal.messages.RFXComFanMessage.SubType.CASAFAN;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.library.types.OnOffType;
import org.openhab.core.library.types.StringType;
@@ -55,9 +55,9 @@ public class RFXComFanMessageTest {
@Nullable State expectedCommand, State expectedLightCommand, @Nullable State expectedFanSpeed,
RFXComBaseMessage.PacketType packetType) throws RFXComException {
final RFXComFanMessage msg = (RFXComFanMessage) RFXComMessageFactory.createMessage(HexUtils.hexToBytes(hexMsg));
assertEquals("Seq Number", seqNbr, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", deviceId, msg.getDeviceId());
assertEquals("Signal Level", signalLevel, msg.signalLevel);
assertEquals(seqNbr, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals(deviceId, msg.getDeviceId(), "Sensor Id");
assertEquals(signalLevel, msg.signalLevel, "Signal Level");
assertEquals(expectedCommand, msg.convertToState(CHANNEL_COMMAND, DEVICE_STATE));
assertEquals(expectedLightCommand, msg.convertToState(CHANNEL_FAN_LIGHT, DEVICE_STATE));
@@ -67,7 +67,7 @@ public class RFXComFanMessageTest {
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMsg, HexUtils.bytesToHex(decoded));
assertEquals(hexMsg, HexUtils.bytesToHex(decoded), "Message converted back");
}
@Test

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComGasMessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -25,8 +27,9 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
@NonNullByDefault
public class RFXComGasMessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(PacketType.GAS);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.GAS));
}
}

4
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComHomeConfortTest.java
View File

@@ -12,11 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType.HOME_CONFORT;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.messages.RFXComHomeConfortMessage.Commands;
import org.openhab.binding.rfxcom.internal.messages.RFXComHomeConfortMessage.SubType;

20
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComHumidityMessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -32,16 +32,16 @@ public class RFXComHumidityMessageTest {
String hexMessage = "085101027700360189";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComHumidityMessage msg = (RFXComHumidityMessage) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", RFXComHumidityMessage.SubType.HUM1, msg.subType);
assertEquals("Seq Number", 2, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", "30464", msg.getDeviceId());
assertEquals("Humidity", 54, msg.humidity);
assertEquals("Humidity status", RFXComHumidityMessage.HumidityStatus.COMFORT, msg.humidityStatus);
assertEquals("Signal Level", (byte) 8, msg.signalLevel);
assertEquals("Battery Level", (byte) 9, msg.batteryLevel);
assertEquals(RFXComHumidityMessage.SubType.HUM1, msg.subType, "SubType");
assertEquals(2, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals("30464", msg.getDeviceId(), "Sensor Id");
assertEquals(54, msg.humidity, "Humidity");
assertEquals(RFXComHumidityMessage.HumidityStatus.COMFORT, msg.humidityStatus, "Humidity status");
assertEquals((byte) 8, msg.signalLevel, "Signal Level");
assertEquals((byte) 9, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComIOLinesMessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -25,8 +27,9 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
@NonNullByDefault
public class RFXComIOLinesMessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(PacketType.IO_LINES);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.IO_LINES));
}
}

8
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComInterfaceControlMessageTest.java
View File

@@ -12,12 +12,12 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComInterfaceMessage.TransceiverType._433_92MHZ_TRANSCEIVER;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.config.RFXComBridgeConfiguration;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -31,7 +31,7 @@ import org.openhab.core.util.HexUtils;
public class RFXComInterfaceControlMessageTest {
private RFXComBridgeConfiguration configuration = new RFXComBridgeConfiguration();
@Before
@BeforeEach
public void resetConfig() {
configuration.transmitPower = -18;
configuration.enableUndecoded = false;

16
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComInterfaceMessageTest.java
View File

@@ -12,14 +12,14 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.messages.RFXComInterfaceMessage.Commands.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComInterfaceMessage.SubType.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComInterfaceMessage.SubType.START_RECEIVER;
import static org.openhab.binding.rfxcom.internal.messages.RFXComInterfaceMessage.TransceiverType._433_92MHZ_TRANSCEIVER;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.messages.RFXComInterfaceMessage.Commands;
import org.openhab.binding.rfxcom.internal.messages.RFXComInterfaceMessage.SubType;
@@ -36,9 +36,9 @@ public class RFXComInterfaceMessageTest {
throws RFXComException {
RFXComInterfaceMessage msg = (RFXComInterfaceMessage) RFXComMessageFactory
.createMessage(HexUtils.hexToBytes(hexMsg));
assertEquals("SubType", subType, msg.subType);
assertEquals("Seq Number", seqNbr, (short) (msg.seqNbr & 0xFF));
assertEquals("Command", command, msg.command);
assertEquals(subType, msg.subType, "SubType");
assertEquals(seqNbr, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals(command, msg.command, "Command");
return msg;
}
@@ -48,7 +48,7 @@ public class RFXComInterfaceMessageTest {
RFXComInterfaceMessage msg = testMessage("1401070307436F7079726967687420524658434F4D", START_RECEIVER, 3,
Commands.START_RECEIVER);
assertEquals("text", "Copyright RFXCOM", msg.text);
assertEquals("Copyright RFXCOM", msg.text, "text");
}
@Test
@@ -60,9 +60,9 @@ public class RFXComInterfaceMessageTest {
public void testStatusMessage() throws RFXComException {
RFXComInterfaceMessage msg = testMessage("1401000102530C0800270001031C04524658434F4D", RESPONSE, 1, GET_STATUS);
assertEquals("Command", _433_92MHZ_TRANSCEIVER, msg.transceiverType);
assertEquals(_433_92MHZ_TRANSCEIVER, msg.transceiverType, "Command");
// TODO this is not correct, improvements for this have been made in the OH1 repo
assertEquals("firmwareVersion", 12, msg.firmwareVersion);
assertEquals(12, msg.firmwareVersion, "firmwareVersion");
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComInvalidMessageTypeTest.java
View File

@@ -12,9 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComUnsupportedValueException;
import org.openhab.core.util.HexUtils;
@@ -26,9 +27,9 @@ import org.openhab.core.util.HexUtils;
@NonNullByDefault
public class RFXComInvalidMessageTypeTest {
@Test(expected = RFXComUnsupportedValueException.class)
public void testMessage() throws RFXComException {
@Test
public void testMessage() {
byte[] message = HexUtils.hexToBytes("07CC01271356ECC0");
RFXComMessageFactory.createMessage(message);
assertThrows(RFXComUnsupportedValueException.class, () -> RFXComMessageFactory.createMessage(message));
}
}

20
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting1MessageTest.java
View File

@@ -12,11 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.RFXComBindingConstants.*;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComUnsupportedChannelException;
import org.openhab.binding.rfxcom.internal.messages.RFXComLighting1Message.Commands;
@@ -38,17 +38,17 @@ public class RFXComLighting1MessageTest {
byte signalLevel, Commands command, String commandString) throws RFXComException {
final RFXComLighting1Message msg = (RFXComLighting1Message) RFXComMessageFactory
.createMessage(HexUtils.hexToBytes(hexMsg));
assertEquals("SubType", subType, msg.subType);
assertEquals("Seq Number", seqNbr, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", deviceId, msg.getDeviceId());
assertEquals("Signal Level", signalLevel, msg.signalLevel);
assertEquals("Command", command, msg.command);
assertEquals("Command String", commandString,
msg.convertToState(CHANNEL_COMMAND_STRING, deviceState).toString());
assertEquals(subType, msg.subType, "SubType");
assertEquals(seqNbr, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals(deviceId, msg.getDeviceId(), "Sensor Id");
assertEquals(signalLevel, msg.signalLevel, "Signal Level");
assertEquals(command, msg.command, "Command");
assertEquals(commandString, msg.convertToState(CHANNEL_COMMAND_STRING, deviceState).toString(),
"Command String");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMsg, HexUtils.bytesToHex(decoded));
assertEquals(hexMsg, HexUtils.bytesToHex(decoded), "Message converted back");
}
@Test

16
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting2MessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -32,14 +32,14 @@ public class RFXComLighting2MessageTest {
String hexMessage = "0B11000600109B520B000080";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComLighting2Message msg = (RFXComLighting2Message) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", RFXComLighting2Message.SubType.AC, msg.subType);
assertEquals("Seq Number", 6, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", "1088338.11", msg.getDeviceId());
assertEquals("Command", RFXComLighting2Message.Commands.OFF, msg.command);
assertEquals("Signal Level", (byte) 8, msg.signalLevel);
assertEquals(RFXComLighting2Message.SubType.AC, msg.subType, "SubType");
assertEquals(6, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals("1088338.11", msg.getDeviceId(), "Sensor Id");
assertEquals(RFXComLighting2Message.Commands.OFF, msg.command, "Command");
assertEquals((byte) 8, msg.signalLevel, "Signal Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting3MessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -25,9 +27,10 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
@NonNullByDefault
public class RFXComLighting3MessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
@Test
public void checkNotImplemented() {
// TODO Note that this message is supported in the 1.9 binding
RFXComMessageFactory.createMessage(PacketType.LIGHTING3);
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.LIGHTING3));
}
}

16
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting4MessageTest.java
View File

@@ -12,7 +12,7 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.RFXComBindingConstants.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType.LIGHTING4;
import static org.openhab.binding.rfxcom.internal.messages.RFXComLighting4Message.Commands.*;
@@ -23,7 +23,7 @@ import java.util.List;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.config.RFXComDeviceConfiguration;
import org.openhab.binding.rfxcom.internal.config.RFXComDeviceConfigurationBuilder;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
@@ -49,7 +49,7 @@ public class RFXComLighting4MessageTest {
byte[] binaryMessage = message.decodeMessage();
RFXComLighting4Message msg = (RFXComLighting4Message) RFXComMessageFactory.createMessage(binaryMessage);
assertEquals("Sensor Id", "90000", msg.getDeviceId());
assertEquals("90000", msg.getDeviceId(), "Sensor Id");
}
private void testMessage(String hexMsg, RFXComLighting4Message.SubType subType, String deviceId,
@@ -63,16 +63,16 @@ public class RFXComLighting4MessageTest {
int onCommand) throws RFXComException {
RFXComLighting4Message msg = (RFXComLighting4Message) RFXComMessageFactory
.createMessage(HexUtils.hexToBytes(hexMsg));
assertEquals("Sensor Id", deviceId, msg.getDeviceId());
assertEquals("Command", commandByte, RFXComTestHelper.getActualIntValue(msg, CHANNEL_COMMAND_ID));
assertEquals(deviceId, msg.getDeviceId(), "Sensor Id");
assertEquals(commandByte, RFXComTestHelper.getActualIntValue(msg, CHANNEL_COMMAND_ID), "Command");
if (seqNbr != null) {
assertEquals("Seq Number", seqNbr.shortValue(), (short) (msg.seqNbr & 0xFF));
assertEquals(seqNbr.shortValue(), (short) (msg.seqNbr & 0xFF), "Seq Number");
}
assertEquals("Signal Level", signalLevel, RFXComTestHelper.getActualIntValue(msg, CHANNEL_SIGNAL_LEVEL));
assertEquals(signalLevel, RFXComTestHelper.getActualIntValue(msg, CHANNEL_SIGNAL_LEVEL), "Signal Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMsg, HexUtils.bytesToHex(decoded));
assertEquals(hexMsg, HexUtils.bytesToHex(decoded), "Message converted back");
RFXComTestHelper.checkDiscoveryResult(msg, deviceId, pulse, subType.toString(), offCommand, onCommand);
}

12
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting5MessageTest.java
View File

@@ -12,14 +12,14 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.RFXComBindingConstants.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType.LIGHTING5;
import static org.openhab.binding.rfxcom.internal.messages.RFXComLighting5Message.Commands.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComLighting5Message.SubType.IT;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComUnsupportedChannelException;
import org.openhab.core.library.types.OnOffType;
@@ -43,11 +43,11 @@ public class RFXComLighting5MessageTest {
itMessageObject.convertFromState(CHANNEL_COMMAND, OnOffType.ON);
byte[] message = itMessageObject.decodeMessage();
String hexMessage = HexUtils.bytesToHex(message);
assertEquals("Message is not as expected", "0A140F0000080D01010000", hexMessage);
assertEquals("0A140F0000080D01010000", hexMessage, "Message is not as expected");
RFXComLighting5Message msg = (RFXComLighting5Message) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", IT, msg.subType);
assertEquals("Sensor Id", "2061.1", msg.getDeviceId());
assertEquals("Command", ON, msg.command);
assertEquals(IT, msg.subType, "SubType");
assertEquals("2061.1", msg.getDeviceId(), "Sensor Id");
assertEquals(ON, msg.command, "Command");
}
@Test

16
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComLighting6MessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -32,17 +32,17 @@ public class RFXComLighting6MessageTest {
String hexMessage = "0B150005D950450101011D80";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComLighting6Message msg = (RFXComLighting6Message) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", RFXComLighting6Message.SubType.BLYSS, msg.subType);
assertEquals("Seq Number", 5, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", "55632.E.1", msg.getDeviceId());
assertEquals("Command", RFXComLighting6Message.Commands.OFF, msg.command);
assertEquals("Signal Level", (byte) 8, msg.signalLevel);
assertEquals(RFXComLighting6Message.SubType.BLYSS, msg.subType, "SubType");
assertEquals(5, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals("55632.E.1", msg.getDeviceId(), "Sensor Id");
assertEquals(RFXComLighting6Message.Commands.OFF, msg.command, "Command");
assertEquals((byte) 8, msg.signalLevel, "Signal Level");
byte[] decoded = msg.decodeMessage();
// the openhab plugin is not (yet) using the cmndseqnbr & seqnbr2
String acceptedHexMessage = "0B150005D950450101000080";
assertEquals("Message converted back", acceptedHexMessage, HexUtils.bytesToHex(decoded));
assertEquals(acceptedHexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComPowerMessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
/**
@@ -23,9 +25,10 @@ import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplemente
*/
@NonNullByDefault
public class RFXComPowerMessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
@Test
public void checkNotImplemented() {
// TODO Note that this message is supported in the 1.9 binding
RFXComMessageFactory.createMessage(RFXComBaseMessage.PacketType.POWER);
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(RFXComBaseMessage.PacketType.POWER));
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComRFXMeterMessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -25,8 +27,9 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
@NonNullByDefault
public class RFXComRFXMeterMessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(PacketType.RFXMETER);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.RFXMETER));
}
}

26
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComRFXSensorMessageTest.java
View File

@@ -12,7 +12,7 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.RFXComBindingConstants.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComRFXSensorMessage.SubType.*;
@@ -20,7 +20,7 @@ import javax.xml.bind.DatatypeConverter;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.handler.DeviceState;
import org.openhab.core.library.types.DecimalType;
@@ -41,20 +41,20 @@ public class RFXComRFXSensorMessageTest {
DeviceState deviceState) throws RFXComException {
final RFXComRFXSensorMessage msg = (RFXComRFXSensorMessage) RFXComMessageFactory
.createMessage(DatatypeConverter.parseHexBinary(hexMsg));
assertEquals("SubType", subType, msg.subType);
assertEquals("Seq Number", seqNbr, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", deviceId, msg.getDeviceId());
assertEquals("Signal Level", signalLevel, msg.signalLevel);
assertEquals("Temperature", temperature, getMessageTemperature(msg, deviceState));
assertEquals("Voltage", voltage, getChannelAsDouble(CHANNEL_VOLTAGE, msg, deviceState));
assertEquals("Reference Voltage", referenceVoltage,
getChannelAsDouble(CHANNEL_REFERENCE_VOLTAGE, msg, deviceState));
assertEquals("Humidity", expectedHumidity, getChannelAsDouble(CHANNEL_HUMIDITY, msg, deviceState));
assertEquals("Pressure", expectedPressure, getChannelAsDouble(CHANNEL_PRESSURE, msg, deviceState));
assertEquals(subType, msg.subType, "SubType");
assertEquals(seqNbr, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals(deviceId, msg.getDeviceId(), "Sensor Id");
assertEquals(signalLevel, msg.signalLevel, "Signal Level");
assertEquals(temperature, getMessageTemperature(msg, deviceState), "Temperature");
assertEquals(voltage, getChannelAsDouble(CHANNEL_VOLTAGE, msg, deviceState), "Voltage");
assertEquals(referenceVoltage, getChannelAsDouble(CHANNEL_REFERENCE_VOLTAGE, msg, deviceState),
"Reference Voltage");
assertEquals(expectedHumidity, getChannelAsDouble(CHANNEL_HUMIDITY, msg, deviceState), "Humidity");
assertEquals(expectedPressure, getChannelAsDouble(CHANNEL_PRESSURE, msg, deviceState), "Pressure");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMsg, DatatypeConverter.printHexBinary(decoded));
assertEquals(hexMsg, DatatypeConverter.printHexBinary(decoded), "Message converted back");
}
@Test

9
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComRadiator1MessageTest.java
View File

@@ -12,10 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType.RADIATOR1;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
/**
@@ -25,8 +26,8 @@ import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplemente
*/
@NonNullByDefault
public class RFXComRadiator1MessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(RADIATOR1);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class, () -> RFXComMessageFactory.createMessage(RADIATOR1));
}
}

20
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComRainMessageTest.java
View File

@@ -12,11 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.messages.RFXComRainMessage.SubType.RAIN2;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -33,16 +33,16 @@ public class RFXComRainMessageTest {
String hexMessage = "0B550217B6000000004D3C69";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComRainMessage msg = (RFXComRainMessage) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", RAIN2, msg.subType);
assertEquals("Seq Number", 23, msg.seqNbr);
assertEquals("Sensor Id", "46592", msg.getDeviceId());
assertEquals("Rain rate", 0.0, msg.rainRate, 0.001);
assertEquals("Total rain", 1977.2, msg.rainTotal, 0.001);
assertEquals("Signal Level", 6, msg.signalLevel);
assertEquals("Battery Level", 9, msg.batteryLevel);
assertEquals(RAIN2, msg.subType, "SubType");
assertEquals(23, msg.seqNbr, "Seq Number");
assertEquals("46592", msg.getDeviceId(), "Sensor Id");
assertEquals(0.0, msg.rainRate, 0.001, "Rain rate");
assertEquals(1977.2, msg.rainTotal, 0.001, "Total rain");
assertEquals(6, msg.signalLevel, "Signal Level");
assertEquals(9, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComRemoteControlMessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -24,8 +26,9 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
*/
@NonNullByDefault
public class RFXComRemoteControlMessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(PacketType.REMOTE_CONTROL);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.REMOTE_CONTROL));
}
}

4
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComRfyMessageTest.java
View File

@@ -12,11 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.jupiter.api.Assertions.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType.RFY;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.messages.RFXComRfyMessage.Commands;
import org.openhab.binding.rfxcom.internal.messages.RFXComRfyMessage.SubType;

29
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComSecurity1MessageTest.java
View File

@@ -12,12 +12,12 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComSecurity1Message.SubType.*;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComUnsupportedValueException;
import org.openhab.binding.rfxcom.internal.messages.RFXComSecurity1Message.Contact;
@@ -38,18 +38,18 @@ public class RFXComSecurity1MessageTest {
@Nullable Status status, int signalLevel) throws RFXComException {
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComSecurity1Message msg = (RFXComSecurity1Message) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", subType, msg.subType);
assertEquals("Seq Number", sequenceNumber, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", deviceId, msg.getDeviceId());
assertEquals("Battery level", batteryLevel, msg.batteryLevel);
assertEquals("Contact", contact, msg.contact);
assertEquals("Motion", motion, msg.motion);
assertEquals("Status", status, msg.status);
assertEquals("Signal Level", signalLevel, msg.signalLevel);
assertEquals(subType, msg.subType, "SubType");
assertEquals(sequenceNumber, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals(deviceId, msg.getDeviceId(), "Sensor Id");
assertEquals(batteryLevel, msg.batteryLevel, "Battery level");
assertEquals(contact, msg.contact, "Contact");
assertEquals(motion, msg.motion, "Motion");
assertEquals(status, msg.status, "Status");
assertEquals(signalLevel, msg.signalLevel, "Signal Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
@Test
@@ -66,8 +66,9 @@ public class RFXComSecurity1MessageTest {
0);
}
@Test(expected = RFXComUnsupportedValueException.class)
public void testSomeInvalidSecurityMessage() throws RFXComException {
testSomeMessages("08FF0A1F0000000650", null, 0, null, 0, null, null, null, 0);
@Test
public void testSomeInvalidSecurityMessage() {
assertThrows(RFXComUnsupportedValueException.class,
() -> testSomeMessages("08FF0A1F0000000650", null, 0, null, 0, null, null, null, 0));
}
}

18
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComSecurity2MessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.messages.RFXComSecurity2Message.SubType;
import org.openhab.core.util.HexUtils;
@@ -35,14 +35,14 @@ public class RFXComSecurity2MessageTest {
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComSecurity2Message msg = (RFXComSecurity2Message) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", SubType.RAW_AES_KEELOQ, msg.subType);
assertEquals("Seq Number", 0, msg.seqNbr);
assertEquals("Sensor Id", "51450387", msg.getDeviceId());
assertEquals("Button Status", 12, msg.buttonStatus);
assertEquals("Battery Level", 4, msg.batteryLevel);
assertEquals("Signal Level", 5, msg.signalLevel);
assertEquals(SubType.RAW_AES_KEELOQ, msg.subType, "SubType");
assertEquals(0, msg.seqNbr, "Seq Number");
assertEquals("51450387", msg.getDeviceId(), "Sensor Id");
assertEquals(12, msg.buttonStatus, "Button Status");
assertEquals(4, msg.batteryLevel, "Battery Level");
assertEquals(5, msg.signalLevel, "Signal Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

26
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComTemperatureHumidityBarometricMessageTest.java
View File

@@ -12,13 +12,13 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.messages.RFXComTemperatureHumidityBarometricMessage.ForecastStatus.RAIN;
import static org.openhab.binding.rfxcom.internal.messages.RFXComTemperatureHumidityBarometricMessage.HumidityStatus.DRY;
import static org.openhab.binding.rfxcom.internal.messages.RFXComTemperatureHumidityBarometricMessage.SubType.THB2;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -36,19 +36,19 @@ public class RFXComTemperatureHumidityBarometricMessageTest {
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComTemperatureHumidityBarometricMessage msg = (RFXComTemperatureHumidityBarometricMessage) RFXComMessageFactory
.createMessage(message);
assertEquals("SubType", THB2, msg.subType);
assertEquals("Seq Number", 14, msg.seqNbr);
assertEquals("Sensor Id", "59648", msg.getDeviceId());
assertEquals("Temperature", 20.1, msg.temperature, 0.01);
assertEquals("Humidity", 39, msg.humidity);
assertEquals("Humidity status", DRY, msg.humidityStatus);
assertEquals("Barometer", 999.0, msg.pressure, 0.001);
assertEquals("Forecast", RAIN, msg.forecastStatus);
assertEquals("Signal Level", 3, msg.signalLevel);
assertEquals("Battery Level", 9, msg.batteryLevel);
assertEquals(THB2, msg.subType, "SubType");
assertEquals(14, msg.seqNbr, "Seq Number");
assertEquals("59648", msg.getDeviceId(), "Sensor Id");
assertEquals(20.1, msg.temperature, 0.01, "Temperature");
assertEquals(39, msg.humidity, "Humidity");
assertEquals(DRY, msg.humidityStatus, "Humidity status");
assertEquals(999.0, msg.pressure, 0.001, "Barometer");
assertEquals(RAIN, msg.forecastStatus, "Forecast");
assertEquals(3, msg.signalLevel, "Signal Level");
assertEquals(9, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

22
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComTemperatureHumidityMessageTest.java
View File

@@ -12,12 +12,12 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.messages.RFXComTemperatureHumidityMessage.HumidityStatus.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComTemperatureHumidityMessage.SubType.*;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.messages.RFXComTemperatureHumidityMessage.HumidityStatus;
import org.openhab.core.util.HexUtils;
@@ -37,18 +37,18 @@ public class RFXComTemperatureHumidityMessageTest {
byte[] binaryMessage = HexUtils.hexToBytes(hexMsg);
final RFXComTemperatureHumidityMessage msg = (RFXComTemperatureHumidityMessage) RFXComMessageFactory
.createMessage(binaryMessage);
assertEquals("SubType", subType, msg.subType);
assertEquals("Seq Number", seqNbr, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", sensorId, msg.sensorId);
assertEquals("Temperature", temperature, msg.temperature, 0.01);
assertEquals("Humidity", humidity, msg.humidity);
assertEquals("Humidity Status", humidityStatus, msg.humidityStatus);
assertEquals("Signal Level", signalLevel, msg.signalLevel);
assertEquals("Battery Level", batteryLevel, msg.batteryLevel);
assertEquals(subType, msg.subType, "SubType");
assertEquals(seqNbr, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals(sensorId, msg.sensorId, "Sensor Id");
assertEquals(temperature, msg.temperature, 0.01, "Temperature");
assertEquals(humidity, msg.humidity, "Humidity");
assertEquals(humidityStatus, msg.humidityStatus, "Humidity Status");
assertEquals(signalLevel, msg.signalLevel, "Signal Level");
assertEquals(batteryLevel, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMsg, HexUtils.bytesToHex(decoded));
assertEquals(hexMsg, HexUtils.bytesToHex(decoded), "Message converted back");
}
@Test

18
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComTemperatureMessageTest.java
View File

@@ -12,11 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.messages.RFXComTemperatureMessage.SubType.*;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -31,16 +31,16 @@ public class RFXComTemperatureMessageTest {
double temperature, int signalLevel, int bateryLevel) throws RFXComException {
final RFXComTemperatureMessage msg = (RFXComTemperatureMessage) RFXComMessageFactory
.createMessage(HexUtils.hexToBytes(hexMsg));
assertEquals("SubType", subType, msg.subType);
assertEquals("Seq Number", seqNbr, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", deviceId, msg.getDeviceId());
assertEquals("Temperature", temperature, msg.temperature, 0.001);
assertEquals("Signal Level", signalLevel, msg.signalLevel);
assertEquals("Battery", bateryLevel, msg.batteryLevel);
assertEquals(subType, msg.subType, "SubType");
assertEquals(seqNbr, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals(deviceId, msg.getDeviceId(), "Sensor Id");
assertEquals(temperature, msg.temperature, 0.001, "Temperature");
assertEquals(signalLevel, msg.signalLevel, "Signal Level");
assertEquals(bateryLevel, msg.batteryLevel, "Battery");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMsg, HexUtils.bytesToHex(decoded));
assertEquals(hexMsg, HexUtils.bytesToHex(decoded), "Message converted back");
}
@Test

18
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComTemperatureRainMessageTest.java
View File

@@ -12,11 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.messages.RFXComTemperatureRainMessage.SubType.WS1200;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -32,15 +32,15 @@ public class RFXComTemperatureRainMessageTest {
String hexMessage = "0A4F01CCF001004F03B759";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComTemperatureRainMessage msg = (RFXComTemperatureRainMessage) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", WS1200, msg.subType);
assertEquals("Seq Number", 204, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", "61441", msg.getDeviceId());
assertEquals("Temperature", 7.9, msg.temperature, 0.001);
assertEquals("Rain total", 95.1, msg.rainTotal, 0.001);
assertEquals("Signal Level", (byte) 5, msg.signalLevel);
assertEquals(WS1200, msg.subType, "SubType");
assertEquals(204, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals("61441", msg.getDeviceId(), "Sensor Id");
assertEquals(7.9, msg.temperature, 0.001, "Temperature");
assertEquals(95.1, msg.rainTotal, 0.001, "Rain total");
assertEquals((byte) 5, msg.signalLevel, "Signal Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

16
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComTestHelper.java
View File

@@ -12,7 +12,7 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Map;
@@ -35,8 +35,8 @@ class RFXComTestHelper {
// This is a place where its easy to make mistakes in coding, and can result in errors, normally
// array bounds errors
byte[] binaryMessage = message.decodeMessage();
assertEquals("Wrong packet length", binaryMessage[0], binaryMessage.length - 1);
assertEquals("Wrong packet type", packetType.toByte(), binaryMessage[1]);
assertEquals(binaryMessage[0], binaryMessage.length - 1, "Wrong packet length");
assertEquals(packetType.toByte(), binaryMessage[1], "Wrong packet type");
}
static void checkDiscoveryResult(RFXComDeviceMessage msg, String deviceId, @Nullable Integer pulse, String subType,
@@ -48,13 +48,13 @@ class RFXComTestHelper {
msg.addDevicePropertiesTo(builder);
Map<String, Object> properties = builder.build().getProperties();
assertEquals("Device Id", deviceId, properties.get("deviceId"));
assertEquals("Sub type", subType, properties.get("subType"));
assertEquals(deviceId, properties.get("deviceId"), "Device Id");
assertEquals(subType, properties.get("subType"), "Sub type");
if (pulse != null) {
assertEquals("Pulse", pulse, properties.get("pulse"));
assertEquals(pulse, properties.get("pulse"), "Pulse");
}
assertEquals("On command", onCommand, properties.get("onCommandId"));
assertEquals("Off command", offCommand, properties.get("offCommandId"));
assertEquals(onCommand, properties.get("onCommandId"), "On command");
assertEquals(offCommand, properties.get("offCommandId"), "Off command");
}
static int getActualIntValue(RFXComDeviceMessage msg, String channelId) throws RFXComException {

22
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComThermostat1MessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -32,17 +32,17 @@ public class RFXComThermostat1MessageTest {
String hexMessage = "0940001B6B1816150270";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComThermostat1Message msg = (RFXComThermostat1Message) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", RFXComThermostat1Message.SubType.DIGIMAX, msg.subType);
assertEquals("Seq Number", 27, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", "27416", msg.getDeviceId());
assertEquals("Temperature", 22, msg.temperature);
assertEquals("Set point", 21, msg.set);
assertEquals("Mode", RFXComThermostat1Message.Mode.HEATING, msg.mode);
assertEquals("Status", RFXComThermostat1Message.Status.NO_DEMAND, msg.status);
assertEquals("Signal Level", (byte) 7, msg.signalLevel);
assertEquals(RFXComThermostat1Message.SubType.DIGIMAX, msg.subType, "SubType");
assertEquals(27, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals("27416", msg.getDeviceId(), "Sensor Id");
assertEquals(22, msg.temperature, "Temperature");
assertEquals(21, msg.set, "Set point");
assertEquals(RFXComThermostat1Message.Mode.HEATING, msg.mode, "Mode");
assertEquals(RFXComThermostat1Message.Status.NO_DEMAND, msg.status, "Status");
assertEquals((byte) 7, msg.signalLevel, "Signal Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComThermostat2MessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -24,9 +26,10 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
*/
@NonNullByDefault
public class RFXComThermostat2MessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
@Test
public void checkNotImplemented() {
// TODO Note that this message is supported in the 1.9 binding
RFXComMessageFactory.createMessage(PacketType.THERMOSTAT2);
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.THERMOSTAT2));
}
}

16
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComThermostat3MessageTest.java
View File

@@ -12,14 +12,14 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.openhab.binding.rfxcom.internal.RFXComBindingConstants.*;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType.THERMOSTAT3;
import static org.openhab.binding.rfxcom.internal.messages.RFXComThermostat3Message.SubType.*;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.eclipse.jdt.annotation.Nullable;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComUnsupportedChannelException;
import org.openhab.core.library.types.OnOffType;
@@ -69,11 +69,11 @@ public class RFXComThermostat3MessageTest {
throws RFXComException {
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComThermostat3Message msg = (RFXComThermostat3Message) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", subtype, msg.subType);
assertEquals("Seq Number", sequenceNumber, (short) (msg.seqNbr & 0xFF));
assertEquals("Sensor Id", sensorId, msg.getDeviceId());
assertEquals(CHANNEL_COMMAND, command, msg.command);
assertEquals("Signal Level", signalLevel, msg.signalLevel);
assertEquals(subtype, msg.subType, "SubType");
assertEquals(sequenceNumber, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals(sensorId, msg.getDeviceId(), "Sensor Id");
assertEquals(command, msg.command, CHANNEL_COMMAND);
assertEquals(signalLevel, msg.signalLevel, "Signal Level");
assertEquals(commandChannel, msg.convertToState(CHANNEL_COMMAND, deviceState));
assertEquals(secondCommandChannel, msg.convertToState(CHANNEL_COMMAND_SECOND, deviceState));
@@ -82,7 +82,7 @@ public class RFXComThermostat3MessageTest {
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
// TODO please add tests for real messages

9
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComThermostat4MessageTest.java
View File

@@ -12,10 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType.THERMOSTAT4;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
/**
@@ -25,8 +26,8 @@ import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplemente
*/
@NonNullByDefault
public class RFXComThermostat4MessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(THERMOSTAT4);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class, () -> RFXComMessageFactory.createMessage(THERMOSTAT4));
}
}

12
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComTransmitterMessageTest.java
View File

@@ -12,12 +12,12 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.messages.RFXComTransmitterMessage.Response.ACK;
import static org.openhab.binding.rfxcom.internal.messages.RFXComTransmitterMessage.SubType.RESPONSE;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.messages.RFXComTransmitterMessage.Response;
import org.openhab.binding.rfxcom.internal.messages.RFXComTransmitterMessage.SubType;
@@ -33,13 +33,13 @@ public class RFXComTransmitterMessageTest {
private void testMessage(String hexMsg, Response response, SubType subType, int seqNbr) throws RFXComException {
final RFXComTransmitterMessage msg = (RFXComTransmitterMessage) RFXComMessageFactory
.createMessage(HexUtils.hexToBytes(hexMsg));
assertEquals("SubType", subType, msg.subType);
assertEquals("Response", response, msg.response);
assertEquals("Seq Number", seqNbr, (short) (msg.seqNbr & 0xFF));
assertEquals(subType, msg.subType, "SubType");
assertEquals(response, msg.response, "Response");
assertEquals(seqNbr, (short) (msg.seqNbr & 0xFF), "Seq Number");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMsg, HexUtils.bytesToHex(decoded));
assertEquals(hexMsg, HexUtils.bytesToHex(decoded), "Message converted back");
}
@Test

36
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComUVMessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -34,19 +34,19 @@ public class RFXComUVMessageTest {
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComUVMessage msg = (RFXComUVMessage) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", RFXComUVMessage.SubType.UV3, msg.subType);
assertEquals("Seq Number", 18, msg.seqNbr);
assertEquals("Sensor Id", "13345", msg.getDeviceId());
assertEquals(RFXComUVMessage.SubType.UV3, msg.subType, "SubType");
assertEquals(18, msg.seqNbr, "Seq Number");
assertEquals("13345", msg.getDeviceId(), "Sensor Id");
assertEquals("UV", 2.5, msg.uv, 0.001);
assertEquals("Temperature", 1822.5, msg.temperature, 0.001);
assertEquals(2.5, msg.uv, 0.001, "UV");
assertEquals(1822.5, msg.temperature, 0.001, "Temperature");
assertEquals("Signal Level", 14, msg.signalLevel);
assertEquals("Battery Level", 9, msg.batteryLevel);
assertEquals(14, msg.signalLevel, "Signal Level");
assertEquals(9, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
@Test
@@ -56,18 +56,18 @@ public class RFXComUVMessageTest {
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComUVMessage msg = (RFXComUVMessage) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", RFXComUVMessage.SubType.UV3, msg.subType);
assertEquals("Seq Number", 18, msg.seqNbr);
assertEquals("Sensor Id", "13345", msg.getDeviceId());
assertEquals(RFXComUVMessage.SubType.UV3, msg.subType, "SubType");
assertEquals(18, msg.seqNbr, "Seq Number");
assertEquals("13345", msg.getDeviceId(), "Sensor Id");
assertEquals("UV", 2.5, msg.uv, 0.001);
assertEquals("Temperature", -1822.5, msg.temperature, 0.001);
assertEquals(2.5, msg.uv, 0.001, "UV");
assertEquals(-1822.5, msg.temperature, 0.001, "Temperature");
assertEquals("Signal Level", 14, msg.signalLevel);
assertEquals("Battery Level", 9, msg.batteryLevel);
assertEquals(14, msg.signalLevel, "Signal Level");
assertEquals(9, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}

19
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComUndecodedRFMessageTest.java
View File

@@ -12,10 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.*;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageTooLongException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -34,14 +34,14 @@ public class RFXComUndecodedRFMessageTest {
throws RFXComException {
final RFXComUndecodedRFMessage msg = (RFXComUndecodedRFMessage) RFXComMessageFactory
.createMessage(HexUtils.hexToBytes(hexMsg));
assertEquals("SubType", subType, msg.subType);
assertEquals("Seq Number", seqNbr, (short) (msg.seqNbr & 0xFF));
assertEquals("Device Id", "UNDECODED", msg.getDeviceId());
assertEquals("Payload", rawPayload, HexUtils.bytesToHex(msg.rawPayload));
assertEquals(subType, msg.subType, "SubType");
assertEquals(seqNbr, (short) (msg.seqNbr & 0xFF), "Seq Number");
assertEquals("UNDECODED", msg.getDeviceId(), "Device Id");
assertEquals(rawPayload, HexUtils.bytesToHex(msg.rawPayload), "Payload");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMsg, HexUtils.bytesToHex(decoded));
assertEquals(hexMsg, HexUtils.bytesToHex(decoded), "Message converted back");
}
@Test
@@ -49,13 +49,14 @@ public class RFXComUndecodedRFMessageTest {
testMessage("070301271356ECC0", RFXComUndecodedRFMessage.SubType.ARC, 0x27, "1356ECC0");
}
@Test(expected = RFXComMessageTooLongException.class)
@Test
public void testLongMessage() throws RFXComException {
RFXComUndecodedRFMessage msg = (RFXComUndecodedRFMessage) RFXComMessageFactory
.createMessage(PacketType.UNDECODED_RF_MESSAGE);
msg.subType = RFXComUndecodedRFMessage.SubType.ARC;
msg.seqNbr = 1;
msg.rawPayload = HexUtils.hexToBytes("000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021");
msg.decodeMessage();
assertThrows(RFXComMessageTooLongException.class, () -> msg.decodeMessage());
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComWaterMessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -25,8 +27,9 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
@NonNullByDefault
public class RFXComWaterMessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
RFXComMessageFactory.createMessage(PacketType.WATER);
@Test
public void checkNotImplemented() {
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.WATER));
}
}

11
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComWeightMessageTest.java
View File

@@ -12,8 +12,10 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.jupiter.api.Assertions.assertThrows;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComMessageNotImplementedException;
import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType;
@@ -24,9 +26,10 @@ import org.openhab.binding.rfxcom.internal.messages.RFXComBaseMessage.PacketType
*/
@NonNullByDefault
public class RFXComWeightMessageTest {
@Test(expected = RFXComMessageNotImplementedException.class)
public void checkNotImplemented() throws Exception {
@Test
public void checkNotImplemented() {
// TODO Note that this message is supported in the 1.9 binding
RFXComMessageFactory.createMessage(PacketType.WEIGHT);
assertThrows(RFXComMessageNotImplementedException.class,
() -> RFXComMessageFactory.createMessage(PacketType.WEIGHT));
}
}

22
bundles/org.openhab.binding.rfxcom/src/test/java/org/openhab/binding/rfxcom/internal/messages/RFXComWindMessageTest.java
View File

@@ -12,11 +12,11 @@
*/
package org.openhab.binding.rfxcom.internal.messages;
import static org.junit.Assert.assertEquals;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.openhab.binding.rfxcom.internal.messages.RFXComWindMessage.SubType.WIND1;
import org.eclipse.jdt.annotation.NonNullByDefault;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import org.openhab.binding.rfxcom.internal.exceptions.RFXComException;
import org.openhab.core.util.HexUtils;
@@ -32,17 +32,17 @@ public class RFXComWindMessageTest {
String hexMessage = "105601122F000087000000140000000079";
byte[] message = HexUtils.hexToBytes(hexMessage);
RFXComWindMessage msg = (RFXComWindMessage) RFXComMessageFactory.createMessage(message);
assertEquals("SubType", WIND1, msg.subType);
assertEquals("Seq Number", 18, msg.seqNbr);
assertEquals("Sensor Id", "12032", msg.getDeviceId());
assertEquals("Direction", 135.0, msg.windDirection, 0.001);
// assertEquals("Average speed", 0.0, msg.w9j, 0.001);
assertEquals("Wind Gust", 2.0, msg.windSpeed, 0.001);
assertEquals("Signal Level", 7, msg.signalLevel);
assertEquals("Battery Level", 9, msg.batteryLevel);
assertEquals(WIND1, msg.subType, "SubType");
assertEquals(18, msg.seqNbr, "Seq Number");
assertEquals("12032", msg.getDeviceId(), "Sensor Id");
assertEquals(135.0, msg.windDirection, 0.001, "Direction");
// assertEquals(0.0, msg.w9j, 0.001, "Average speed");
assertEquals(2.0, msg.windSpeed, 0.001, "Wind Gust");
assertEquals(7, msg.signalLevel, "Signal Level");
assertEquals(9, msg.batteryLevel, "Battery Level");
byte[] decoded = msg.decodeMessage();
assertEquals("Message converted back", hexMessage, HexUtils.bytesToHex(decoded));
assertEquals(hexMessage, HexUtils.bytesToHex(decoded), "Message converted back");
}
}