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

[modbus] Re-enable itests after core change (#15017)

Browse Source 
Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
This commit is contained in:
Holger Friedrich 2023-05-23 08:04:00 +02:00 committed by GitHub
parent ac04a4e71d
commit e74268b24c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java
View File

@ -45,6 +45,7 @@ import org.openhab.binding.modbus.internal.ModbusHandlerFactory;
import org.openhab.core.events.Event; import org.openhab.core.events.Event;
import org.openhab.core.events.EventFilter; import org.openhab.core.events.EventFilter;
import org.openhab.core.events.EventSubscriber; import org.openhab.core.events.EventSubscriber;
import org.openhab.core.i18n.UnitProvider;
import org.openhab.core.io.transport.modbus.ModbusCommunicationInterface; import org.openhab.core.io.transport.modbus.ModbusCommunicationInterface;
import org.openhab.core.io.transport.modbus.ModbusManager; import org.openhab.core.io.transport.modbus.ModbusManager;
import org.openhab.core.items.Item; import org.openhab.core.items.Item;
@ -118,6 +119,7 @@ public abstract class AbstractModbusOSGiTest extends JavaOSGiTest {
private final Logger logger = LoggerFactory.getLogger(AbstractModbusOSGiTest.class); private final Logger logger = LoggerFactory.getLogger(AbstractModbusOSGiTest.class);
protected @Mock @NonNullByDefault({}) ModbusManager mockedModbusManager; protected @Mock @NonNullByDefault({}) ModbusManager mockedModbusManager;
protected @Mock @NonNullByDefault({}) UnitProvider mockedUnitProvider;
protected @NonNullByDefault({}) ModbusManager realModbusManager; protected @NonNullByDefault({}) ModbusManager realModbusManager;
protected @NonNullByDefault({}) ManagedThingProvider thingProvider; protected @NonNullByDefault({}) ManagedThingProvider thingProvider;
protected @NonNullByDefault({}) ManagedItemProvider itemProvider; protected @NonNullByDefault({}) ManagedItemProvider itemProvider;
@ -156,7 +158,7 @@ public abstract class AbstractModbusOSGiTest extends JavaOSGiTest {
itemChannelLinkRegistry = getService(ItemChannelLinkRegistry.class); itemChannelLinkRegistry = getService(ItemChannelLinkRegistry.class);
assertThat("Could not get ItemChannelLinkRegistry", itemChannelLinkRegistry, is(notNullValue())); assertThat("Could not get ItemChannelLinkRegistry", itemChannelLinkRegistry, is(notNullValue()));
coreItemFactory = new CoreItemFactory(); coreItemFactory = new CoreItemFactory(mockedUnitProvider);
// Clean slate for all tests // Clean slate for all tests
reset(mockedModbusManager); reset(mockedModbusManager);

4
itests/pom.xml
View File

@ -25,9 +25,7 @@
<module>org.openhab.binding.hue.tests</module> <module>org.openhab.binding.hue.tests</module>
<module>org.openhab.binding.max.tests</module> <module>org.openhab.binding.max.tests</module>
<module>org.openhab.binding.mielecloud.tests</module> <module>org.openhab.binding.mielecloud.tests</module>
<!-- Modbus tests disabled until fixed (CoreItemFactory) <module>org.openhab.binding.modbus.tests</module>
<module>org.openhab.binding.modbus.tests</module>
-->
<module>org.openhab.binding.mqtt.homeassistant.tests</module> <module>org.openhab.binding.mqtt.homeassistant.tests</module>
<module>org.openhab.binding.mqtt.homie.tests</module> <module>org.openhab.binding.mqtt.homie.tests</module>
<!-- MQTT ruuvigateway tests disabled until fixed (CoreItemFactory + NumberItem) <!-- MQTT ruuvigateway tests disabled until fixed (CoreItemFactory + NumberItem)