OpenHAB
/
openhab-addons
mirror of https://github.com/openhab/openhab-addons.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[shelly] Add unit test coverage (#18794) 

* Add coverage for BLU things
* Use existing ThingTypeUID constants
* Remove misplaced annotation

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
pull/18809/head
Jacob Laursen 2025-06-13 23:01:39 +02:00 committed by GitHub
parent 4a9af7110c
commit 9843c4ad8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bundles/org.openhab.binding.shelly/src/main/java/org/openhab/binding/shelly/internal/ShellyHandlerFactory.java
View File

@ -48,8 +48,6 @@ import org.osgi.service.component.annotations.Reference;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import io.reactivex.annotations.NonNull;
/** /**
* The {@link ShellyHandlerFactory} is responsible for creating things and thing handlers. * The {@link ShellyHandlerFactory} is responsible for creating things and thing handlers.
* *
@ -156,7 +154,7 @@ public class ShellyHandlerFactory extends BaseThingHandlerFactory {
* Remove handler of things. * Remove handler of things.
*/ */
@Override @Override
protected synchronized void removeHandler(@NonNull ThingHandler thingHandler) { protected synchronized void removeHandler(ThingHandler thingHandler) {
if (thingHandler instanceof ShellyBaseHandler shellyBaseHandler) { if (thingHandler instanceof ShellyBaseHandler shellyBaseHandler) {
shellyBaseHandler.stop(); shellyBaseHandler.stop();
String uid = thingHandler.getThing().getUID().getAsString(); String uid = thingHandler.getThing().getUID().getAsString();

14
bundles/org.openhab.binding.shelly/src/test/java/org/openhab/binding/shelly/internal/discovery/ShellyThingCreatorTest.java
View File

@ -202,16 +202,10 @@ public class ShellyThingCreatorTest {
@Test @Test
void getThingUIDReturnsThingTypeMatchingServiceName() { void getThingUIDReturnsThingTypeMatchingServiceName() {
Set<ThingTypeUID> excludedThingTypeUids = Set.of(THING_TYPE_SHELLYBLUDW, THING_TYPE_SHELLYBLUMOTION, Set<ThingTypeUID> excludedThingTypeUids = Set.of(THING_TYPE_SHELLY2_RELAY, THING_TYPE_SHELLY2_ROLLER,
THING_TYPE_SHELLYBLUHT, THING_TYPE_SHELLYBLUGW, THING_TYPE_SHELLYBLUBUTTON, THING_TYPE_SHELLY2_RELAY, THING_TYPE_SHELLY25_ROLLER, THING_TYPE_SHELLY25_RELAY, THING_TYPE_SHELLYPLUSHTG3,
THING_TYPE_SHELLY2_ROLLER, THING_TYPE_SHELLY25_ROLLER, THING_TYPE_SHELLY25_RELAY, THING_TYPE_SHELLYPLUS2PM_RELAY, THING_TYPE_SHELLYPLUS2PM_ROLLER, THING_TYPE_SHELLYPRO2_RELAY,
new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYPLUSHTG3_STR), THING_TYPE_SHELLYPRO2PM_ROLLER, THING_TYPE_SHELLYPRO2PM_RELAY, THING_TYPE_SHELLYRGBW2_COLOR);
new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYPLUS2PM_RELAY_STR),
new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYPLUS2PM_ROLLER_STR),
new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYPRO2_RELAY_STR),
new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYPRO2PM_ROLLER_STR),
new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYPRO2PM_RELAY_STR),
new ThingTypeUID(BINDING_ID, THING_TYPE_SHELLYRGBW2_COLOR_STR));
for (ThingTypeUID supportedThingTypeUid : SUPPORTED_THING_TYPES_UIDS.stream() for (ThingTypeUID supportedThingTypeUid : SUPPORTED_THING_TYPES_UIDS.stream()
.filter(uid -> !excludedThingTypeUids.contains(uid)).toList()) { .filter(uid -> !excludedThingTypeUids.contains(uid)).toList()) {