From 0b5ae438f1f61449eaceba3c540d983259793fc6 Mon Sep 17 00:00:00 2001
From: Holger Friedrich <holgerfriedrich@users.noreply.github.com>
Date: Tue, 23 May 2023 08:04:00 +0200
Subject: [PATCH] [modbus] Re-enable itests after core change (#15017)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Holger Friedrich <mail@holger-friedrich.de>
Signed-off-by: Jørgen Austvik <jaustvik@acm.org>
---
 .../openhab/binding/modbus/tests/AbstractModbusOSGiTest.java  | 4 +++-
 itests/pom.xml                                                | 4 +---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java b/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java
index 11ad6a941f79..3aaa469ed5ee 100644
--- a/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java
+++ b/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java
@@ -45,6 +45,7 @@
 import org.openhab.core.events.Event;
 import org.openhab.core.events.EventFilter;
 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.ModbusManager;
 import org.openhab.core.items.Item;
@@ -118,6 +119,7 @@ public void receive(Event event) {
     private final Logger logger = LoggerFactory.getLogger(AbstractModbusOSGiTest.class);
 
     protected @Mock @NonNullByDefault({}) ModbusManager mockedModbusManager;
+    protected @Mock @NonNullByDefault({}) UnitProvider mockedUnitProvider;
     protected @NonNullByDefault({}) ModbusManager realModbusManager;
     protected @NonNullByDefault({}) ManagedThingProvider thingProvider;
     protected @NonNullByDefault({}) ManagedItemProvider itemProvider;
@@ -156,7 +158,7 @@ public void setUpAbstractModbusOSGiTest() {
         itemChannelLinkRegistry = getService(ItemChannelLinkRegistry.class);
         assertThat("Could not get ItemChannelLinkRegistry", itemChannelLinkRegistry, is(notNullValue()));
 
-        coreItemFactory = new CoreItemFactory();
+        coreItemFactory = new CoreItemFactory(mockedUnitProvider);
 
         // Clean slate for all tests
         reset(mockedModbusManager);
diff --git a/itests/pom.xml b/itests/pom.xml
index 50c3ae5176ec..f404ec305a94 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -25,9 +25,7 @@
     <module>org.openhab.binding.hue.tests</module>
     <module>org.openhab.binding.max.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.homie.tests</module>
     <!-- MQTT ruuvigateway tests disabled until fixed (CoreItemFactory + NumberItem)