[modbus] verify defaults are used for undefined configuration parameters

Signed-off-by: Sami Salonen <ssalonen@gmail.com>
openhab · Feb 14, 2021 · fbdeb73 · fbdeb73
1 parent 8bd71b5
commit fbdeb73
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/...g.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java b/...g.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java
@@ -107,13 +107,13 @@ public void receive(Event event) {
  private final Logger logger = LoggerFactory.getLogger(AbstractModbusOSGiTest.class);
 
  protected @Mock @NonNullByDefault({}) ModbusManager mockedModbusManager;
+ protected @NonNullByDefault({}) ModbusManager realModbusManager;
  protected @NonNullByDefault({}) ManagedThingProvider thingProvider;
  protected @NonNullByDefault({}) ManagedItemProvider itemProvider;
  protected @NonNullByDefault({}) ManagedItemChannelLinkProvider itemChannelLinkProvider;
  protected @NonNullByDefault({}) ItemRegistry itemRegistry;
  protected @NonNullByDefault({}) CoreItemFactory coreItemFactory;
 
- private @NonNullByDefault({}) ModbusManager realModbusManager;
  private Set<Item> addedItems = new HashSet<>();
  private Set<Thing> addedThings = new HashSet<>();
  private Set<ItemChannelLink> addedLinks = new HashSet<>();

diff --git a/...odbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusTcpThingHandlerTest.java b/...odbus.tests/src/main/java/org/openhab/binding/modbus/tests/ModbusTcpThingHandlerTest.java
@@ -14,7 +14,7 @@
 
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.Objects;
 
@@ -98,6 +98,18 @@ public void testTwoDifferentEndpointWithDifferentParameters() {
 
  ModbusTcpThingHandler thingHandler = (ModbusTcpThingHandler) thing.getHandler();
  assertNotNull(thingHandler);
+
+ EndpointPoolConfiguration expectedPoolConfiguration = new EndpointPoolConfiguration();
+ expectedPoolConfiguration.setConnectMaxTries(1);
+ expectedPoolConfiguration.setInterTransactionDelayMillis(1);
+
+ // defaults
+ expectedPoolConfiguration.setConnectTimeoutMillis(10_000);
+ expectedPoolConfiguration.setInterConnectDelayMillis(0);
+ expectedPoolConfiguration.setReconnectAfterMillis(0);
+
+ assertEquals(expectedPoolConfiguration, realModbusManager
+ .getEndpointPoolConfiguration(new ModbusTCPSlaveEndpoint("thisishost", 44, false)));
  }
  {
  Configuration thingConfig = new Configuration();
@@ -148,6 +160,22 @@ public void testTwoIdenticalEndpointWithDifferentParameters() {
  assertThat(thing.getStatus(), is(equalTo(ThingStatus.OFFLINE)));
  assertThat(thing.getStatusInfo().getStatusDetail(), is(equalTo(ThingStatusDetail.CONFIGURATION_ERROR)));
  }
+ {
+ //
+ // Ensure the right EndpointPoolConfiguration is still in place
+ //
+ EndpointPoolConfiguration expectedPoolConfiguration = new EndpointPoolConfiguration();
+ expectedPoolConfiguration.setConnectMaxTries(1);
+ expectedPoolConfiguration.setInterTransactionDelayMillis(1); // Note: not 100
+
+ // defaults
+ expectedPoolConfiguration.setConnectTimeoutMillis(10_000);
+ expectedPoolConfiguration.setInterConnectDelayMillis(0);
+ expectedPoolConfiguration.setReconnectAfterMillis(0);
+
+ assertEquals(expectedPoolConfiguration, realModbusManager
+ .getEndpointPoolConfiguration(new ModbusTCPSlaveEndpoint("thisishost", 44, false)));
+ }
  }
 
  @Test