unit tests work in progress

Signed-off-by: Andrew Fiddian-Green <software@whitebear.ch>

Author: andrewfg

itests/org.openhab.core.model.item.tests/itest.bndrun

@@ -130,9 +130,9 @@ Fragment-Host: org.openhab.core.model.item
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.19.2,2.19.3)',\
 	org.yaml.snakeyaml;version='[2.4.0,2.4.1)'
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	org.openhab.core.model.rule.runtime;version='[5.1.0,5.1.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
 	de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)'
+	de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\
+	org.openhab.core.model.persistence.runtime;version='[5.1.0,5.1.1)'

itests/org.openhab.core.model.rule.tests/itest.bndrun

@@ -134,3 +134,4 @@ Fragment-Host: org.openhab.core.model.rule.runtime
 	org.yaml.snakeyaml;version='[2.4.0,2.4.1)'
 	org.openhab.core.model.persistence.runtime;version='[5.1.0,5.1.1)'
 	de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)'
+	org.openhab.core.model.persistence.runtime;version='[5.1.0,5.1.1)'

itests/org.openhab.core.model.script.tests/itest.bndrun

@@ -141,4 +141,5 @@ Fragment-Host: org.openhab.core.model.script
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
 	de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)'
+	de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\
+	org.openhab.core.model.persistence.runtime;version='[5.1.0,5.1.1)'

itests/org.openhab.core.model.thing.tests/itest.bndrun

@@ -138,9 +138,9 @@ Fragment-Host: org.openhab.core.model.thing
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.19.2,2.19.3)',\
 	org.yaml.snakeyaml;version='[2.4.0,2.4.1)'
 	org.osgi.service.cm;version='[1.6.0,1.6.1)',\
-	org.openhab.core.model.rule.runtime;version='[5.1.0,5.1.1)',\
 	org.ops4j.pax.logging.pax-logging-api;version='[2.2.8,2.2.9)',\
 	com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.18.2,2.18.3)',\
 	org.yaml.snakeyaml;version='[2.3.0,2.3.1)',\
 	de.focus_shift.jollyday-core;version='[1.5.4,1.5.5)',\
-	de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)'
+	de.focus_shift.jollyday-jackson;version='[1.5.4,1.5.5)',\
+	org.openhab.core.model.persistence.runtime;version='[5.1.0,5.1.1)'

itests/org.openhab.core.thing.tests/src/main/java/org/openhab/core/thing/internal/CommunicationManagerOSGiTest.java

@@ -93,8 +93,8 @@ public class CommunicationManagerOSGiTest extends JavaOSGiTest {
 
     private static class ItemChannelLinkRegistryAdvanced extends ItemChannelLinkRegistry {
         public ItemChannelLinkRegistryAdvanced(ThingRegistry thingRegistry, ItemRegistry itemRegistry,
-                ItemBuilderFactory itemBuilderFactory) {
-            super(null, thingRegistry, itemRegistry, itemBuilderFactory, mock(BundleContext.class));
+                ItemBuilderFactory itemBuilderFactory, BundleContext bundleContext) {
+            super(null, thingRegistry, itemRegistry, itemBuilderFactory, bundleContext);
         }
 
         @Override
@@ -160,12 +160,15 @@ protected void addProvider(Provider<ItemChannelLink> provider) {
 
     private @NonNullByDefault({}) CommunicationManager manager;
     private @NonNullByDefault({}) SafeCaller safeCaller;
-
-    private ItemChannelLinkRegistryAdvanced iclRegistry = new ItemChannelLinkRegistryAdvanced(thingRegistryMock,
-            itemRegistryMock, itemBuilderFactoryMock);
+    private @NonNullByDefault({}) ItemChannelLinkRegistryAdvanced iclRegistry;
 
     @BeforeEach
     public void beforeEach() {
+        registerVolatileStorageService();
+
+        iclRegistry = new ItemChannelLinkRegistryAdvanced(thingRegistryMock, itemRegistryMock, itemBuilderFactoryMock,
+                bundleContext);
+
         when(UNIT_PROVIDER_MOCK.getUnit(Temperature.class)).thenReturn(SIUnits.CELSIUS);
         item5 = new NumberItem("Number:Temperature", ITEM_NAME_5, UNIT_PROVIDER_MOCK);