demus/openhab-addons
1
0
Fork 0
mirror of https://github.com/openhab/openhab-addons.git synced 2025-01-25 14:55:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[modbus] itests: Fix testRefreshOnData (#9668)

Browse Source 
* [modbus] itests: Fix testRefreshOnData

Resolves #9617

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] using default timeouts for waitForAssert

Signed-off-by: Sami Salonen <ssalonen@gmail.com>

* [modbus] mvn spotless:apply

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
This commit is contained in:
Sami Salonen 2021-01-06 23:15:38 +02:00 committed by GitHub
parent 1480c41606
commit 4e1d49cee1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,6 @@ import java.util.function.Function;
import org.apache.commons.lang.StringUtils;
import org.hamcrest.Matcher;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import org.openhab.binding.modbus.handler.EndpointNotInitializedException;
@ -767,7 +766,6 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
}
@Test
@Disabled("See: https://github.com/openhab/openhab-addons/issues/9617")
public void testRefreshOnData() throws InterruptedException {
ModbusReadFunctionCode functionCode = ModbusReadFunctionCode.READ_COILS;
@ -798,13 +796,20 @@ public class ModbusDataHandlerTest extends AbstractModbusOSGiTest {
assertThat(dataHandler.getThing().getStatus(), is(equalTo(ThingStatus.ONLINE)));
verify(comms, never()).submitOneTimePoll(eq(request), notNull(), notNull());
// Reset initial REFRESH commands to data thing channels from the Core
ModbusPollerThingHandler handler = (ModbusPollerThingHandler) poller.getHandler();
// Wait for all channels to receive the REFRESH command (initiated by the core)
waitForAssert(
() -> verify((ModbusPollerThingHandler) poller.getHandler(), times(CHANNEL_TO_ACCEPTED_TYPE.size()))
.refresh());
// Reset the mock
reset(poller.getHandler());
// Issue REFRESH command and verify the results
dataHandler.handleCommand(Mockito.mock(ChannelUID.class), RefreshType.REFRESH);
// data handler asynchronously calls the poller.refresh() -- it might take some time
// We check that refresh is finally called
waitForAssert(() -> verify((ModbusPollerThingHandler) poller.getHandler()).refresh(), 2500, 50);
waitForAssert(() -> verify((ModbusPollerThingHandler) poller.getHandler()).refresh());
}
/**