Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[modbus] itests: Fix testRefreshOnData #9668

Merged
merged 3 commits into from
Jan 6, 2021
Merged

[modbus] itests: Fix testRefreshOnData #9668

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8531f20
[modbus] itests: Fix testRefreshOnData
ssalonen Jan 3, 2021
78effe5
[modbus] using default timeouts for waitForAssert
ssalonen Jan 6, 2021
0de6768
[modbus] mvn spotless:apply
ssalonen Jan 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions ...ng.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusDataHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
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;
Expand Down Expand Up @@ -767,7 +766,6 @@ public void testDiscreteInputAcceptsBitValueType() {
}

@Test
@Disabled("See: https://github.com/openhab/openhab-addons/issues/9617")
public void testRefreshOnData() throws InterruptedException {
ModbusReadFunctionCode functionCode = ModbusReadFunctionCode.READ_COILS;

Expand Down Expand Up @@ -798,13 +796,20 @@ public void testRefreshOnData() throws InterruptedException {
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());
}

/**
Expand Down