From b3e3b924563e94900022cd66227f3e0f26b98fe2 Mon Sep 17 00:00:00 2001 From: Markus Rathgeb Date: Fri, 1 Feb 2019 15:09:49 +0000 Subject: [PATCH] add itest: org.openhab.core.thing.test (#512) Signed-off-by: Markus Rathgeb --- .../org.openhab.core.thing.tests/.classpath | 32 ++++++ itests/org.openhab.core.thing.tests/.project | 23 ++++ .../org.eclipse.core.resources.prefs | 4 + .../.settings/org.eclipse.jdt.core.prefs | 6 + .../.settings/org.eclipse.m2e.core.prefs | 4 + .../org.openhab.core.thing.tests/itest.bndrun | 62 +++++++++++ ...g.eclipse.smarthome.core.thing.test.launch | 45 -------- itests/org.openhab.core.thing.tests/pom.xml | 103 +----------------- .../core/thing/ChannelGroupUIDTest.java | 0 .../smarthome/core/thing/ChannelTest.java | 0 .../smarthome/core/thing/ChannelUIDTest.java | 0 .../thing/SystemWideChannelTypesTest.java | 0 .../core/thing/ThingPropertiesTest.java | 0 .../smarthome/core/thing/ThingUIDTest.java | 0 .../eclipse/smarthome/core/thing/UIDTest.java | 0 .../binding/BindingBaseClassesOSGiTest.java | 4 +- .../binding/ChangeThingTypeOSGiTest.java | 0 .../core/thing/binding/ThingFactoryTest.java | 0 .../binding/builder/ChannelBuilderTest.java | 0 .../binding/builder/ThingBuilderTest.java | 0 .../thing/binding/firmware/FirmwareTest.java | 0 .../thing/events/ThingEventFactoryTest.java | 0 .../factory/ManagedThingProviderOSGiTest.java | 0 .../core/thing/firmware/Constants.java | 0 .../firmware/FirmwareEventFactoryTest.java | 0 ...eUpdateServiceFirmwareRestrictionTest.java | 0 ...eUpdateServicePrerequisiteVersionTest.java | 0 ...strictedFirmwareUpdateServiceOSGiTest.java | 0 ...usInfoI18nLocalizationServiceOSGiTest.java | 0 .../thing/internal/AutoUpdateManagerTest.java | 0 .../internal/ChannelItemProviderTest.java | 2 +- ...annelStateDescriptionProviderOSGiTest.java | 0 .../internal/CommunicationManagerTest.java | 0 .../internal/SimpleThingTypeProvider.java | 0 .../internal/ThingLinkManagerOSGiTest.java | 0 .../internal/ThingManagerOSGiJavaTest.java | 0 .../thing/internal/ThingManagerOSGiTest.java | 2 +- .../core/thing/internal/ThingManagerTest.java | 0 .../thing/internal/ThingRegistryOSGiTest.java | 0 .../firmware/FirmwareRegistryOSGiTest.java | 0 .../firmware/FirmwareUpdateServiceTest.java | 0 .../firmware/ProgressCallbackTest.java | 0 .../RawButtonToggleSwitchProfileTest.java | 0 .../profiles/SystemDefaultProfileTest.java | 0 .../profiles/SystemFollowProfileTest.java | 0 .../profiles/SystemOffsetProfileTest.java | 0 .../profiles/SystemProfileFactoryTest.java | 0 .../thing/link/ItemChannelLinkOSGiTest.java | 0 .../core/thing/link/LinkEventOSGiTest.java | 0 .../testutil/i18n/DefaultLocaleSetter.java | 0 .../type/ChannelGroupTypeBuilderTest.java | 0 .../thing/type/ChannelTypeBuilderTest.java | 0 .../core/thing/type/ThingTypeBuilderTest.java | 0 .../thing/util/ThingHandlerHelperTest.java | 0 .../core/thing/util/ThingHelperTest.java | 0 .../src/{test => main}/resources/firmware.txt | 0 .../ESH-INF/i18n/test-translations.properties | 0 itests/pom.xml | 2 +- 58 files changed, 140 insertions(+), 149 deletions(-) create mode 100644 itests/org.openhab.core.thing.tests/.classpath create mode 100644 itests/org.openhab.core.thing.tests/.project create mode 100644 itests/org.openhab.core.thing.tests/.settings/org.eclipse.core.resources.prefs create mode 100644 itests/org.openhab.core.thing.tests/.settings/org.eclipse.jdt.core.prefs create mode 100644 itests/org.openhab.core.thing.tests/.settings/org.eclipse.m2e.core.prefs create mode 100644 itests/org.openhab.core.thing.tests/itest.bndrun delete mode 100644 itests/org.openhab.core.thing.tests/org.eclipse.smarthome.core.thing.test.launch rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/ChannelTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/UIDTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java (99%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/firmware/Constants.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java (99%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java (99%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/ThingManagerTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java (100%) rename itests/org.openhab.core.thing.tests/src/{test => main}/resources/firmware.txt (100%) rename itests/org.openhab.core.thing.tests/src/{test/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle/src/main/resources => main/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle}/ESH-INF/i18n/test-translations.properties (100%) diff --git a/itests/org.openhab.core.thing.tests/.classpath b/itests/org.openhab.core.thing.tests/.classpath new file mode 100644 index 000000000..a5d95095c --- /dev/null +++ b/itests/org.openhab.core.thing.tests/.classpath @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/itests/org.openhab.core.thing.tests/.project b/itests/org.openhab.core.thing.tests/.project new file mode 100644 index 000000000..117114a93 --- /dev/null +++ b/itests/org.openhab.core.thing.tests/.project @@ -0,0 +1,23 @@ + + + org.openhab.core.thing.tests + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/itests/org.openhab.core.thing.tests/.settings/org.eclipse.core.resources.prefs b/itests/org.openhab.core.thing.tests/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..abdea9ac0 --- /dev/null +++ b/itests/org.openhab.core.thing.tests/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding/=UTF-8 diff --git a/itests/org.openhab.core.thing.tests/.settings/org.eclipse.jdt.core.prefs b/itests/org.openhab.core.thing.tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..b8947ec6f --- /dev/null +++ b/itests/org.openhab.core.thing.tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/itests/org.openhab.core.thing.tests/.settings/org.eclipse.m2e.core.prefs b/itests/org.openhab.core.thing.tests/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/itests/org.openhab.core.thing.tests/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/itests/org.openhab.core.thing.tests/itest.bndrun b/itests/org.openhab.core.thing.tests/itest.bndrun new file mode 100644 index 000000000..96af89679 --- /dev/null +++ b/itests/org.openhab.core.thing.tests/itest.bndrun @@ -0,0 +1,62 @@ +-include: ../itest-common.bndrun + +Bundle-SymbolicName: ${project.artifactId} +Fragment-Host: org.openhab.core.thing + +-runrequires: \ + bnd.identity;id='org.openhab.core.thing.tests',\ + bnd.identity;id='org.openhab.core.config.core',\ + bnd.identity;id='org.openhab.core.config.discovery',\ + bnd.identity;id='org.openhab.core.config.xml',\ + bnd.identity;id='org.openhab.core.thing.xml',\ + bnd.identity;id='org.openhab.core.thing',\ + bnd.identity;id='org.openhab.core',\ + bnd.identity;id='org.openhab.core.io.console',\ + bnd.identity;id='org.openhab.core.test' + +# 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.mapdb' + +# +# done +# +-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)',\ + javax.measure.unit-api;version='[1.0.0,1.0.1)',\ + net.bytebuddy.byte-buddy;version='[1.7.9,1.7.10)',\ + net.bytebuddy.byte-buddy-agent;version='[1.7.9,1.7.10)',\ + org.apache.commons.collections;version='[3.2.1,3.2.2)',\ + org.apache.commons.io;version='[2.2.0,2.2.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.scr;version='[2.1.10,2.1.11)',\ + org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\ + 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.security;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.util;version='[9.4.11,9.4.12)',\ + org.mockito.mockito-core;version='[2.13.0,2.13.1)',\ + org.objenesis;version='[2.6.0,2.6.1)',\ + org.openhab.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.test;version='[2.5.0,2.5.1)',\ + org.openhab.core.thing;version='[2.5.0,2.5.1)',\ + org.openhab.core.thing.tests;version='[2.5.0,2.5.1)',\ + org.osgi.service.event;version='[1.4.0,1.4.1)',\ + osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\ + osgi.enroute.junit.wrapper;version='[4.12.0,4.12.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)',\ + org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ + org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\ + org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\ + org.openhab.core.thing.xml;version='[2.5.0,2.5.1)' \ No newline at end of file diff --git a/itests/org.openhab.core.thing.tests/org.eclipse.smarthome.core.thing.test.launch b/itests/org.openhab.core.thing.tests/org.eclipse.smarthome.core.thing.test.launch deleted file mode 100644 index 5e96fa880..000000000 --- a/itests/org.openhab.core.thing.tests/org.eclipse.smarthome.core.thing.test.launch +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/itests/org.openhab.core.thing.tests/pom.xml b/itests/org.openhab.core.thing.tests/pom.xml index 1db68cf5f..c450ad2ab 100644 --- a/itests/org.openhab.core.thing.tests/pom.xml +++ b/itests/org.openhab.core.thing.tests/pom.xml @@ -1,5 +1,7 @@ - + + 4.0.0 @@ -9,106 +11,7 @@ org.openhab.core.thing.tests - eclipse-test-plugin openHAB Core :: Integration Tests :: Thing Tests - - - - ${tycho-groupid} - target-platform-configuration - - - - - eclipse-plugin - org.eclipse.equinox.ds - 0.0.0 - - - eclipse-plugin - org.eclipse.equinox.cm - 0.0.0 - - - eclipse-plugin - org.eclipse.equinox.event - 0.0.0 - - - eclipse-plugin - ch.qos.logback.classic - 0.0.0 - - - eclipse-plugin - ch.qos.logback.core - 0.0.0 - - - eclipse-plugin - ch.qos.logback.slf4j - 0.0.0 - - - eclipse-plugin - org.eclipse.smarthome.config.xml - 0.0.0 - - - eclipse-plugin - org.eclipse.smarthome.core.thing.xml - 0.0.0 - - - - - - - ${tycho-groupid} - tycho-surefire-plugin - - - - org.eclipse.equinox.ds - 1 - true - - - org.eclipse.equinox.cm - 1 - true - - - org.eclipse.equinox.event - 2 - true - - - org.eclipse.smarthome.core - 3 - true - - - org.eclipse.smarthome.config.core - 4 - true - - - org.eclipse.smarthome.config.xml - 4 - true - - - org.eclipse.smarthome.core.thing.xml - 4 - true - - - - - - - diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ChannelTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ChannelTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/UIDTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/UIDTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/UIDTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/UIDTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java similarity index 99% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java index 6dc21d68b..fc3cb8520 100644 --- a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java +++ b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java @@ -116,7 +116,7 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest { } class SimpleThingHandlerFactory extends BaseThingHandlerFactory { - private Set handlers = new HashSet<>(); + private final Set handlers = new HashSet<>(); @Override public boolean supportsThingType(ThingTypeUID thingTypeUID) { @@ -306,6 +306,8 @@ public class BindingBaseClassesOSGiTest extends JavaOSGiTest { ConfigStatusInfoEventSubscriber eventSubscriber = new ConfigStatusInfoEventSubscriber(thingUID); registerService(eventSubscriber, EventSubscriber.class.getName()); + Thread.sleep(2000); + thing.getHandler().handleConfigurationUpdate(singletonMap("param", "invalid")); waitForAssert(() -> { diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/Constants.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/Constants.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/Constants.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/Constants.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java similarity index 99% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java index 3033b0d4b..7b82554a8 100644 --- a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java +++ b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java @@ -12,7 +12,7 @@ */ package org.eclipse.smarthome.core.thing.internal; -import static org.mockito.Matchers.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import static org.mockito.MockitoAnnotations.initMocks; diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java similarity index 99% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java index cd05350d7..524a97afe 100644 --- a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java +++ b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java @@ -175,7 +175,7 @@ public class ThingManagerOSGiTest extends JavaOSGiTest { }); Bundle bundle = mock(Bundle.class); - when(bundle.getSymbolicName()).thenReturn("org.eclipse.smarthome.core.thing"); + when(bundle.getSymbolicName()).thenReturn("org.openhab.core.thing"); BundleResolver bundleResolver = mock(BundleResolver.class); when(bundleResolver.resolveBundle(any())).thenReturn(bundle); diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingManagerTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java b/itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java rename to itests/org.openhab.core.thing.tests/src/main/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java diff --git a/itests/org.openhab.core.thing.tests/src/test/resources/firmware.txt b/itests/org.openhab.core.thing.tests/src/main/resources/firmware.txt similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/resources/firmware.txt rename to itests/org.openhab.core.thing.tests/src/main/resources/firmware.txt diff --git a/itests/org.openhab.core.thing.tests/src/test/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle/src/main/resources/ESH-INF/i18n/test-translations.properties b/itests/org.openhab.core.thing.tests/src/main/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle/ESH-INF/i18n/test-translations.properties similarity index 100% rename from itests/org.openhab.core.thing.tests/src/test/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle/src/main/resources/ESH-INF/i18n/test-translations.properties rename to itests/org.openhab.core.thing.tests/src/main/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle/ESH-INF/i18n/test-translations.properties diff --git a/itests/pom.xml b/itests/pom.xml index 9aaf30b35..70db71271 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -26,7 +26,6 @@ - @@ -41,6 +40,7 @@ org.openhab.core.tests org.openhab.core.compat1x.tests + org.openhab.core.thing.tests