From 11b1334ca75a7764d8335f2f72091d2162d7b85d Mon Sep 17 00:00:00 2001 From: Christoph Weitkamp Date: Sat, 17 Aug 2019 22:27:53 +0200 Subject: [PATCH] Enable Config XML Tests (#971) Signed-off-by: Christoph Weitkamp --- .../.classpath | 14 +-- .../itest.bndrun | 23 +++-- .../org.openhab.core.config.xml.tests/pom.xml | 2 +- .../config/xml/test/BindingInstaller.java | 61 ++++++++++++ .../xml/test/ConfigDescriptionI18nTest.java | 36 +++---- .../xml/test/ConfigDescriptionsTest.java | 72 +++++++------- .../resources => }/ESH-INF/config/config.xml | 2 +- .../ESH-INF/thing/MyThingType.xml | 0 .../src/main/resources/ESH-INF/config/.keep | 0 .../resources => }/ESH-INF/config/config.xml | 93 ++++++++++--------- .../ESH-INF/i18n/test.properties | 0 .../ESH-INF/i18n/test_de.properties | 0 .../resources => }/ESH-INF/config/config.xml | 4 +- .../ESH-INF/i18n/yahooweather_de.properties | 0 itests/pom.xml | 2 +- 15 files changed, 188 insertions(+), 121 deletions(-) create mode 100644 itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/BindingInstaller.java rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/{src/main/resources => }/ESH-INF/config/config.xml (99%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/{src/main/resources => }/ESH-INF/thing/MyThingType.xml (100%) delete mode 100644 itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/config/.keep rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/{src/main/resources => }/ESH-INF/config/config.xml (51%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/{src/main/resources => }/ESH-INF/i18n/test.properties (100%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/{src/main/resources => }/ESH-INF/i18n/test_de.properties (100%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/{src/main/resources => }/ESH-INF/config/config.xml (88%) rename itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/{src/main/resources => }/ESH-INF/i18n/yahooweather_de.properties (100%) diff --git a/itests/org.openhab.core.config.xml.tests/.classpath b/itests/org.openhab.core.config.xml.tests/.classpath index 372f1810d6..91356226c1 100644 --- a/itests/org.openhab.core.config.xml.tests/.classpath +++ b/itests/org.openhab.core.config.xml.tests/.classpath @@ -6,6 +6,13 @@ + + + + + + + @@ -21,12 +28,5 @@ - - - - - - - diff --git a/itests/org.openhab.core.config.xml.tests/itest.bndrun b/itests/org.openhab.core.config.xml.tests/itest.bndrun index e301ca7719..661e8c101a 100644 --- a/itests/org.openhab.core.config.xml.tests/itest.bndrun +++ b/itests/org.openhab.core.config.xml.tests/itest.bndrun @@ -5,13 +5,15 @@ Fragment-Host: org.openhab.core.config.xml -runrequires: bnd.identity;id='org.openhab.core.config.xml.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)',\ org.apache.commons.io;version='[2.2.0,2.2.1)',\ org.apache.commons.lang;version='[2.6.0,2.6.1)',\ @@ -25,9 +27,6 @@ Fragment-Host: org.openhab.core.config.xml org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\ org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\ 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)',\ @@ -35,4 +34,14 @@ Fragment-Host: org.openhab.core.config.xml org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\ org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\ org.openhab.core.config.xml.tests;version='[2.5.0,2.5.1)',\ - org.openhab.core.test;version='[2.5.0,2.5.1)' + org.openhab.core.test;version='[2.5.0,2.5.1)',\ + ch.qos.logback.classic;version='[1.2.3,1.2.4)',\ + ch.qos.logback.core;version='[1.2.3,1.2.4)',\ + com.google.gson;version='[2.8.2,2.8.3)',\ + org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.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)',\ + 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)',\ + org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)' diff --git a/itests/org.openhab.core.config.xml.tests/pom.xml b/itests/org.openhab.core.config.xml.tests/pom.xml index 1a42c33f35..a3c8d4c85a 100644 --- a/itests/org.openhab.core.config.xml.tests/pom.xml +++ b/itests/org.openhab.core.config.xml.tests/pom.xml @@ -10,6 +10,6 @@ org.openhab.core.config.xml.tests - openHAB Core :: Integration Tests :: Config XML Tests + openHAB Core :: Integration Tests :: Configuration XML Tests diff --git a/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/BindingInstaller.java b/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/BindingInstaller.java new file mode 100644 index 0000000000..1afc46e75c --- /dev/null +++ b/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/BindingInstaller.java @@ -0,0 +1,61 @@ +/** + * Copyright (c) 2010-2019 Contributors to the openHAB project + * + * See the NOTICE file(s) distributed with this work for additional + * information. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0 + * + * SPDX-License-Identifier: EPL-2.0 + */ +package org.eclipse.smarthome.config.xml.test; + +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.assertThat; + +import java.util.function.Consumer; + +import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; +import org.eclipse.smarthome.test.BundleCloseable; +import org.eclipse.smarthome.test.SyntheticBundleInstaller; +import org.osgi.framework.BundleContext; + +/** + * @author Christoph Weitkamp - Initial contribution + */ +public class BindingInstaller { + + private final Consumer waitForAssert; + private final ConfigDescriptionRegistry configDescriptionRegistry; + private final BundleContext bc; + + public BindingInstaller(Consumer waitForAssert, ConfigDescriptionRegistry configDescriptionRegistry, + BundleContext bc) { + this.waitForAssert = waitForAssert; + this.configDescriptionRegistry = configDescriptionRegistry; + this.bc = bc; + } + + public void exec(final String bundleName, final Runnable func) throws Exception { + // Save the number of currently installed bundles. + final int initialNumberOfConfigDescriptions = configDescriptionRegistry.getConfigDescriptions().size(); + + // install test bundle + try (BundleCloseable bundle = new BundleCloseable(SyntheticBundleInstaller.install(bc, bundleName))) { + assertThat(bundle, is(notNullValue())); + + // Wait for correctly installed bundle. + waitForAssert.accept(() -> assertThat(configDescriptionRegistry.getConfigDescriptions().size(), + is(initialNumberOfConfigDescriptions + 1))); + + func.run(); + } + + // Wait for correctly uninstalled bundle. + waitForAssert.accept(() -> assertThat(configDescriptionRegistry.getConfigDescriptions().size(), + is(initialNumberOfConfigDescriptions))); + } + +} diff --git a/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionI18nTest.java b/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionI18nTest.java index 7f8b09d239..ca5b885d69 100644 --- a/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionI18nTest.java +++ b/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionI18nTest.java @@ -24,14 +24,12 @@ import org.eclipse.smarthome.config.core.ConfigDescription; import org.eclipse.smarthome.config.core.ConfigDescriptionParameter; import org.eclipse.smarthome.config.core.ConfigDescriptionParameterGroup; import org.eclipse.smarthome.config.core.ConfigDescriptionRegistry; -import org.eclipse.smarthome.test.BundleCloseable; -import org.eclipse.smarthome.test.SyntheticBundleInstaller; import org.eclipse.smarthome.test.java.JavaOSGiTest; import org.junit.Before; import org.junit.Test; /** - * The ConfigDescriptionsTest is a test for loading of configuration description from XML documents. + * The ConfigDescriptionI18nTest is a test for loading of configuration description from XML documents. * * @author Alex Tugarev - Initial contribution; Extended tests for options and filters * @author Wouter Born - Migrate tests from Groovy to Java @@ -41,43 +39,37 @@ public class ConfigDescriptionI18nTest extends JavaOSGiTest { private static final String TEST_BUNDLE_NAME = "yahooweather.bundle"; private ConfigDescriptionRegistry configDescriptionRegistry; + private BindingInstaller bindingInstaller; @Before public void setUp() { configDescriptionRegistry = getService(ConfigDescriptionRegistry.class); assertThat(configDescriptionRegistry, is(notNullValue())); + bindingInstaller = new BindingInstaller(this::waitForAssert, configDescriptionRegistry, bundleContext); } @Test public void assertConfigDescriptionsAreLocalized() throws Exception { - int initialNumberOfConfigDescriptions = configDescriptionRegistry.getConfigDescriptions().size(); - - // install test bundle - try (BundleCloseable bundle = new BundleCloseable( - SyntheticBundleInstaller.install(bundleContext, TEST_BUNDLE_NAME))) { - assertThat(bundle, is(notNullValue())); - + bindingInstaller.exec(TEST_BUNDLE_NAME, () -> { Collection configDescriptions = configDescriptionRegistry .getConfigDescriptions(Locale.GERMAN); - assertThat(configDescriptions.size(), is(initialNumberOfConfigDescriptions + 1)); ConfigDescription config = new LinkedList<>(configDescriptions).getFirst(); - assertThat(config, is(notNullValue())); String expected = "location.label = Ort\n" + // - "location.description = Ort der Wetterinformation.\n" + // - "unit.label = Einheit\n" + // - "unit.description = Spezifiziert die Einheit der Daten. Valide Werte sind 'us' und 'metric'\n" + // - "refresh.label = Aktualisierungsintervall\n" + // - "refresh.description = Spezifiziert das Aktualisierungsintervall in Sekunden\n" + // - "question.pattern = Wie ist das Wetter in [\\w]*?\n" + // - "question.options = München, Köln\n" + // - "group.label = Group 1 German Label\n" + // - "group.description = Group 1 German Description"; + "location.description = Ort der Wetterinformation.\n" + // + "unit.label = Einheit\n" + // + "unit.description = Spezifiziert die Einheit der Daten. Valide Werte sind 'us' und 'metric'\n" + // + "refresh.label = Aktualisierungsintervall\n" + // + "refresh.description = Spezifiziert das Aktualisierungsintervall in Sekunden\n" + // + "question.pattern = Wie ist das Wetter in [\\w]*?\n" + // + "question.options = München, Köln\n" + // + "group.label = Group 1 German Label\n" + // + "group.description = Group 1 German Description"; assertEquals(expected, asString(config)); - } + }); } private static String asString(ConfigDescription description) { diff --git a/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionsTest.java b/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionsTest.java index cfbfa5883e..5d9890d58c 100644 --- a/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionsTest.java +++ b/itests/org.openhab.core.config.xml.tests/src/main/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionsTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.assertThat; import java.math.BigDecimal; import java.net.URI; +import java.net.URISyntaxException; import java.util.Collection; import java.util.List; import java.util.Locale; @@ -48,28 +49,22 @@ public class ConfigDescriptionsTest extends JavaOSGiTest { private static final String FRAGMENT_TEST_FRAGMENT_NAME = "ConfigDescriptionsFragmentTest.fragment"; private ConfigDescriptionRegistry configDescriptionRegistry; + private BindingInstaller bindingInstaller; @Before public void setUp() { configDescriptionRegistry = getService(ConfigDescriptionRegistry.class); assertThat(configDescriptionRegistry, is(notNullValue())); + bindingInstaller = new BindingInstaller(this::waitForAssert, configDescriptionRegistry, bundleContext); } @Test public void assertThatConfigDescriptionsAreLoadedProperly() throws Exception { - int initialNumberOfConfigDescriptions = configDescriptionRegistry.getConfigDescriptions().size(); - - // install test bundle - try (BundleCloseable bundle = new BundleCloseable( - SyntheticBundleInstaller.install(bundleContext, TEST_BUNDLE_NAME))) { - assertThat(bundle, is(notNullValue())); - + bindingInstaller.exec(TEST_BUNDLE_NAME, () -> { Collection englishConfigDescriptions = configDescriptionRegistry .getConfigDescriptions(Locale.ENGLISH); - assertThat(englishConfigDescriptions.size(), is(initialNumberOfConfigDescriptions + 1)); - ConfigDescription englishDescription = findDescription(englishConfigDescriptions, - new URI("config:dummyConfig")); + ConfigDescription englishDescription = findDescription(englishConfigDescriptions, "config:dummyConfig"); assertThat(englishDescription, is(notNullValue())); List parameters = englishDescription.getParameters(); @@ -210,7 +205,8 @@ public class ConfigDescriptionsTest extends JavaOSGiTest { assertThat(group2.getContext(), is("Context-Group2")); ConfigDescription germanDescription = findDescription( - configDescriptionRegistry.getConfigDescriptions(Locale.GERMAN), new URI("config:dummyConfig")); + configDescriptionRegistry.getConfigDescriptions(Locale.GERMAN), "config:dummyConfig"); + assertThat(germanDescription, is(notNullValue())); unitSeconds = findParameter(germanDescription, "unit-seconds"); assertThat(unitSeconds, is(notNullValue())); @@ -226,38 +222,46 @@ public class ConfigDescriptionsTest extends JavaOSGiTest { assertThat(unitKph, is(notNullValue())); assertThat(unitKph.getUnit(), is("kph")); assertThat(unitKph.getUnitLabel(), is("km/h")); - } + }); } @Test public void assertThatConfigDescriptionsOfFragmentHostAreLoadedProperly() throws Exception { - int initialNumberOfConfigDescriptions = configDescriptionRegistry.getConfigDescriptions().size(); + bindingInstaller.exec(FRAGMENT_TEST_FRAGMENT_NAME, () -> { + try { + try (BundleCloseable bundle = new BundleCloseable( + SyntheticBundleInstaller.install(bundleContext, FRAGMENT_TEST_HOST_NAME))) { + assertThat(bundle, is(notNullValue())); - // install test bundle - try (BundleCloseable fragment = new BundleCloseable( - SyntheticBundleInstaller.installFragment(bundleContext, FRAGMENT_TEST_FRAGMENT_NAME))) { - try (BundleCloseable bundle = new BundleCloseable( - SyntheticBundleInstaller.install(bundleContext, FRAGMENT_TEST_HOST_NAME))) { - assertThat(bundle, is(notNullValue())); + Collection configDescriptions = configDescriptionRegistry + .getConfigDescriptions(); - Collection configDescriptions = configDescriptionRegistry.getConfigDescriptions(); - assertThat(configDescriptions.size(), is(initialNumberOfConfigDescriptions + 1)); + ConfigDescription description = findDescription(configDescriptions, "config:fragmentConfig"); + assertThat(description, is(notNullValue())); - ConfigDescription description = findDescription(configDescriptions, new URI("config:fragmentConfig")); - assertThat(description, is(notNullValue())); + List parameters = description.getParameters(); + assertThat(parameters.size(), is(1)); - List parameters = description.getParameters(); - assertThat(parameters.size(), is(1)); - - ConfigDescriptionParameter usernameParameter = findParameter(description, "testParam"); - assertThat(usernameParameter, is(notNullValue())); - assertThat(usernameParameter.getType(), is(Type.TEXT)); - assertThat(usernameParameter.getLabel(), is("Test")); - assertThat(usernameParameter.isRequired(), is(false)); - assertThat(usernameParameter.isMultiple(), is(false)); - assertThat(usernameParameter.isReadOnly(), is(false)); - assertThat(usernameParameter.getDescription(), is("Test Parameter.")); + ConfigDescriptionParameter usernameParameter = findParameter(description, "testParam"); + assertThat(usernameParameter, is(notNullValue())); + assertThat(usernameParameter.getType(), is(Type.TEXT)); + assertThat(usernameParameter.getLabel(), is("Test")); + assertThat(usernameParameter.isRequired(), is(false)); + assertThat(usernameParameter.isMultiple(), is(false)); + assertThat(usernameParameter.isReadOnly(), is(false)); + assertThat(usernameParameter.getDescription(), is("Test Parameter.")); + } + } catch (Exception e) { + // do nothing: handle exception } + }); + } + + private static ConfigDescription findDescription(Collection descriptions, String uri) { + try { + return findDescription(descriptions, new URI(uri)); + } catch (URISyntaxException e) { + return null; } } diff --git a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/src/main/resources/ESH-INF/config/config.xml b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/ESH-INF/config/config.xml similarity index 99% rename from itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/src/main/resources/ESH-INF/config/config.xml rename to itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/ESH-INF/config/config.xml index b62c0bc16e..5371020fef 100644 --- a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/src/main/resources/ESH-INF/config/config.xml +++ b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/ESH-INF/config/config.xml @@ -6,7 +6,7 @@ - + Test Parameter. diff --git a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/thing/MyThingType.xml b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/ESH-INF/thing/MyThingType.xml similarity index 100% rename from itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/thing/MyThingType.xml rename to itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/ESH-INF/thing/MyThingType.xml diff --git a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/config/.keep b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/config/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/config/config.xml b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/config/config.xml similarity index 51% rename from itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/config/config.xml rename to itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/config/config.xml index b4a9fea6bf..fe1e7e8b41 100644 --- a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/config/config.xml +++ b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/config/config.xml @@ -19,9 +19,10 @@ Description Group 2 true - - - 4 + + + 4 network-address Network address of the hue bridge. @@ -43,54 +44,54 @@ true true - + - - - - - - - - - - - - - true - 4 - false - - - - - item - - alarm, light - color - hue - + + + + + - + + + + + + + true + 4 + false + + + + + item + + alarm, light + color + hue + + + - - Runs - - - + + Runs + - - - - - - - - - - @text/thing-type.config.dummyConfig.unit-movement.unitLabel - + + + + + + + + + + + + @text/thing-type.config.dummyConfig.unit-movement.unitLabel + diff --git a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test.properties b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/i18n/test.properties similarity index 100% rename from itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test.properties rename to itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/i18n/test.properties diff --git a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test_de.properties b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/i18n/test_de.properties similarity index 100% rename from itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test_de.properties rename to itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/ESH-INF/i18n/test_de.properties diff --git a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/config/config.xml b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/ESH-INF/config/config.xml similarity index 88% rename from itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/config/config.xml rename to itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/ESH-INF/config/config.xml index c5b40bf23d..375b3f9b28 100644 --- a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/config/config.xml +++ b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/ESH-INF/config/config.xml @@ -1,8 +1,8 @@ + xsi:schemaLocation="https://openhab.org/schemas/config-description/v1.0.0 https://openhab.org/schemas/config-description/v1.0.0"> diff --git a/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties b/itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/ESH-INF/i18n/yahooweather_de.properties similarity index 100% rename from itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties rename to itests/org.openhab.core.config.xml.tests/src/main/resources/test-bundle-pool/yahooweather.bundle/ESH-INF/i18n/yahooweather_de.properties diff --git a/itests/pom.xml b/itests/pom.xml index b55bf4aaa5..a0130f548a 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -32,7 +32,7 @@ org.openhab.core.config.discovery.tests - + org.openhab.core.config.xml.tests org.openhab.core.io.http.tests org.openhab.core.io.net.tests