]> git.basschouten.com Git - openhab-addons.git/commitdiff
Resolve itests after core changes (#14498)
authorJ-N-K <github@klug.nrw>
Sat, 25 Feb 2023 11:37:37 +0000 (12:37 +0100)
committerGitHub <noreply@github.com>
Sat, 25 Feb 2023 11:37:37 +0000 (12:37 +0100)
Signed-off-by: Jan N. Klug <github@klug.nrw>
17 files changed:
itests/org.openhab.automation.jsscriptingnashorn.tests/itest.bndrun
itests/org.openhab.binding.astro.tests/itest.bndrun
itests/org.openhab.binding.avmfritz.tests/itest.bndrun
itests/org.openhab.binding.avmfritz.tests/src/main/java/org/openhab/binding/avmfritz/internal/handler/AVMFritzThingHandlerOSGiTest.java
itests/org.openhab.binding.feed.tests/itest.bndrun
itests/org.openhab.binding.hue.tests/itest.bndrun
itests/org.openhab.binding.max.tests/itest.bndrun
itests/org.openhab.binding.mielecloud.tests/itest.bndrun
itests/org.openhab.binding.modbus.tests/itest.bndrun
itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
itests/org.openhab.binding.nest.tests/itest.bndrun
itests/org.openhab.binding.ntp.tests/itest.bndrun
itests/org.openhab.binding.systeminfo.tests/itest.bndrun
itests/org.openhab.binding.tradfri.tests/itest.bndrun
itests/org.openhab.binding.wemo.tests/itest.bndrun
itests/org.openhab.persistence.mapdb.tests/itest.bndrun

index b2a9e884ec5b97d2f31a385288960caaf079cce4..183caa6ebf2a584a5615a2d149e4de44c91389da 100644 (file)
@@ -70,4 +70,5 @@ Fragment-Host: org.openhab.automation.jsscriptingnashorn
        com.sun.jna;version='[5.12.1,5.12.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
        org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       xstream;version='[1.4.19,1.4.20)'
index df7005041dc0e5efddffdb09b4a179f794b168f6..601ecb572e34ba09c34ce073dc94b6f3b89a6c3b 100644 (file)
@@ -52,4 +52,5 @@ Fragment-Host: org.openhab.binding.astro
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
-       com.sun.jna;version='[5.12.1,5.12.2)'
+       com.sun.jna;version='[5.12.1,5.12.2)',\
+       xstream;version='[1.4.19,1.4.20)'
index c924f527b309119400abd830b47f18d29dcd5453..aabce86185d914eda66f0da53b948ed06340f3f2 100644 (file)
@@ -79,4 +79,5 @@ Fragment-Host: org.openhab.binding.avmfritz
        com.google.gson;version='[2.9.1,2.9.2)',\
        org.objectweb.asm;version='[9.4.0,9.4.1)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
-       com.sun.jna;version='[5.12.1,5.12.2)'
+       com.sun.jna;version='[5.12.1,5.12.2)',\
+       xstream;version='[1.4.19,1.4.20)'
index f9b05783121b05ae4e73d145e588abdd9d32c154..6c59d5cd183e480aa6c452a8224533d21da7969f 100644 (file)
@@ -31,6 +31,7 @@ import org.openhab.core.test.storage.VolatileStorageService;
 import org.openhab.core.thing.Bridge;
 import org.openhab.core.thing.ManagedThingProvider;
 import org.openhab.core.thing.ThingProvider;
+import org.openhab.core.thing.binding.ThingHandler;
 import org.openhab.core.thing.binding.ThingHandlerCallback;
 import org.openhab.core.thing.binding.builder.BridgeBuilder;
 
@@ -74,7 +75,10 @@ public abstract class AVMFritzThingHandlerOSGiTest extends JavaOSGiTest {
 
         bridgeHandler.setCallback(callback);
 
-        assertNull(bridge.getHandler());
+        ThingHandler oldHandler = bridge.getHandler();
+        if (oldHandler != null) {
+            oldHandler.dispose();
+        }
         bridge.setHandler(bridgeHandler);
         assertNotNull(bridge.getHandler());
 
index 37640825c04dd8d9a3623a260095642617b4ee7c..8785a38ddc1b74f7f0125f2d0a11018657555bb6 100644 (file)
@@ -5,7 +5,6 @@ Fragment-Host: org.openhab.binding.feed
 
 -runrequires: \
        bnd.identity;id='org.openhab.binding.feed.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml',\
        bnd.identity;id='org.apache.felix.configadmin',\
        osgi.identity;filter:='(&(osgi.identity=org.ops4j.pax.web.pax-web-runtime)(version>=7.2.3))'
 
@@ -69,11 +68,9 @@ Fragment-Host: org.openhab.binding.feed
        org.openhab.binding.feed.tests;version='[4.0.0,4.0.1)',\
        org.openhab.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        org.objectweb.asm;version='[9.4.0,9.4.1)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
index b5b69dca36ab91d59b91ac9373390ffb47537164..9ec1f5e6f2db1be5631b001840d8b1a0a76466e4 100644 (file)
@@ -5,7 +5,6 @@ Fragment-Host: org.openhab.binding.hue
 
 -runrequires: \
        bnd.identity;id='org.openhab.binding.hue.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml',\
        bnd.identity;id='org.eclipse.jdt.annotation'
 
 # We would like to use the "volatile" storage only
@@ -72,13 +71,11 @@ Fragment-Host: org.openhab.binding.hue
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery.mdns;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.transport.mdns;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
        com.sun.jna;version='[5.12.1,5.12.2)'
index 50fc6538b01b27be63e03d1e116dd8784cf2ff96..a17236911a898c3de76432023252e9d15272ae52 100644 (file)
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.max
 
 -runrequires: \
-       bnd.identity;id='org.openhab.binding.max.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.max.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -61,11 +60,9 @@ Fragment-Host: org.openhab.binding.max
        org.openhab.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
        com.sun.jna;version='[5.12.1,5.12.2)'
index d999752ec4629a0974589a849f0eeeec9f799db0..40a1f34aa59ee354f999e072060a8d9df5d8d6fe 100644 (file)
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.mielecloud
 
 -runrequires: \
-    bnd.identity;id='org.openhab.binding.mielecloud.tests',\
-    bnd.identity;id='org.openhab.core.thing.xml'
+    bnd.identity;id='org.openhab.binding.mielecloud.tests'
 
 -runblacklist: \
     bnd.identity;id='org.openhab.core.storage.json',\
@@ -78,12 +77,10 @@ Fragment-Host: org.openhab.binding.mielecloud
        org.openhab.core.auth.oauth2client;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        org.objectweb.asm;version='[9.4.0,9.4.1)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
index 3944e44a27c27af7812b94f600e842740297fb69..65a16f3888f7c909a8a7bff4e168e72bc5f67d1a 100644 (file)
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.modbus
 
 -runrequires: \
-       bnd.identity;id='org.openhab.binding.modbus.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.modbus.tests',
 
 # 1) We would like to use the "volatile" storage only, drop other storage
 -runblacklist: \
@@ -68,12 +67,10 @@ Fragment-Host: org.openhab.binding.modbus
        org.openhab.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.transport.modbus;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.transform;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
index 3d0ef56a8f637f9f5e553efbfa56213e2fa167b4..652e63f59a42b7bd006fbf2526221861f260749c 100644 (file)
@@ -12,8 +12,7 @@ Import-Package: \
        moquette-broker-[0-9.]*.jar;lib:=true
 
 -runrequires: \
-       bnd.identity;id='org.openhab.binding.mqtt.homeassistant.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.mqtt.homeassistant.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -102,12 +101,10 @@ Import-Package: \
        org.openhab.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.transport.mqtt;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.transform;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
index 9ab9537a2cda12f7e06ad15f63dabea1427e79d7..3efd4939c1fb195caae4389a747af04677b856c0 100644 (file)
@@ -12,8 +12,7 @@ Import-Package: \
         moquette-broker-[0-9.]*.jar;lib:=true
 
 -runrequires: \
-       bnd.identity;id='org.openhab.binding.mqtt.homie.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.mqtt.homie.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -102,12 +101,10 @@ Import-Package: \
        org.openhab.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.transport.mqtt;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.transform;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
index a27e30fc0902f5d37ac5bfe5f9194b54653a340b..788d18243ab57aed6460a482a7a5e7b8cc469947 100644 (file)
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.nest
 
 -runrequires: \
-       bnd.identity;id='org.openhab.binding.nest.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.nest.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -97,12 +96,10 @@ Fragment-Host: org.openhab.binding.nest
        org.openhab.core.auth.oauth2client;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        org.objectweb.asm;version='[9.4.0,9.4.1)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
index 6744333b881bc8c68e2e3e9a562271783f4f4611..6b149864aa15b1ee33958796616dc873ae7b3a15 100644 (file)
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.ntp
 
 -runrequires: \
-       bnd.identity;id='org.openhab.binding.ntp.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.ntp.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -65,11 +64,9 @@ Fragment-Host: org.openhab.binding.ntp
        org.openhab.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
        com.sun.jna;version='[5.12.1,5.12.2)'
index 094c6b2ab9173b20a74ac240ca7ba782decee959..45fa5ac5952459730187fbea00f888b70a3a5d73 100644 (file)
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.systeminfo
 
 -runrequires: \
-       bnd.identity;id='org.openhab.binding.systeminfo.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.systeminfo.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -69,10 +68,8 @@ Fragment-Host: org.openhab.binding.systeminfo
        org.openhab.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)'
index 10dd93ad5a15ef218563967e446c49f3d4fef8da..a5722a914d4170b6c565cea6f2ef9ad958f0f050 100644 (file)
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.tradfri
 
 -runrequires: \
-       bnd.identity;id='org.openhab.binding.tradfri.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.tradfri.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -71,12 +70,10 @@ Fragment-Host: org.openhab.binding.tradfri
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery.mdns;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.transport.mdns;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
        com.sun.jna;version='[5.12.1,5.12.2)'
index 78c81f0c1f03befae1245d169144479701a594a8..9398a5dbe2c8bcce4cf4b7ac4265a3e7dc5aba0e 100644 (file)
@@ -4,8 +4,7 @@ Bundle-SymbolicName: ${project.artifactId}
 Fragment-Host: org.openhab.binding.wemo
 
 -runrequires: \
-       bnd.identity;id='org.openhab.binding.wemo.tests',\
-       bnd.identity;id='org.openhab.core.thing.xml'
+       bnd.identity;id='org.openhab.binding.wemo.tests'
 
 # We would like to use the "volatile" storage only
 -runblacklist: \
@@ -75,13 +74,11 @@ Fragment-Host: org.openhab.binding.wemo
        org.openhab.core.config.core;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery;version='[4.0.0,4.0.1)',\
        org.openhab.core.config.discovery.upnp;version='[4.0.0,4.0.1)',\
-       org.openhab.core.config.xml;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.console;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.net;version='[4.0.0,4.0.1)',\
        org.openhab.core.io.transport.upnp;version='[4.0.0,4.0.1)',\
        org.openhab.core.test;version='[4.0.0,4.0.1)',\
        org.openhab.core.thing;version='[4.0.0,4.0.1)',\
-       org.openhab.core.thing.xml;version='[4.0.0,4.0.1)',\
        com.google.gson;version='[2.9.1,2.9.2)',\
        org.objectweb.asm;version='[9.4.0,9.4.1)',\
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
index 84cd06581d4c172af1eae6bf7c2deb24ca763e75..5ac749cc0fb7b7ae7cf12ab1d289d693ab875157 100644 (file)
@@ -63,4 +63,5 @@ Fragment-Host: org.openhab.persistence.mapdb
        io.methvin.directory-watcher;version='[0.17.1,0.17.2)',\
        com.sun.jna;version='[5.12.1,5.12.2)',\
        org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
-       org.osgi.service.cm;version='[1.6.0,1.6.1)'
+       org.osgi.service.cm;version='[1.6.0,1.6.1)',\
+       xstream;version='[1.4.19,1.4.20)'