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

Fixed modbus integration tests (#12292) 

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
This commit is contained in:
Christoph Weitkamp 2022-02-14 13:04:39 +01:00 committed by GitHub
parent 909d3d8c42
commit f70290a5ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusDataHandlerTest.java
View File

@ -1066,8 +1066,8 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
dataConfig.put("readStart", "0"); dataConfig.put("readStart", "0");
dataConfig.put("readValueType", "foobar"); dataConfig.put("readValueType", "foobar");
testInitGeneric(ModbusReadFunctionCode.READ_MULTIPLE_REGISTERS, dataConfig, status -> { testInitGeneric(ModbusReadFunctionCode.READ_MULTIPLE_REGISTERS, dataConfig, status -> {
assertThat(status.getStatus(), is(equalTo(ThingStatus.OFFLINE))); assertThat(status.getStatus(), is(equalTo(ThingStatus.UNINITIALIZED)));
assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.CONFIGURATION_ERROR))); assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.HANDLER_CONFIGURATION_PENDING)));
}); });
} }
@ -1111,8 +1111,8 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
dataConfig.put("writeValueType", "int8"); dataConfig.put("writeValueType", "int8");
dataConfig.put("writeType", "holding"); dataConfig.put("writeType", "holding");
testInitGeneric(null, dataConfig, status -> { testInitGeneric(null, dataConfig, status -> {
assertEquals(ThingStatus.OFFLINE, status.getStatus(), status.getDescription()); assertThat(status.getStatus(), is(equalTo(ThingStatus.UNINITIALIZED)));
assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.CONFIGURATION_ERROR))); assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.HANDLER_CONFIGURATION_PENDING)));
}); });
} }
@ -1147,7 +1147,8 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
dataConfig.put("writeType", "holding"); dataConfig.put("writeType", "holding");
// OFFLINE since sub-register writes are not supported for other than bit // OFFLINE since sub-register writes are not supported for other than bit
testInitGeneric(ModbusReadFunctionCode.READ_MULTIPLE_REGISTERS, dataConfig, status -> { testInitGeneric(ModbusReadFunctionCode.READ_MULTIPLE_REGISTERS, dataConfig, status -> {
assertEquals(status.getStatus(), ThingStatus.OFFLINE, status.getDescription()); assertThat(status.getStatus(), is(equalTo(ThingStatus.UNINITIALIZED)));
assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.HANDLER_CONFIGURATION_PENDING)));
}); });
} }
@ -1209,8 +1210,8 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
dataConfig.put("writeValueType", "int8"); dataConfig.put("writeValueType", "int8");
dataConfig.put("writeType", "holding"); dataConfig.put("writeType", "holding");
testInitGeneric(ModbusReadFunctionCode.READ_MULTIPLE_REGISTERS, dataConfig, status -> { testInitGeneric(ModbusReadFunctionCode.READ_MULTIPLE_REGISTERS, dataConfig, status -> {
assertEquals(ThingStatus.OFFLINE, status.getStatus(), status.getDescription()); assertThat(status.getStatus(), is(equalTo(ThingStatus.UNINITIALIZED)));
assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.CONFIGURATION_ERROR))); assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.HANDLER_CONFIGURATION_PENDING)));
}); });
} }
@ -1255,8 +1256,8 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
dataConfig.put("writeType", "coil"); dataConfig.put("writeType", "coil");
dataConfig.put("writeValueType", "foobar"); dataConfig.put("writeValueType", "foobar");
testInitGeneric(ModbusReadFunctionCode.READ_COILS, dataConfig, status -> { testInitGeneric(ModbusReadFunctionCode.READ_COILS, dataConfig, status -> {
assertThat(status.getStatus(), is(equalTo(ThingStatus.OFFLINE))); assertThat(status.getStatus(), is(equalTo(ThingStatus.UNINITIALIZED)));
assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.CONFIGURATION_ERROR))); assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.HANDLER_CONFIGURATION_PENDING)));
}); });
} }
@ -1266,8 +1267,8 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
dataConfig.put("writeStart", "0"); dataConfig.put("writeStart", "0");
dataConfig.put("writeType", "foobar"); dataConfig.put("writeType", "foobar");
testInitGeneric(ModbusReadFunctionCode.READ_COILS, dataConfig, status -> { testInitGeneric(ModbusReadFunctionCode.READ_COILS, dataConfig, status -> {
assertThat(status.getStatus(), is(equalTo(ThingStatus.OFFLINE))); assertThat(status.getStatus(), is(equalTo(ThingStatus.UNINITIALIZED)));
assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.CONFIGURATION_ERROR))); assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.HANDLER_CONFIGURATION_PENDING)));
}); });
} }
@ -1332,8 +1333,8 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
dataConfig.put("readType", "holding"); dataConfig.put("readType", "holding");
dataConfig.put("readValueType", "foobar"); dataConfig.put("readValueType", "foobar");
testInitGeneric(ModbusReadFunctionCode.READ_COILS, dataConfig, status -> { testInitGeneric(ModbusReadFunctionCode.READ_COILS, dataConfig, status -> {
assertThat(status.getStatus(), is(equalTo(ThingStatus.OFFLINE))); assertThat(status.getStatus(), is(equalTo(ThingStatus.UNINITIALIZED)));
assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.CONFIGURATION_ERROR))); assertThat(status.getStatusDetail(), is(equalTo(ThingStatusDetail.HANDLER_CONFIGURATION_PENDING)));
}); });
} }