forked from openhab/openhab-addons
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[itest] Applied new source code formatter tool (openhab#1194)
* Applied new source code formatter tool * Fixed weired descriptions in XML files; Fixed XSD schemaLocations Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
- Loading branch information
1 parent
d77d8b7
commit f682cb5
Showing
60 changed files
with
915 additions
and
895 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
itests/org.openhab.core.automation.module.script.defaultscope.tests/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
itests/org.openhab.core.automation.module.script.tests/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 19 additions & 20 deletions
39
...sts/src/main/resources/test-bundle-pool/BundleInfoTest.bundle/ESH-INF/binding/binding.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,34 +1,33 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<binding:binding xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xmlns:binding="https://openhab.org/schemas/binding/v1.0.0" | ||
xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 org.eclipse.smarthome.binding.xsd" | ||
id="hue"> | ||
xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd" id="hue"> | ||
|
||
<name>hue Binding</name> | ||
<description>The hue Binding integrates the Philips hue system. It | ||
allows to control hue lights.</description> | ||
<author>Deutsche Telekom AG</author> | ||
|
||
|
||
<!-- Dummy config --> | ||
<config-description> | ||
<parameter name="list" type="text" multiple="true" min="2" max="3"> | ||
<options> | ||
<option value="key1">label1</option> | ||
<option value="key2">label2</option> | ||
</options> | ||
</parameter> | ||
|
||
<parameter name="list" type="text" multiple="true" min="2" max="3"> | ||
<options> | ||
<option value="key1">label1</option> | ||
<option value="key2">label2</option> | ||
</options> | ||
</parameter> | ||
|
||
<parameter name="color-alarming-light" type="text" multiple="true"> | ||
<context>item</context> | ||
<filter> | ||
<criteria name="tags">alarm, light</criteria> | ||
<criteria name="type">color</criteria> | ||
<criteria name="binding-id">hue</criteria> | ||
</filter> | ||
<context>item</context> | ||
<filter> | ||
<criteria name="tags">alarm, light</criteria> | ||
<criteria name="type">color</criteria> | ||
<criteria name="binding-id">hue</criteria> | ||
</filter> | ||
</parameter> | ||
|
||
</config-description> | ||
|
||
</binding:binding> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 19 additions & 20 deletions
39
...main/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/ESH-INF/binding/binding.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,32 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<binding:binding xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xmlns:binding="https://openhab.org/schemas/binding/v1.0.0" | ||
xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 org.eclipse.smarthome.binding.xsd" | ||
id="hue"> | ||
xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd" id="hue"> | ||
|
||
<name>hue Binding</name> | ||
<description>The hue Binding integrates the Philips hue system. It | ||
allows to control hue lights.</description> | ||
|
||
|
||
<!-- Dummy config --> | ||
<config-description> | ||
<parameter name="list" type="text" multiple="true" min="2" max="3"> | ||
<options> | ||
<option value="key1">label1</option> | ||
<option value="key2">label2</option> | ||
</options> | ||
</parameter> | ||
|
||
<parameter name="list" type="text" multiple="true" min="2" max="3"> | ||
<options> | ||
<option value="key1">label1</option> | ||
<option value="key2">label2</option> | ||
</options> | ||
</parameter> | ||
|
||
<parameter name="color-alarming-light" type="text" multiple="true"> | ||
<context>item</context> | ||
<filter> | ||
<criteria name="tags">alarm, light</criteria> | ||
<criteria name="type">color</criteria> | ||
<criteria name="binding-id">hue</criteria> | ||
</filter> | ||
<context>item</context> | ||
<filter> | ||
<criteria name="tags">alarm, light</criteria> | ||
<criteria name="type">color</criteria> | ||
<criteria name="binding-id">hue</criteria> | ||
</filter> | ||
</parameter> | ||
|
||
</config-description> | ||
|
||
</binding:binding> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 6 additions & 8 deletions
14
...tests/src/main/resources/test-bundle-pool/yahooweather.bundle/ESH-INF/binding/binding.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,10 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<binding:binding id="yahooweather" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xmlns:binding="https://openhab.org/schemas/binding/v1.0.0" | ||
xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd"> | ||
<binding:binding id="yahooweather" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xmlns:binding="https://openhab.org/schemas/binding/v1.0.0" | ||
xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd"> | ||
|
||
<name>YahooWeather Binding</name> | ||
<description>The Yahoo Weather Binding requests the Yahoo Weather Service | ||
to show the current temperature, humidity and pressure.</description> | ||
<author>Kai Kreuzer</author> | ||
<name>YahooWeather Binding</name> | ||
<description>The Yahoo Weather Binding requests the Yahoo Weather Service to show the current temperature, humidity and pressure.</description> | ||
<author>Kai Kreuzer</author> | ||
|
||
</binding:binding> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 13 additions & 14 deletions
27
...ources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/ESH-INF/thing/MyThingType.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,17 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<thing:thing-descriptions bindingId="hue" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0" | ||
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd"> | ||
<thing:thing-descriptions bindingId="hue" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xmlns:thing="https://openhab.org/schemas/thing-description/v1.0.0" | ||
xsi:schemaLocation="https://openhab.org/schemas/thing-description/v1.0.0 https://openhab.org/schemas/thing-description-1.0.0.xsd"> | ||
|
||
<thing-type id="MyThingType"> | ||
<label>My Thing Type</label> | ||
<description>My Thing Type</description> | ||
<thing-type id="MyThingType"> | ||
<label>My Thing Type</label> | ||
<description>My Thing Type</description> | ||
|
||
<config-description> | ||
<parameter name="myID" type="text"> | ||
<label>My ID</label> | ||
<description>My ID.</description> | ||
</parameter> | ||
</config-description> | ||
</thing-type> | ||
<config-description> | ||
<parameter name="myID" type="text"> | ||
<label>My ID</label> | ||
<description>My ID.</description> | ||
</parameter> | ||
</config-description> | ||
</thing-type> | ||
</thing:thing-descriptions> |
Oops, something went wrong.