[automation] conditions related to the ThingStatus (#5231)

Signed-off-by: Jörg Sautter <joerg.sautter@gmx.net>
This commit is contained in:
joerg1985
2026-02-28 18:10:58 +01:00
committed by GitHub
parent 01c20d59ad
commit 0c2db221b0
14 changed files with 467 additions and 19 deletions
@@ -62,6 +62,7 @@ import org.openhab.core.service.ReadyMarker;
import org.openhab.core.service.StartLevelService;
import org.openhab.core.test.java.JavaOSGiTest;
import org.openhab.core.test.storage.VolatileStorageService;
import org.openhab.core.thing.ThingRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -91,9 +92,11 @@ public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
when(startLevelService.getStartLevel()).thenReturn(100);
registerService(startLevelService, StartLevelService.class.getName());
EventPublisher eventPublisher = Objects.requireNonNull(getService(EventPublisher.class));
ThingRegistry thingRegistry = Objects.requireNonNull(getService(ThingRegistry.class));
ItemRegistry itemRegistry = Objects.requireNonNull(getService(ItemRegistry.class));
CoreModuleHandlerFactory coreModuleHandlerFactory = new CoreModuleHandlerFactory(getBundleContext(),
eventPublisher, itemRegistry, mock(TimeZoneProvider.class), mock(StartLevelService.class));
eventPublisher, thingRegistry, itemRegistry, mock(TimeZoneProvider.class),
mock(StartLevelService.class));
mock(CoreModuleHandlerFactory.class);
registerService(coreModuleHandlerFactory);
@@ -36,6 +36,7 @@ import org.openhab.core.events.EventPublisher;
import org.openhab.core.i18n.TimeZoneProvider;
import org.openhab.core.items.ItemRegistry;
import org.openhab.core.service.StartLevelService;
import org.openhab.core.thing.ThingRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -60,9 +61,11 @@ public class DayOfWeekConditionHandlerTest extends BasicConditionHandlerTest {
@BeforeEach
public void before() {
EventPublisher eventPublisher = Objects.requireNonNull(getService(EventPublisher.class));
ThingRegistry thingRegistry = Objects.requireNonNull(getService(ThingRegistry.class));
ItemRegistry itemRegistry = Objects.requireNonNull(getService(ItemRegistry.class));
CoreModuleHandlerFactory coreModuleHandlerFactory = new CoreModuleHandlerFactory(getBundleContext(),
eventPublisher, itemRegistry, mock(TimeZoneProvider.class), mock(StartLevelService.class));
eventPublisher, thingRegistry, itemRegistry, mock(TimeZoneProvider.class),
mock(StartLevelService.class));
mock(CoreModuleHandlerFactory.class);
registerService(coreModuleHandlerFactory);
}
@@ -59,6 +59,7 @@ import org.openhab.core.service.ReadyMarker;
import org.openhab.core.service.StartLevelService;
import org.openhab.core.test.java.JavaOSGiTest;
import org.openhab.core.test.storage.VolatileStorageService;
import org.openhab.core.thing.ThingRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,9 +85,11 @@ public class RuntimeRuleTest extends JavaOSGiTest {
when(startLevelService.getStartLevel()).thenReturn(100);
registerService(startLevelService, StartLevelService.class.getName());
EventPublisher eventPublisher = Objects.requireNonNull(getService(EventPublisher.class));
ThingRegistry thingRegistry = Objects.requireNonNull(getService(ThingRegistry.class));
ItemRegistry itemRegistry = Objects.requireNonNull(getService(ItemRegistry.class));
CoreModuleHandlerFactory coreModuleHandlerFactory = new CoreModuleHandlerFactory(getBundleContext(),
eventPublisher, itemRegistry, mock(TimeZoneProvider.class), mock(StartLevelService.class));
eventPublisher, thingRegistry, itemRegistry, mock(TimeZoneProvider.class),
mock(StartLevelService.class));
mock(CoreModuleHandlerFactory.class);
registerService(coreModuleHandlerFactory);