Commit Graph

161 Commits

Author SHA1 Message Date
Christoph Weitkamp
7634f3de5f [itest] Exclude json and mapdb storage by default for itests (#1193)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-11-08 20:04:48 +01:00
Wouter Born
d627a6b7e6 Downgrade Jollyday again to fix Java 11 build issues (#1195)
Jollyday requires JAXB 2.3 on Java 11 whereas only 2.2 is available during compilation for Java 8 compatibility.

See also:
* https://github.com/openhab/openhab2-addons/issues/6334
* https://github.com/openhab/openhab-core/pull/1170
* https://github.com/openhab/openhab-core/pull/1169

Signed-off-by: Wouter Born <github@maindrain.net>
2019-11-08 15:18:58 +01:00
Wouter Born
e943ec8970 Upgrade to Xtext 2.19, LSP4J 0.8.0 and fix LSP server (#1171)
Every connection to the LSP server failed because it always threw a org.eclipse.smarthome.model.ide.SitemapIdeSetup NoClassDefFoundError.
Which is caused by the SitemapIdeSetup residing in a package that is split between both the org.openhab.core.model.item.ide and the org.openhab.core.model.sitemap.ide bundles.
The SitemapIdeSetup class is also using classes from the org.eclipse.smarthome.model package which is also a package split between the org.openhab.core.model.items and org.openhab.core.model.sitemap bundles.
After renaming the packages used for the sitemap classes the NoClassDefFoundError is resolved and LSP works properly again.
Many imports were updated for the sitemap model package changes.

Fixes #1030

Signed-off-by: Wouter Born <github@maindrain.net>
2019-11-07 16:26:59 +01:00
Gaël L'hopital
4fef0100cb [ephemeris] Evolutions of the Ephemeris module (#1169)
* Evolutions of the Ephemeris module

Signed-off-by: Gaël L'hopital <gael@lhopital.org>
2019-11-04 21:50:43 +01:00
Wouter Born
f002a21da5 Fix SAT errors/warnings in resources and tests (#1178)
Fixes SAT errors/warnings in resources and tests reported by SAT 0.8.0-SNAPSHOT.

Related to openhab/static-code-analysis#363

Signed-off-by: Wouter Born <github@maindrain.net>
2019-11-03 11:04:19 +01:00
Christoph Weitkamp
1f9a6f685d Consider more than one value when applying the default value(s) for Things and Channels (#1067)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-11-01 22:23:52 +01:00
Christoph Weitkamp
2f86782c9d Added 'InstaceCreator' for 'PersistedItem' (#1173)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-11-01 16:28:53 +01:00
Christoph Weitkamp
92a0017e49 Bump jollyday version to 0.5.9 (#1170)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-29 20:39:11 +01:00
Wouter Born
d7e3297466 Improve HostFragmentSupportTest stability with null assertions (#1166)
waitForAssert doesn't catch NPEs so this PR fixes that by also checking the localized modules for null.

Related to #1089

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-27 19:42:52 +01:00
Christoph Weitkamp
12d91f7da9 [i18n] Refactoring and annotations (#1161)
* Added nullness annotations to 'RuleTemplateI18nUtil'
* Added nullness annotations to 'ConfigDescriptionGroupI18nUtil'
* Moved 'ConfigDescriptionI18nUtil' into internal package
* Moved 'ConfigDescriptionGroupI18nUtil' into internal package
* Moved 'ThingTypeI18nUtil' into internal package
* Use 'ConfigI18nLocalizationService' instead of 'ConfigDescriptionI18nUtil'
* Use default labels / descriptions if application of localization is not successful
* Resolved itest.bndrun files

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-27 11:17:52 +01:00
Wouter Born
2430256b6a Add null annotations to registries (#1134)
Adds null annotations to all registries, the interfaces they implement and a few other classes.

Also-by: Christoph Weitkamp <github@christophweitkamp.de>
Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-23 07:36:56 +02:00
Wouter Born
42a000740d Fix ScopeTest on Windows (#1148)
Fixes #1069

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-20 01:38:41 +02:00
Christoph Weitkamp
a3d91bebfc [automation] Added EphemerisConditions for NGRE (#915)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-20 01:37:56 +02:00
Christoph Weitkamp
22ba5d92c1 Minor profile improvements (#1132)
* Minor code improvements in profile factory
* Added integration test to check if factory creates all available profiles

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-19 15:14:57 +02:00
Wouter Born
44c5355591 Fix unstable AutomationIntegrationJsonTest (#1146)
Sometimes the method returns null causing the test to fail because waitForAssert doesn't catch NPEs.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-19 15:14:26 +02:00
Wouter Born
aa4456425a Fix ConcurrentModificationException in AutomationIntegrationTest (#1147)
When waitForAssert uses ruleEvents.stream() the ruleEventHandler may add an event to ruleEvents at the same time causing a ConcurrentModificationException.
Using a CopyOnWriteArrayList instead of an ArrayList should fix this.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-19 15:13:48 +02:00
Wouter Born
42a0217386 Fixes a few more SAT findings (#1145)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-19 14:10:18 +02:00
Wouter Born
7279ddbbf6 Fix unstable GenericItemProviderTest (#1144)
The test now makes sure the models and items are removed and the removal events have been processed during tearDown so these events don't interfere with subsequent tests.
Also merges the GenericItemProviderTest and GenericItemProvider2Test together which was still a Groovy leftover.

Fixes #1140

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-18 22:56:47 +02:00
Wouter Born
11328bcc9a Fix unstable ChannelTypesTest (#1142)
Most likely the test is unstable because the ChannelGroupTypeProvider is still processing the bundle XML. So using waitForAssert may fix this. It's also used like this to assert the channel types got added by the ChannelTypeProvider.

Fixes #1090

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-18 22:53:11 +02:00
Christoph Weitkamp
0fdd691c22 Removed superflous resources (#1137)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-18 22:28:37 +02:00
Mark Hilbush
8396a17d2d Add system profile for a 'rawbutton-on-off-switch' (#1131)
* Add `rawbutton-on-off-switch` profile and tests

Signed-off-by: Mark Hilbush <mark@hilbush.com>
2019-10-14 22:22:18 +02:00
Wouter Born
b337e31621 Improve SafeCallerImplTest stability (#1130)
After some load testing these values improved the stability of the tests.

See: #1113

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-14 07:17:44 +02:00
Wouter Born
017302e3cf Update Mockito to 3.1.0 (#1127)
Mockito 3 does not introduce any breaking API changes, but now requires Java 8 over Java 6 for Mockito 2.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-14 07:14:09 +02:00
Wouter Born
20faf1c63b Fix unstable MDNSDiscoveryServiceOSGiTest (#1123)
Fixes #567

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-13 14:26:38 +02:00
Christoph Weitkamp
91617d8af8 Fixed POM XML Shema Definition path (#1119)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-12 08:52:16 +02:00
Christoph Weitkamp
73d55a9fe9 Changed pid from 'org.eclipse.smarthome.core.i18nprovider' to 'org.eclipse.smarthome.i18n' (#1112)
* Changed pid from 'org.eclipse.smarthome.core.i18nprovider' to 'org.eclipse.smarthome.i18n'

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-11 19:50:04 +02:00
Wouter Born
12e8edc039 Use diamond operator (#1114)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-11 02:29:47 -07:00
Wouter Born
998168698a Fix SAT MethodNameCheck findings (#1111)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-10 11:38:29 +02:00
Wouter Born
3d52c72a91 Fix SAT AuthorContributionDescriptionCheck findings (#1110)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-10 11:36:05 +02:00
Wouter Born
90005e4a56 Fix NoEmptyLineSeparatorCheck and NewlineAtEndOfFileCheck SAT findings (#1108)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-08 22:19:54 -07:00
Wouter Born
08a1f9a86d Fix SAT constant/variable name findings (#1106)
Fixes wrong names identified by the following rules:

* ConstantNameCheck
* LocalFinalVariableNameCheck
* LocalVariableNameCheck
* StaticVariableNameCheck

Most mismatches identified by the MemberNameCheck have also been fixed except for those where the variables are used in events/DTOs etc which would cause issues.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-08 22:19:00 -07:00
Christoph Weitkamp
c86300e420 Fixed wrong trimmed properties (#1105)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-08 09:52:14 -07:00
Wouter Born
12b3c1030f Fix SAT "Initial contribution" warnings (#1100)
Fixes the SAT warning: First javadoc author should have "Initial contribution" contribution description.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-07 21:25:40 -07:00
Wouter Born
3dacba3510 Fix SAT ModifierOrderCheck findings by using JLS suggested modifier order (#1103)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-07 21:24:16 -07:00
Christoph Weitkamp
c31a5aa7ef [storage] Added nullness annotations (#1099)
* Added nullness annotations

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-07 20:50:39 +02:00
Wouter Born
9ae7bbe2e8 Move remaining unit tests (#1095)
Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-04 21:35:13 -07:00
Christoph Weitkamp
2bb5cb7f64 [ephemeris] Adopted configuration for Ephemeris service (#919)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-04 21:33:43 -07:00
Christoph Weitkamp
e1d2ae1c43 [config dispatch] Added support for values containing a list of configuration options (#999)
Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
2019-10-03 21:21:12 -07:00
Wouter Born
49f6afc72a Move IO HTTP unit tests (#1081)
* Move IO HTTP unit tests

All IO HTTP tests are unit tests so there is no need for an itests project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 22:22:00 +02:00
Wouter Born
f5f58643f4 Move thing XML unit tests (#1079)
* Move thing XML unit tests

Moves the thing XML unit tests from the itests project to the bundle project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 22:21:10 +02:00
Wouter Born
eba9be756b Move UI unit tests (#1078)
* Move UI unit tests

All UI tests are unit tests so there is no need for an itests project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 22:20:20 +02:00
Wouter Born
8c17753006 Move voice unit tests (#1077)
* Move voice unit tests

Moves the voice unit tests from the itests project to the bundle project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 22:19:30 +02:00
Wouter Born
8bed617a48 Move compat1x unit tests (#1080)
* Move compat1x unit tests

All compat1x tests are unit tests so there is no need for an itests project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 20:00:57 +02:00
Wouter Born
f1f0e9e52b Move IO Net unit tests (#1082)
* Move IO Net unit tests

All IO Net tests are unit tests so there is no need for an itests project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 20:00:04 +02:00
Wouter Born
4e07b56279 Move magic unit tests (#1083)
* Move magic unit tests

All magic tests are unit tests so there is no need for an itests project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 19:59:02 +02:00
Wouter Born
28bc05e774 Move model LSP unit tests (#1084)
* Move model LSP unit tests

All model LSP tests are unit tests so there is no need for an itests project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 19:57:48 +02:00
Wouter Born
8af30cc53b Move semantics unit tests (#1085)
* Move semantics unit tests

All semantics tests are unit tests so there is no need for an itests project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 19:57:01 +02:00
Wouter Born
7fc9fa65e9 Move transform unit tests (#1076)
* Move transform unit tests

All transform tests are unit tests so there is no need for an itests project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 19:54:20 +02:00
Wouter Born
c2c57dbf10 Move UI icon unit tests (#1075)
* Move UI icon unit tests

All UI icon tests are unit tests so there is no need for an itests project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 19:53:26 +02:00
Wouter Born
f53beab04c Move thing unit tests (#1074)
* Move thing unit tests

Moves the thing unit tests from the itests project to the bundle project.

Signed-off-by: Wouter Born <github@maindrain.net>
2019-10-03 19:52:40 +02:00