From 034e38d3e12732fb921ea7c234c2e086c9843eeb Mon Sep 17 00:00:00 2001
From: Markus Rathgeb <maggu2810@gmail.com>
Date: Mon, 4 Feb 2019 16:37:10 +0000
Subject: [PATCH] add test: org.openhab.core.config.core (#516)

Signed-off-by: Markus Rathgeb <maggu2810@gmail.com>
---
 bom/test/pom.xml                              |  9 ++--
 ...ConfigDescriptionParameterBuilderTest.java |  0
 .../smarthome/config/core/ConfigUtilTest.java |  0
 .../config/core/ConfigurationTest.java        |  0
 .../i18n/I18nConfigOptionsProviderTest.java   | 15 +++---
 .../normalization/NormalizerTest.java         |  0
 .../ConfigDescriptionValidatorTest.java       |  0
 .../ConfigValidationExceptionTest.java        |  0
 .../core/status/ConfigStatusInfoTest.java     |  0
 .../.classpath                                | 27 +++++++++++
 .../.project                                  | 23 ++++++++++
 .../org.eclipse.core.resources.prefs          |  3 ++
 .../.settings/org.eclipse.jdt.core.prefs      |  6 +++
 .../.settings/org.eclipse.m2e.core.prefs      |  4 ++
 .../itest.bndrun                              | 46 +++++++++++++++++++
 ....eclipse.smarthome.config.core.test.launch | 45 ------------------
 .../pom.xml                                   | 40 ++--------------
 .../ConfigDescriptionRegistryOSGiTest.java    |  0
 .../core/ConfigOptionRegistryOSGiTest.java    |  0
 ...dataConfigDescriptionProviderImplTest.java |  0
 .../core/status/ConfigStatusServiceTest.java  |  0
 itests/pom.xml                                |  2 +-
 22 files changed, 127 insertions(+), 93 deletions(-)
 rename {itests/org.openhab.core.config.core.tests => bundles/org.openhab.core.config.core}/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java (100%)
 rename {itests/org.openhab.core.config.core.tests => bundles/org.openhab.core.config.core}/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java (100%)
 rename {itests/org.openhab.core.config.core.tests => bundles/org.openhab.core.config.core}/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java (100%)
 rename {itests/org.openhab.core.config.core.tests => bundles/org.openhab.core.config.core}/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java (72%)
 rename {itests/org.openhab.core.config.core.tests => bundles/org.openhab.core.config.core}/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java (100%)
 rename {itests/org.openhab.core.config.core.tests => bundles/org.openhab.core.config.core}/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java (100%)
 rename {itests/org.openhab.core.config.core.tests => bundles/org.openhab.core.config.core}/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java (100%)
 rename {itests/org.openhab.core.config.core.tests => bundles/org.openhab.core.config.core}/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java (100%)
 create mode 100644 itests/org.openhab.core.config.core.tests/.classpath
 create mode 100644 itests/org.openhab.core.config.core.tests/.project
 create mode 100644 itests/org.openhab.core.config.core.tests/.settings/org.eclipse.core.resources.prefs
 create mode 100644 itests/org.openhab.core.config.core.tests/.settings/org.eclipse.jdt.core.prefs
 create mode 100644 itests/org.openhab.core.config.core.tests/.settings/org.eclipse.m2e.core.prefs
 create mode 100644 itests/org.openhab.core.config.core.tests/itest.bndrun
 delete mode 100644 itests/org.openhab.core.config.core.tests/org.eclipse.smarthome.config.core.test.launch
 rename itests/org.openhab.core.config.core.tests/src/{test => main}/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryOSGiTest.java (100%)
 rename itests/org.openhab.core.config.core.tests/src/{test => main}/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java (100%)
 rename itests/org.openhab.core.config.core.tests/src/{test => main}/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java (100%)
 rename itests/org.openhab.core.config.core.tests/src/{test => main}/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java (100%)

diff --git a/bom/test/pom.xml b/bom/test/pom.xml
index 82e0b5302..1a4531908 100644
--- a/bom/test/pom.xml
+++ b/bom/test/pom.xml
@@ -15,10 +15,6 @@
 
   <name>openHAB Core :: BOM :: Test</name>
 
-  <properties>
-    <jetty.version>9.3.25.v20180904</jetty.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
@@ -35,6 +31,11 @@
       <artifactId>mockito-core</artifactId>
       <version>2.13.0</version>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <version>${slf4j.version}</version>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
similarity index 72%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
index 8bd3c5227..55c15f21f 100644
--- a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
+++ b/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
@@ -13,12 +13,13 @@
 package org.eclipse.smarthome.config.core.internal.i18n;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertThat;
 
 import java.net.URI;
 import java.util.Locale;
 
 import org.eclipse.smarthome.config.core.ParameterOption;
+import org.hamcrest.collection.IsEmptyCollection;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -46,22 +47,22 @@ public class I18nConfigOptionsProviderTest {
 
     @Test
     public void testLanguage() throws Exception {
-        assertTrue(provider.getParameterOptions(uriI18N, "language", Locale.US).contains(expectedLangEN));
-        assertTrue(provider.getParameterOptions(uriI18N, "language", Locale.FRENCH).contains(expectedLangFR));
-        assertFalse(provider.getParameterOptions(uriI18N, "language", null).isEmpty());
+        assertThat(provider.getParameterOptions(uriI18N, "language", Locale.US), hasItem(expectedLangEN));
+        assertThat(provider.getParameterOptions(uriI18N, "language", Locale.FRENCH), hasItem(expectedLangFR));
+        assertThat(provider.getParameterOptions(uriI18N, "language", null), not(IsEmptyCollection.empty()));
     }
 
     @Test
     public void testRegion() throws Exception {
-        assertTrue(provider.getParameterOptions(uriI18N, "region", Locale.US).contains(expectedCntryEN));
+        assertThat(provider.getParameterOptions(uriI18N, "region", Locale.US), hasItem(expectedCntryEN));
         assertThat(provider.getParameterOptions(uriI18N, "region", Locale.FRENCH),
                 anyOf(hasItem(expectedCntryFRJava8), hasItem(expectedCntryFRJava9)));
-        assertFalse(provider.getParameterOptions(uriI18N, "region", null).isEmpty());
+        assertThat(provider.getParameterOptions(uriI18N, "region", null), not(IsEmptyCollection.empty()));
     }
 
     @Test
     public void testUnknownParameter() throws Exception {
-        assertNull(provider.getParameterOptions(uriI18N, "unknown", Locale.US));
+        assertThat(provider.getParameterOptions(uriI18N, "unknown", Locale.US), nullValue());
     }
 
 }
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java b/bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java
rename to bundles/org.openhab.core.config.core/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java
diff --git a/itests/org.openhab.core.config.core.tests/.classpath b/itests/org.openhab.core.config.core.tests/.classpath
new file mode 100644
index 000000000..5e8a55fef
--- /dev/null
+++ b/itests/org.openhab.core.config.core.tests/.classpath
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/itests/org.openhab.core.config.core.tests/.project b/itests/org.openhab.core.config.core.tests/.project
new file mode 100644
index 000000000..761e81a9d
--- /dev/null
+++ b/itests/org.openhab.core.config.core.tests/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.openhab.core.config.core.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/itests/org.openhab.core.config.core.tests/.settings/org.eclipse.core.resources.prefs b/itests/org.openhab.core.config.core.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..e9441bb12
--- /dev/null
+++ b/itests/org.openhab.core.config.core.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding/<project>=UTF-8
diff --git a/itests/org.openhab.core.config.core.tests/.settings/org.eclipse.jdt.core.prefs b/itests/org.openhab.core.config.core.tests/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 000000000..b8947ec6f
--- /dev/null
+++ b/itests/org.openhab.core.config.core.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.config.core.tests/.settings/org.eclipse.m2e.core.prefs b/itests/org.openhab.core.config.core.tests/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 000000000..f897a7f1c
--- /dev/null
+++ b/itests/org.openhab.core.config.core.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.config.core.tests/itest.bndrun b/itests/org.openhab.core.config.core.tests/itest.bndrun
new file mode 100644
index 000000000..fadc78a61
--- /dev/null
+++ b/itests/org.openhab.core.config.core.tests/itest.bndrun
@@ -0,0 +1,46 @@
+-include: ../itest-common.bndrun
+
+Bundle-SymbolicName: ${project.artifactId}
+Fragment-Host: org.openhab.core.config.core
+
+-runrequires: \
+	bnd.identity;id='org.openhab.core.config.core.tests'
+
+# 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.io;version='[2.2.0,2.2.1)',\
+	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
+	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.test;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.openhab.core.config.core.tests;version='[2.5.0,2.5.1)'
\ No newline at end of file
diff --git a/itests/org.openhab.core.config.core.tests/org.eclipse.smarthome.config.core.test.launch b/itests/org.openhab.core.config.core.tests/org.eclipse.smarthome.config.core.test.launch
deleted file mode 100644
index b21f8d3ec..000000000
--- a/itests/org.openhab.core.config.core.tests/org.eclipse.smarthome.config.core.test.launch
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="default_auto_start" value="true"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.smarthome.config.core.test"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.smarthome.config.core.test"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.smarthome.config.core.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.equinox.p2.director.app.product"/>
-<booleanAttribute key="run_in_ui_thread" value="false"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.eclipsesource.jaxrs.jersey-min@default:default,com.google.gson@default:default,com.google.guava@default:default,javax.inject@default:default,javax.measure.unit-api@default:default,javax.servlet@default:default,javax.transaction@default:false,javax.xml@default:default,net.bytebuddy.byte-buddy-agent@default:default,net.bytebuddy.byte-buddy@default:default,org.apache.ant@default:default,org.apache.commons.collections@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.felix.scr@1:true,org.codehaus.groovy@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.junit@default:default,org.mockito.mockito-core@default:default,org.objenesis@default:default,org.slf4j.api@default:default,tec.uom.lib.uom-lib-common@default:default,tec.uom.se@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.smarthome.config.core.test@default:false,org.eclipse.smarthome.config.core@default:true,org.eclipse.smarthome.config.xml@default:default,org.eclipse.smarthome.core.thing@default:default,org.eclipse.smarthome.core@default:default,org.eclipse.smarthome.io.console@default:default,org.eclipse.smarthome.test@default:true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
diff --git a/itests/org.openhab.core.config.core.tests/pom.xml b/itests/org.openhab.core.config.core.tests/pom.xml
index 7b7507dc1..e60eef9a5 100644
--- a/itests/org.openhab.core.config.core.tests/pom.xml
+++ b/itests/org.openhab.core.config.core.tests/pom.xml
@@ -1,5 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -9,41 +11,7 @@
   </parent>
 
   <artifactId>org.openhab.core.config.core.tests</artifactId>
-  <packaging>eclipse-test-plugin</packaging>
 
   <name>openHAB Core :: Integration Tests :: Configuration Core Tests</name>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>${tycho-groupid}</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <environments combine.self="override"></environments>
-          <dependency-resolution>
-            <extraRequirements>
-              <requirement>
-                <type>eclipse-plugin</type>
-                <id>org.eclipse.equinox.ds</id>
-                <versionRange>0.0.0</versionRange>
-              </requirement>
-            </extraRequirements>
-          </dependency-resolution>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>${tycho-groupid}</groupId>
-        <artifactId>tycho-surefire-plugin</artifactId>
-        <configuration>
-          <bundleStartLevel>
-            <bundle>
-              <id>org.eclipse.equinox.ds</id>
-              <level>1</level>
-              <autoStart>true</autoStart>
-            </bundle>
-          </bundleStartLevel>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryOSGiTest.java b/itests/org.openhab.core.config.core.tests/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryOSGiTest.java
rename to itests/org.openhab.core.config.core.tests/src/main/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryOSGiTest.java
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java b/itests/org.openhab.core.config.core.tests/src/main/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java
rename to itests/org.openhab.core.config.core.tests/src/main/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java b/itests/org.openhab.core.config.core.tests/src/main/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
rename to itests/org.openhab.core.config.core.tests/src/main/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
diff --git a/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java b/itests/org.openhab.core.config.core.tests/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java
similarity index 100%
rename from itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java
rename to itests/org.openhab.core.config.core.tests/src/main/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java
diff --git a/itests/pom.xml b/itests/pom.xml
index ef803d9a9..ea65ac63f 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -32,7 +32,7 @@
     <!-- <module>org.openhab.core.voice.tests</module> -->
     <!-- <module>org.openhab.core.auth.oauth2client.tests</module> -->
     <!-- <module>org.openhab.core.config.dispatch.tests</module> -->
-    <!-- <module>org.openhab.core.config.core.tests</module> -->
+    <module>org.openhab.core.config.core.tests</module>
     <!-- <module>org.openhab.core.config.discovery.mdns.tests</module> -->
     <!-- <module>org.openhab.core.config.discovery.tests</module> -->
     <!-- <module>org.openhab.core.config.discovery.usbserial.tests</module> -->