mirror of
https://github.com/danieldemus/openhab-core.git
synced 2025-01-10 21:31:53 +01:00
Reenable org.openhab.core.automation.module.*.tests (#1062)
Reenables: * org.openhab.core.automation.module.core.tests * org.openhab.core.automation.module.script.defaultscope.tests * org.openhab.core.automation.module.script.tests * org.openhab.core.automation.module.timer.tests Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
parent
e8fcba2ccf
commit
14b24530b9
@ -1,7 +1,7 @@
|
|||||||
-include: ../itest-common.bndrun
|
-include: ../itest-common.bndrun
|
||||||
|
|
||||||
Bundle-SymbolicName: ${project.artifactId}
|
Bundle-SymbolicName: ${project.artifactId}
|
||||||
Fragment-Host: org.openhab.core.automation.module.core
|
Fragment-Host: org.openhab.core.automation
|
||||||
|
|
||||||
-runrequires: bnd.identity;id='org.openhab.core.automation.module.core.tests'
|
-runrequires: bnd.identity;id='org.openhab.core.automation.module.core.tests'
|
||||||
|
|
||||||
@ -9,87 +9,41 @@ Fragment-Host: org.openhab.core.automation.module.core
|
|||||||
# done
|
# done
|
||||||
#
|
#
|
||||||
-runbundles: \
|
-runbundles: \
|
||||||
ch.qos.logback.classic;version='[1.2.0,1.2.1)',\
|
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
|
||||||
ch.qos.logback.core;version='[1.2.0,1.2.1)',\
|
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
|
||||||
com.google.gson;version='[2.7.0,2.7.1)',\
|
com.google.gson;version='[2.8.2,2.8.3)',\
|
||||||
com.google.guava;version='[15.0.0,15.0.1)',\
|
|
||||||
com.google.inject;version='[3.0.0,3.0.1)',\
|
|
||||||
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
|
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
|
||||||
joda-time;version='[2.9.2,2.9.3)',\
|
net.bytebuddy.byte-buddy-agent;version='[1.9.7,1.9.8)',\
|
||||||
log4j;version='[1.2.17,1.2.18)',\
|
net.bytebuddy.byte-buddy;version='[1.9.7,1.9.8)',\
|
||||||
org.antlr.runtime;version='[3.2.0,3.2.1)',\
|
|
||||||
org.apache.commons.collections;version='[3.2.1,3.2.2)',\
|
org.apache.commons.collections;version='[3.2.1,3.2.2)',\
|
||||||
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
|
|
||||||
org.apache.commons.io;version='[2.2.0,2.2.1)',\
|
org.apache.commons.io;version='[2.2.0,2.2.1)',\
|
||||||
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
|
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
|
||||||
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
|
|
||||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||||
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
|
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
|
||||||
org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
|
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
|
||||||
org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
|
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
|
||||||
org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
|
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
|
||||||
org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
|
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
|
||||||
org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
|
|
||||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||||
org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.proxy;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
|
org.mockito.mockito-core;version='[2.25.0,2.25.1)',\
|
||||||
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
|
org.objenesis;version='[2.6.0,2.6.1)',\
|
||||||
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
|
org.openhab.core.automation.module.core.tests;version='[2.5.0,2.5.1)',\
|
||||||
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
|
org.openhab.core.automation;version='[2.5.0,2.5.1)',\
|
||||||
org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.1)',\
|
|
||||||
org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
|
|
||||||
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
|
|
||||||
org.objectweb.asm;version='[6.1.1,6.1.2)',\
|
|
||||||
org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
|
|
||||||
org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
|
|
||||||
org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
|
|
||||||
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
|
|
||||||
org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
|
|
||||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
|
||||||
slf4j.api;version='[1.7.21,1.7.22)',\
|
|
||||||
tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
|
|
||||||
tec.uom.se;version='[1.0.8,1.0.9)',\
|
|
||||||
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
|
|
||||||
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
|
|
||||||
org.openhab.core;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.audio;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.compat1x.tests;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
|
org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
|
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
|
org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
|
org.openhab.core.test;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.model.core;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.thing;version='[2.5.0,2.5.1)',\
|
org.openhab.core.thing;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.transform;version='[2.5.0,2.5.1)',\
|
org.openhab.core;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.ui;version='[2.5.0,2.5.1)',\
|
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||||
org.openhab.core.voice;version='[2.5.0,2.5.1)',\
|
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
|
||||||
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
|
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
|
||||||
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
|
slf4j.api;version='[1.7.25,1.7.26)',\
|
||||||
org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
|
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
|
||||||
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
|
tec.uom.se;version='[1.0.10,1.0.11)'
|
||||||
|
@ -1,95 +1,45 @@
|
|||||||
-include: ../itest-common.bndrun
|
-include: ../itest-common.bndrun
|
||||||
|
|
||||||
Bundle-SymbolicName: ${project.artifactId}
|
Bundle-SymbolicName: ${project.artifactId}
|
||||||
Fragment-Host: org.openhab.core.automation.module.script.defaultscope
|
|
||||||
|
|
||||||
-runrequires: bnd.identity;id='org.openhab.core.module.script.defaultscope.tests'
|
-runrequires: bnd.identity;id='org.openhab.core.automation.module.script.defaultscope.tests'
|
||||||
|
|
||||||
#
|
#
|
||||||
# done
|
# done
|
||||||
#
|
#
|
||||||
-runbundles: \
|
-runbundles: \
|
||||||
ch.qos.logback.classic;version='[1.2.0,1.2.1)',\
|
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
|
||||||
ch.qos.logback.core;version='[1.2.0,1.2.1)',\
|
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
|
||||||
com.google.gson;version='[2.7.0,2.7.1)',\
|
com.google.gson;version='[2.8.2,2.8.3)',\
|
||||||
com.google.guava;version='[15.0.0,15.0.1)',\
|
|
||||||
com.google.inject;version='[3.0.0,3.0.1)',\
|
|
||||||
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
|
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
|
||||||
joda-time;version='[2.9.2,2.9.3)',\
|
|
||||||
log4j;version='[1.2.17,1.2.18)',\
|
|
||||||
org.antlr.runtime;version='[3.2.0,3.2.1)',\
|
|
||||||
org.apache.commons.collections;version='[3.2.1,3.2.2)',\
|
org.apache.commons.collections;version='[3.2.1,3.2.2)',\
|
||||||
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
|
|
||||||
org.apache.commons.io;version='[2.2.0,2.2.1)',\
|
org.apache.commons.io;version='[2.2.0,2.2.1)',\
|
||||||
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
|
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
|
||||||
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
|
|
||||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||||
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
|
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
|
||||||
org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
|
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
|
||||||
org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
|
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
|
||||||
org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
|
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
|
||||||
org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
|
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
|
||||||
org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
|
|
||||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||||
org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.proxy;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
|
org.openhab.core.automation.module.script.defaultscope.tests;version='[2.5.0,2.5.1)',\
|
||||||
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
|
org.openhab.core.automation.module.script;version='[2.5.0,2.5.1)',\
|
||||||
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
|
org.openhab.core.automation;version='[2.5.0,2.5.1)',\
|
||||||
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.1)',\
|
|
||||||
org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
|
|
||||||
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
|
|
||||||
org.objectweb.asm;version='[6.1.1,6.1.2)',\
|
|
||||||
org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
|
|
||||||
org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
|
|
||||||
org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
|
|
||||||
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
|
|
||||||
org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
|
|
||||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
|
||||||
slf4j.api;version='[1.7.21,1.7.22)',\
|
|
||||||
tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
|
|
||||||
tec.uom.se;version='[1.0.8,1.0.9)',\
|
|
||||||
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
|
|
||||||
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
|
|
||||||
org.openhab.core;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.audio;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.compat1x.tests;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
|
org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
|
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
|
org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
|
org.openhab.core.test;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.model.core;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.thing;version='[2.5.0,2.5.1)',\
|
org.openhab.core.thing;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.transform;version='[2.5.0,2.5.1)',\
|
org.openhab.core;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.ui;version='[2.5.0,2.5.1)',\
|
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||||
org.openhab.core.voice;version='[2.5.0,2.5.1)',\
|
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
|
||||||
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
|
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
|
||||||
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
|
slf4j.api;version='[1.7.25,1.7.26)',\
|
||||||
org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
|
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
|
||||||
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
|
tec.uom.se;version='[1.0.10,1.0.11)'
|
@ -9,87 +9,38 @@ Fragment-Host: org.openhab.core.automation.module.script
|
|||||||
# done
|
# done
|
||||||
#
|
#
|
||||||
-runbundles: \
|
-runbundles: \
|
||||||
ch.qos.logback.classic;version='[1.2.0,1.2.1)',\
|
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
|
||||||
ch.qos.logback.core;version='[1.2.0,1.2.1)',\
|
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
|
||||||
com.google.gson;version='[2.7.0,2.7.1)',\
|
com.google.gson;version='[2.8.2,2.8.3)',\
|
||||||
com.google.guava;version='[15.0.0,15.0.1)',\
|
|
||||||
com.google.inject;version='[3.0.0,3.0.1)',\
|
|
||||||
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
|
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
|
||||||
joda-time;version='[2.9.2,2.9.3)',\
|
|
||||||
log4j;version='[1.2.17,1.2.18)',\
|
|
||||||
org.antlr.runtime;version='[3.2.0,3.2.1)',\
|
|
||||||
org.apache.commons.collections;version='[3.2.1,3.2.2)',\
|
org.apache.commons.collections;version='[3.2.1,3.2.2)',\
|
||||||
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
|
|
||||||
org.apache.commons.io;version='[2.2.0,2.2.1)',\
|
org.apache.commons.io;version='[2.2.0,2.2.1)',\
|
||||||
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
|
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
|
||||||
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
|
|
||||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||||
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
|
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
|
||||||
org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
|
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
|
||||||
org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
|
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
|
||||||
org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
|
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
|
||||||
org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
|
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
|
||||||
org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
|
|
||||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||||
org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.proxy;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
|
org.openhab.core.automation.module.script.tests;version='[2.5.0,2.5.1)',\
|
||||||
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
|
org.openhab.core.automation.module.script;version='[2.5.0,2.5.1)',\
|
||||||
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
|
org.openhab.core.automation;version='[2.5.0,2.5.1)',\
|
||||||
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.1)',\
|
|
||||||
org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
|
|
||||||
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
|
|
||||||
org.objectweb.asm;version='[6.1.1,6.1.2)',\
|
|
||||||
org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
|
|
||||||
org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
|
|
||||||
org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
|
|
||||||
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
|
|
||||||
org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
|
|
||||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
|
||||||
slf4j.api;version='[1.7.21,1.7.22)',\
|
|
||||||
tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
|
|
||||||
tec.uom.se;version='[1.0.8,1.0.9)',\
|
|
||||||
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
|
|
||||||
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
|
|
||||||
org.openhab.core;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.audio;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.compat1x.tests;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
|
org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
|
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
|
org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
|
org.openhab.core.test;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.model.core;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.thing;version='[2.5.0,2.5.1)',\
|
org.openhab.core.thing;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.transform;version='[2.5.0,2.5.1)',\
|
org.openhab.core;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.ui;version='[2.5.0,2.5.1)',\
|
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||||
org.openhab.core.voice;version='[2.5.0,2.5.1)',\
|
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
|
||||||
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
|
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
|
||||||
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
|
slf4j.api;version='[1.7.25,1.7.26)',\
|
||||||
org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
|
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
|
||||||
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
|
tec.uom.se;version='[1.0.10,1.0.11)'
|
@ -21,7 +21,7 @@ import java.util.Collections;
|
|||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.eclipse.jdt.annotation.NonNull;
|
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||||
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
||||||
import org.eclipse.smarthome.core.events.Event;
|
import org.eclipse.smarthome.core.events.Event;
|
||||||
import org.eclipse.smarthome.core.events.EventFilter;
|
import org.eclipse.smarthome.core.events.EventFilter;
|
||||||
@ -56,30 +56,32 @@ import org.slf4j.LoggerFactory;
|
|||||||
* @author Kai Kreuzer - Initial contribution
|
* @author Kai Kreuzer - Initial contribution
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public class ScriptRuleTest extends JavaOSGiTest {
|
public class ScriptRuleTest extends JavaOSGiTest {
|
||||||
|
|
||||||
final Logger logger = LoggerFactory.getLogger(ScriptRuleTest.class);
|
private final Logger logger = LoggerFactory.getLogger(ScriptRuleTest.class);
|
||||||
VolatileStorageService volatileStorageService = new VolatileStorageService();
|
private VolatileStorageService volatileStorageService = new VolatileStorageService();
|
||||||
|
|
||||||
ItemCommandEvent receivedEvent;
|
private ItemCommandEvent receivedEvent;
|
||||||
|
|
||||||
public ScriptRuleTest() {
|
public ScriptRuleTest() {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void before() {
|
public void before() {
|
||||||
|
@NonNullByDefault
|
||||||
ItemProvider itemProvider = new ItemProvider() {
|
ItemProvider itemProvider = new ItemProvider() {
|
||||||
@Override
|
@Override
|
||||||
public void addProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
|
public void addProviderChangeListener(ProviderChangeListener<Item> listener) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull Collection<@NonNull Item> getAll() {
|
public Collection<Item> getAll() {
|
||||||
return Arrays.asList(new Item[] { new SwitchItem("MyTrigger"), new SwitchItem("ScriptItem") });
|
return Arrays.asList(new Item[] { new SwitchItem("MyTrigger"), new SwitchItem("ScriptItem") });
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
|
public void removeProviderChangeListener(ProviderChangeListener<Item> listener) {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
registerService(itemProvider);
|
registerService(itemProvider);
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
-include: ../itest-common.bndrun
|
-include: ../itest-common.bndrun
|
||||||
|
|
||||||
Bundle-SymbolicName: ${project.artifactId}
|
Bundle-SymbolicName: ${project.artifactId}
|
||||||
Fragment-Host: org.openhab.core.automation.module.timer
|
Fragment-Host: org.openhab.core.automation
|
||||||
|
|
||||||
-runrequires: bnd.identity;id='org.openhab.core.automation.module.timer.tests'
|
-runrequires: bnd.identity;id='org.openhab.core.automation.module.timer.tests'
|
||||||
|
|
||||||
@ -9,87 +9,37 @@ Fragment-Host: org.openhab.core.automation.module.timer
|
|||||||
# done
|
# done
|
||||||
#
|
#
|
||||||
-runbundles: \
|
-runbundles: \
|
||||||
ch.qos.logback.classic;version='[1.2.0,1.2.1)',\
|
|
||||||
ch.qos.logback.core;version='[1.2.0,1.2.1)',\
|
|
||||||
com.google.gson;version='[2.7.0,2.7.1)',\
|
|
||||||
com.google.guava;version='[15.0.0,15.0.1)',\
|
|
||||||
com.google.inject;version='[3.0.0,3.0.1)',\
|
|
||||||
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
|
javax.measure.unit-api;version='[1.0.0,1.0.1)',\
|
||||||
joda-time;version='[2.9.2,2.9.3)',\
|
|
||||||
log4j;version='[1.2.17,1.2.18)',\
|
|
||||||
org.antlr.runtime;version='[3.2.0,3.2.1)',\
|
|
||||||
org.apache.commons.collections;version='[3.2.1,3.2.2)',\
|
org.apache.commons.collections;version='[3.2.1,3.2.2)',\
|
||||||
org.apache.commons.exec;version='[1.1.0,1.1.1)',\
|
|
||||||
org.apache.commons.io;version='[2.2.0,2.2.1)',\
|
org.apache.commons.io;version='[2.2.0,2.2.1)',\
|
||||||
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
|
org.apache.commons.lang;version='[2.6.0,2.6.1)',\
|
||||||
org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
|
|
||||||
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
|
||||||
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
|
org.apache.felix.scr;version='[2.1.10,2.1.11)',\
|
||||||
org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
|
|
||||||
org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
|
|
||||||
org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
|
|
||||||
org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
|
|
||||||
org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
|
|
||||||
org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
|
|
||||||
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
|
||||||
org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.proxy;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
|
org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
|
||||||
org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
|
|
||||||
org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
|
|
||||||
org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.1)',\
|
|
||||||
org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
|
|
||||||
org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
|
|
||||||
org.objectweb.asm;version='[6.1.1,6.1.2)',\
|
|
||||||
org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
|
|
||||||
org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
|
|
||||||
org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
|
|
||||||
org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
|
|
||||||
org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
|
|
||||||
org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
|
|
||||||
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
org.osgi.service.event;version='[1.4.0,1.4.1)',\
|
||||||
slf4j.api;version='[1.7.21,1.7.22)',\
|
|
||||||
tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
|
|
||||||
tec.uom.se;version='[1.0.8,1.0.9)',\
|
|
||||||
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
|
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
|
||||||
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
|
osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
|
||||||
org.openhab.core;version='[2.5.0,2.5.1)',\
|
org.openhab.core;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.audio;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.compat1x.tests;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
|
org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
|
org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.core;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
|
|
||||||
org.openhab.core.thing;version='[2.5.0,2.5.1)',\
|
org.openhab.core.thing;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.transform;version='[2.5.0,2.5.1)',\
|
org.openhab.core.storage.json;version='[2.5.0,2.5.1)',\
|
||||||
org.openhab.core.ui;version='[2.5.0,2.5.1)',\
|
ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
|
||||||
org.openhab.core.voice;version='[2.5.0,2.5.1)',\
|
ch.qos.logback.core;version='[1.2.3,1.2.4)',\
|
||||||
org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
|
com.google.gson;version='[2.8.2,2.8.3)',\
|
||||||
org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
|
org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
|
||||||
org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
|
org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
|
||||||
org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
|
org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
|
||||||
|
org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
|
||||||
|
org.openhab.core.automation;version='[2.5.0,2.5.1)',\
|
||||||
|
org.openhab.core.automation.module.timer.tests;version='[2.5.0,2.5.1)',\
|
||||||
|
org.openhab.core.test;version='[2.5.0,2.5.1)',\
|
||||||
|
slf4j.api;version='[1.7.25,1.7.26)',\
|
||||||
|
tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
|
||||||
|
tec.uom.se;version='[1.0.10,1.0.11)'
|
||||||
|
@ -24,7 +24,7 @@ import java.util.Map;
|
|||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.eclipse.jdt.annotation.NonNull;
|
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||||
import org.eclipse.smarthome.config.core.Configuration;
|
import org.eclipse.smarthome.config.core.Configuration;
|
||||||
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
||||||
import org.eclipse.smarthome.core.events.Event;
|
import org.eclipse.smarthome.core.events.Event;
|
||||||
@ -66,11 +66,11 @@ import org.slf4j.LoggerFactory;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
|
public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
|
||||||
final Logger logger = LoggerFactory.getLogger(TimeOfDayConditionHandlerTest.class);
|
private final Logger logger = LoggerFactory.getLogger(BasicConditionHandlerTest.class);
|
||||||
VolatileStorageService volatileStorageService = new VolatileStorageService();
|
private VolatileStorageService volatileStorageService = new VolatileStorageService();
|
||||||
RuleRegistry ruleRegistry;
|
private RuleRegistry ruleRegistry;
|
||||||
RuleManager ruleEngine;
|
private RuleManager ruleEngine;
|
||||||
Event itemEvent = null;
|
private Event itemEvent = null;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This executes before every test and before the
|
* This executes before every test and before the
|
||||||
@ -79,13 +79,14 @@ public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
|
|||||||
*/
|
*/
|
||||||
@Before
|
@Before
|
||||||
public void beforeBase() {
|
public void beforeBase() {
|
||||||
|
@NonNullByDefault
|
||||||
ItemProvider itemProvider = new ItemProvider() {
|
ItemProvider itemProvider = new ItemProvider() {
|
||||||
@Override
|
@Override
|
||||||
public void addProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
|
public void addProviderChangeListener(ProviderChangeListener<Item> listener) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public @NonNull Collection<@NonNull Item> getAll() {
|
public Collection<Item> getAll() {
|
||||||
List<Item> items = new ArrayList<>();
|
List<Item> items = new ArrayList<>();
|
||||||
items.add(new SwitchItem("TriggeredItem"));
|
items.add(new SwitchItem("TriggeredItem"));
|
||||||
items.add(new SwitchItem("SwitchedItem"));
|
items.add(new SwitchItem("SwitchedItem"));
|
||||||
@ -93,7 +94,7 @@ public abstract class BasicConditionHandlerTest extends JavaOSGiTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
|
public void removeProviderChangeListener(ProviderChangeListener<Item> listener) {
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
@ -27,6 +27,8 @@ import org.openhab.core.automation.Condition;
|
|||||||
import org.openhab.core.automation.internal.module.handler.DayOfWeekConditionHandler;
|
import org.openhab.core.automation.internal.module.handler.DayOfWeekConditionHandler;
|
||||||
import org.openhab.core.automation.type.ModuleTypeRegistry;
|
import org.openhab.core.automation.type.ModuleTypeRegistry;
|
||||||
import org.openhab.core.automation.util.ModuleBuilder;
|
import org.openhab.core.automation.util.ModuleBuilder;
|
||||||
|
import org.slf4j.Logger;
|
||||||
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This tests the dayOfWeek Condition.
|
* This tests the dayOfWeek Condition.
|
||||||
@ -36,9 +38,11 @@ import org.openhab.core.automation.util.ModuleBuilder;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class DayOfWeekConditionHandlerTest extends BasicConditionHandlerTest {
|
public class DayOfWeekConditionHandlerTest extends BasicConditionHandlerTest {
|
||||||
Calendar cal = Calendar.getInstance();
|
|
||||||
SimpleDateFormat sdf = new SimpleDateFormat("EEE", Locale.ENGLISH);
|
private final Logger logger = LoggerFactory.getLogger(DayOfWeekConditionHandlerTest.class);
|
||||||
String dayOfWeek = sdf.format(cal.getTime()).toUpperCase();
|
private Calendar cal = Calendar.getInstance();
|
||||||
|
private SimpleDateFormat sdf = new SimpleDateFormat("EEE", Locale.ENGLISH);
|
||||||
|
private String dayOfWeek = sdf.format(cal.getTime()).toUpperCase();
|
||||||
|
|
||||||
public DayOfWeekConditionHandlerTest() {
|
public DayOfWeekConditionHandlerTest() {
|
||||||
logger.info("Today is {}", dayOfWeek);
|
logger.info("Today is {}", dayOfWeek);
|
||||||
|
@ -23,7 +23,7 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import org.eclipse.jdt.annotation.NonNull;
|
import org.eclipse.jdt.annotation.NonNullByDefault;
|
||||||
import org.eclipse.smarthome.config.core.Configuration;
|
import org.eclipse.smarthome.config.core.Configuration;
|
||||||
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
import org.eclipse.smarthome.core.common.registry.ProviderChangeListener;
|
||||||
import org.eclipse.smarthome.core.events.Event;
|
import org.eclipse.smarthome.core.events.Event;
|
||||||
@ -62,10 +62,10 @@ import org.slf4j.LoggerFactory;
|
|||||||
*/
|
*/
|
||||||
public class RuntimeRuleTest extends JavaOSGiTest {
|
public class RuntimeRuleTest extends JavaOSGiTest {
|
||||||
|
|
||||||
final Logger logger = LoggerFactory.getLogger(RuntimeRuleTest.class);
|
private final Logger logger = LoggerFactory.getLogger(RuntimeRuleTest.class);
|
||||||
VolatileStorageService volatileStorageService = new VolatileStorageService();
|
private VolatileStorageService volatileStorageService = new VolatileStorageService();
|
||||||
RuleRegistry ruleRegistry;
|
private RuleRegistry ruleRegistry;
|
||||||
RuleManager ruleEngine;
|
private RuleManager ruleEngine;
|
||||||
|
|
||||||
public RuntimeRuleTest() {
|
public RuntimeRuleTest() {
|
||||||
}
|
}
|
||||||
@ -206,6 +206,7 @@ public class RuntimeRuleTest extends JavaOSGiTest {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@NonNullByDefault
|
||||||
class TestItemProvider implements ItemProvider {
|
class TestItemProvider implements ItemProvider {
|
||||||
private final Collection<Item> items;
|
private final Collection<Item> items;
|
||||||
|
|
||||||
@ -219,11 +220,11 @@ public class RuntimeRuleTest extends JavaOSGiTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
|
public void addProviderChangeListener(ProviderChangeListener<Item> listener) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeProviderChangeListener(@NonNull ProviderChangeListener<@NonNull Item> listener) {
|
public void removeProviderChangeListener(ProviderChangeListener<Item> listener) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -22,8 +22,6 @@ import org.junit.Test;
|
|||||||
import org.openhab.core.automation.RuleRegistry;
|
import org.openhab.core.automation.RuleRegistry;
|
||||||
import org.openhab.core.automation.internal.module.handler.TimeOfDayTriggerHandler;
|
import org.openhab.core.automation.internal.module.handler.TimeOfDayTriggerHandler;
|
||||||
import org.openhab.core.automation.type.ModuleTypeRegistry;
|
import org.openhab.core.automation.type.ModuleTypeRegistry;
|
||||||
import org.slf4j.Logger;
|
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* this tests the timeOfDay trigger
|
* this tests the timeOfDay trigger
|
||||||
@ -33,9 +31,8 @@ import org.slf4j.LoggerFactory;
|
|||||||
*/
|
*/
|
||||||
public class TimeOfDayTriggerHandlerTest extends JavaOSGiTest {
|
public class TimeOfDayTriggerHandlerTest extends JavaOSGiTest {
|
||||||
|
|
||||||
final Logger logger = LoggerFactory.getLogger(RuntimeRuleTest.class);
|
private VolatileStorageService volatileStorageService = new VolatileStorageService();
|
||||||
VolatileStorageService volatileStorageService = new VolatileStorageService();
|
private RuleRegistry ruleRegistry;
|
||||||
RuleRegistry ruleRegistry;
|
|
||||||
|
|
||||||
public TimeOfDayTriggerHandlerTest() {
|
public TimeOfDayTriggerHandlerTest() {
|
||||||
}
|
}
|
||||||
|
@ -20,10 +20,10 @@
|
|||||||
<module>org.openhab.core.audio.tests</module>
|
<module>org.openhab.core.audio.tests</module>
|
||||||
<module>org.openhab.core.auth.oauth2client.tests</module>
|
<module>org.openhab.core.auth.oauth2client.tests</module>
|
||||||
<module>org.openhab.core.automation.tests</module>
|
<module>org.openhab.core.automation.tests</module>
|
||||||
<!-- <module>org.openhab.core.automation.module.core.tests</module> -->
|
<module>org.openhab.core.automation.module.core.tests</module>
|
||||||
<!-- <module>org.openhab.core.automation.module.timer.tests</module> -->
|
<module>org.openhab.core.automation.module.timer.tests</module>
|
||||||
<!-- <module>org.openhab.core.automation.module.script.defaultscope.tests</module> -->
|
<module>org.openhab.core.automation.module.script.defaultscope.tests</module>
|
||||||
<!-- <module>org.openhab.core.automation.module.script.tests</module> -->
|
<module>org.openhab.core.automation.module.script.tests</module>
|
||||||
<!-- <module>org.openhab.core.automation.integration.tests</module> -->
|
<!-- <module>org.openhab.core.automation.integration.tests</module> -->
|
||||||
<module>org.openhab.core.binding.xml.tests</module>
|
<module>org.openhab.core.binding.xml.tests</module>
|
||||||
<module>org.openhab.core.compat1x.tests</module>
|
<module>org.openhab.core.compat1x.tests</module>
|
||||||
|
Loading…
Reference in New Issue
Block a user