Fix issues with tests after core-changes (#12817)

Signed-off-by: Jan N. Klug <github@klug.nrw>

diff --git a/bundles/org.openhab.binding.irobot/src/test/java/org/openhab/binding/irobot/internal/handler/RoombaHandlerTest.java b/bundles/org.openhab.binding.irobot/src/test/java/org/openhab/binding/irobot/internal/handler/RoombaHandlerTest.java
index 59eb414dc1644ca5ae5d6900b00795639800bc9d..b1ed5515d50fadbbe9b798472f2813ed99142882 100644 (file)
--- a/bundles/org.openhab.binding.irobot/src/test/java/org/openhab/binding/irobot/internal/handler/RoombaHandlerTest.java
+++ b/bundles/org.openhab.binding.irobot/src/test/java/org/openhab/binding/irobot/internal/handler/RoombaHandlerTest.java
@@ -15,7 +15,6 @@ package org.openhab.binding.irobot.internal.handler;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
@@ -38,9 +37,10 @@ import org.openhab.core.thing.ThingTypeUID;
 import org.openhab.core.thing.ThingUID;
 import org.openhab.core.thing.binding.ThingHandlerCallback;
 import org.openhab.core.thing.internal.ThingImpl;
-import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.spi.LocationAwareLogger;
+
+import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.Logger;
 
 /**
  * Test the MQTT protocol with local iRobot (without openhab running).
@@ -66,11 +66,8 @@ public class RoombaHandlerTest {
 
     @BeforeEach
     void setUp() throws Exception {
-        Logger logger = LoggerFactory.getLogger(RoombaHandler.class);
-        Field logLevelField = logger.getClass().getDeclaredField("currentLogLevel");
-        logLevelField.setAccessible(true);
-        logLevelField.set(logger, LocationAwareLogger.TRACE_INT);
-
+        final Logger logger = (Logger) LoggerFactory.getLogger(RoombaHandler.class);
+        logger.setLevel(Level.TRACE);
         Configuration config = new Configuration();
         config.put("ipaddress", RoombaHandlerTest.IP_ADDRESS);
         config.put("password", RoombaHandlerTest.PASSWORD);

diff --git a/bundles/org.openhab.binding.paradoxalarm/src/test/java/main/Main.java b/bundles/org.openhab.binding.paradoxalarm/src/test/java/main/Main.java
index ba1e6dd0e9c46631fbd68d5e7c7552de7ec1dbea..3236947b9e90ea132106f730f1e2846f6b3fb5f3 100644 (file)
--- a/bundles/org.openhab.binding.paradoxalarm/src/test/java/main/Main.java
+++ b/bundles/org.openhab.binding.paradoxalarm/src/test/java/main/Main.java
@@ -53,9 +53,6 @@ public class Main {
         try {
             scheduler = Executors.newScheduledThreadPool(Runtime.getRuntime().availableProcessors());
 
-            logger.info("System properties={}",
-                    System.getProperties().get(org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY));
-
             ParadoxBuilderFactory factory = new ParadoxBuilderFactory();
             ICommunicatorBuilder builder = factory.createBuilder(PanelType.EVO192);
             communicator = builder.withIp150Password(ip150Password).withPcPassword(pcPassword).withIpAddress(ipAddress)

diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index 40c13172a9aa9abcaf863af8c9dbbacc5dbfacf0..5ba945eb976b59119638da1154d92a480c5d36c3 100644 (file)
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -75,4 +75,6 @@ Fragment-Host: org.openhab.binding.avmfritz
        org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
-       org.jupnp;version='[2.6.1,2.6.2)'
+       org.jupnp;version='[2.6.1,2.6.2)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'

diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index 7a5f4a562cab6fb10964551b51ff8f276bf49d24..5440a7ad8b35c56c5804bf23f834755192f26ff7 100644 (file)
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -75,4 +75,6 @@ Fragment-Host: org.openhab.binding.feed
        org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
        org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\
        org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\
-       org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)'
+       org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'

diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index 6f3b03fef2759bc16ffb4c06ff9076b426886003..fa1fcbce6deca197fd56ca0ad51fe09e0d159cdc 100644 (file)
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -6,7 +6,8 @@ Fragment-Host: org.openhab.binding.hue
 -runrequires: \
        bnd.identity;id='org.openhab.binding.hue.tests',\
        bnd.identity;id='org.openhab.core.binding.xml',\
-       bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.core.thing.xml',\
+       bnd.identity;id='org.eclipse.jdt.annotation'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -21,7 +22,6 @@ Fragment-Host: org.openhab.binding.hue
        org.osgi.service.event;version='[1.4.0,1.4.1)',\
        org.hamcrest;version='[2.2.0,2.2.1)',\
        org.opentest4j;version='[1.2.0,1.2.1)',\
-       org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)',\
        com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
        jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
        org.apache.servicemix.specs.activation-api-1.2.1;version='[1.2.1,1.2.2)',\
@@ -79,4 +79,7 @@ Fragment-Host: org.openhab.binding.hue
        org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
-       org.jupnp;version='[2.6.1,2.6.2)'
+       org.jupnp;version='[2.6.1,2.6.2)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)',\
+       org.eclipse.jdt.annotation;version='[2.2.100,2.2.101)'

diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index 34bca81f5d6abea406427a9562ca6a21fe26a1e4..41e73a17e5a7f2a099076a80af859858782d7d35 100644 (file)
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -66,4 +66,6 @@ Fragment-Host: org.openhab.binding.max
        org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'

diff --git a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
index d0782c6e68e8e468726563d6cd60425babf66c75..6aedeead0b5ccb4ac830f28d621d0130fc2a2722 100644 (file)
--- a/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mielecloud.tests/itest.bndrun
@@ -85,4 +85,6 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
        org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\
        org.ops4j.pax.web.pax-web-runtime;version='[7.3.25,7.3.26)',\
-       org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)'
+       org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'

diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index 199cff7ae1f7f9e6701b84262d4b7cd4371392c6..b53c6b0fa08d53dc984ec3f691267a045b42babf 100644 (file)
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -75,4 +75,6 @@ Fragment-Host: org.openhab.binding.modbus
        org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'

diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index cd2239b2ee703b0c4bc191ca938da316264af6d5..c7b79f2d83a7a8c4946ebaa584367fcb0c2b5b8a 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -109,4 +109,7 @@ Import-Package: \
        org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)',\
+       jakarta.ws.rs-api;version='[2.1.6,2.1.7)'

diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index d2bc41421750e70b5b1c48e617db399511f3eee9..9ac9762183f6308fde175c401501f7affba10481 100644 (file)
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -109,5 +109,8 @@ Import-Package: \
        org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)',\
+       jakarta.ws.rs-api;version='[2.1.6,2.1.7)'
 

diff --git a/itests/org.openhab.binding.nest.tests/itest.bndrun b/itests/org.openhab.binding.nest.tests/itest.bndrun
index 0ee4d274460132df272e65b90c1729cc67c10f28..8e6785a240778bbf536a211f3e220ce6482510ef 100644 (file)
--- a/itests/org.openhab.binding.nest.tests/itest.bndrun
+++ b/itests/org.openhab.binding.nest.tests/itest.bndrun
@@ -10,7 +10,8 @@ Fragment-Host: org.openhab.binding.nest
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
-       bnd.identity;id='org.openhab.core.storage.json'
+       bnd.identity;id='org.openhab.core.storage.json',\
+       bnd.identity;id='jakarta.ws.rs-api'
 
 #
 # done
@@ -104,4 +105,6 @@ Fragment-Host: org.openhab.binding.nest
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
        org.ops4j.pax.web.pax-web-jetty;version='[7.3.25,7.3.26)',\
-       org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)'
+       org.ops4j.pax.web.pax-web-spi;version='[7.3.25,7.3.26)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'

diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index 153108d0cd1de33904fd64b65b65a6b25a7d70d3..28b897208966928c0e1128dd3e52566ecc73dfac 100644 (file)
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -70,4 +70,6 @@ Fragment-Host: org.openhab.binding.ntp
        org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'

diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index 07d1c69b3277ef04ae65c4ceb88458685739eb34..6289875645cff8810357dedabf486a556afb5d8f 100644 (file)
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -73,4 +73,6 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'

diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index 6c2337eaacbe0204545157a0f8a0dd026864c75b..eaffabca008219bb1a877193cc5bb3069f5c3395 100644 (file)
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -76,4 +76,6 @@ Fragment-Host: org.openhab.binding.tradfri
        org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'

diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index 575fc56eeb6cefcd404a379f299c2b80f9b9124c..609e81fd6a3429f166d01247056531b2f952c50b 100644 (file)
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -83,4 +83,6 @@ Fragment-Host: org.openhab.binding.wemo
        org.eclipse.jetty.websocket.common;version='[9.4.46,9.4.47)',\
        org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
        org.ops4j.pax.web.pax-web-api;version='[7.3.25,7.3.26)',\
-       org.jupnp;version='[2.6.1,2.6.2)'
+       org.jupnp;version='[2.6.1,2.6.2)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'

diff --git a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
index 079aac3910b20fa515e67db90c352436487d635e..407518896efb322cb66477ccc772733706a34c76 100644 (file)
--- a/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
+++ b/itests/org.openhab.persistence.mapdb.tests/itest.bndrun
@@ -57,4 +57,6 @@ Fragment-Host: org.openhab.persistence.mapdb
        org.eclipse.jetty.servlet;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util;version='[9.4.46,9.4.47)',\
        org.eclipse.jetty.util.ajax;version='[9.4.46,9.4.47)',\
-       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)'
+       org.ops4j.pax.logging.pax-logging-api;version='[2.0.16,2.0.17)',\
+       ch.qos.logback.classic;version='[1.2.11,1.2.12)',\
+       ch.qos.logback.core;version='[1.2.11,1.2.12)'