Resolve itests after core changes (#14498)

Signed-off-by: Jan N. Klug <github@klug.nrw>
This commit is contained in:
J-N-K 2023-02-25 12:37:37 +01:00 committed by GitHub
parent 726858b4f1
commit ec3f5369be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 23 additions and 51 deletions

View 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)'

View 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)'

View 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)'

View 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());

View 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)',\

View 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)'

View 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)'

View 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)',\

View 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)',\

View 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)',\

View 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)',\

View 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)',\

View 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)'

View 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)'

View 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)'

View 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)',\

View 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)'