public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[hdpowerview] Fix output to console from tests and eliminate warnings (#12824)

Browse Source 
* Avoid logging to console
* Fix redundant null checks

Signed-off-by: Jacob Laursen <jacob-github@vindvejr.dk>
This commit is contained in:
Jacob Laursen 2022-06-04 08:44:44 +02:00 committed by GitHub
parent 651fa295e7
commit f986183a21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 103 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bundles/org.openhab.binding.hdpowerview/src/test/java/org/openhab/binding/hdpowerview/AutomationChannelBuilderTest.java
View File

@ -33,6 +33,10 @@ import org.openhab.core.thing.Channel;
import org.openhab.core.thing.ChannelGroupUID; import org.openhab.core.thing.ChannelGroupUID;
import org.openhab.core.thing.ThingUID; import org.openhab.core.thing.ThingUID;
import org.osgi.framework.Bundle; import org.osgi.framework.Bundle;
import org.slf4j.LoggerFactory;
import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
/** /**
* Unit tests for {@link AutomationChannelBuilder}. * Unit tests for {@link AutomationChannelBuilder}.
@ -54,6 +58,8 @@ public class AutomationChannelBuilderTest {
@BeforeEach @BeforeEach
private void setUp() { private void setUp() {
final Logger logger = (Logger) LoggerFactory.getLogger(AutomationChannelBuilder.class);
logger.setLevel(Level.OFF);
builder = AutomationChannelBuilder.create(translationProvider, CHANNEL_GROUP_UID); builder = AutomationChannelBuilder.create(translationProvider, CHANNEL_GROUP_UID);
Scene scene = new Scene(); Scene scene = new Scene();

222
bundles/org.openhab.binding.hdpowerview/src/test/java/org/openhab/binding/hdpowerview/HDPowerViewJUnitTests.java
View File

@ -121,23 +121,21 @@ public class HDPowerViewJUnitTests {
List<ShadeData> shadesData = shadesX.shadeData; List<ShadeData> shadesData = shadesX.shadeData;
assertNotNull(shadesData); assertNotNull(shadesData);
if (shadesData != null) { assertTrue(!shadesData.isEmpty());
assertTrue(!shadesData.isEmpty()); ShadeData shadeData;
ShadeData shadeData; shadeData = shadesData.get(0);
shadeData = shadesData.get(0); assertNotNull(shadeData);
assertNotNull(shadeData); assertTrue(shadeData.getName().length() > 0);
assertTrue(shadeData.getName().length() > 0); shadePos = shadeData.positions;
shadePos = shadeData.positions; assertNotNull(shadePos);
assertNotNull(shadePos); ShadeData shadeZero = shadesData.get(0);
ShadeData shadeZero = shadesData.get(0); assertNotNull(shadeZero);
assertNotNull(shadeZero); shadeId = shadeZero.id;
shadeId = shadeZero.id; assertNotEquals(0, shadeId);
assertNotEquals(0, shadeId);
for (ShadeData shadexData : shadesData) { for (ShadeData shadexData : shadesData) {
String shadeName = shadexData.getName(); String shadeName = shadexData.getName();
assertNotNull(shadeName); assertNotNull(shadeName);
}
} }
} catch (HubException e) { } catch (HubException e) {
fail(e.getMessage()); fail(e.getMessage());
@ -152,17 +150,15 @@ public class HDPowerViewJUnitTests {
List<Scene> scenesData = scenes.sceneData; List<Scene> scenesData = scenes.sceneData;
assertNotNull(scenesData); assertNotNull(scenesData);
if (scenesData != null) { assertTrue(!scenesData.isEmpty());
assertTrue(!scenesData.isEmpty()); Scene sceneZero = scenesData.get(0);
Scene sceneZero = scenesData.get(0); assertNotNull(sceneZero);
assertNotNull(sceneZero); sceneId = sceneZero.id;
sceneId = sceneZero.id; assertTrue(sceneId > 0);
assertTrue(sceneId > 0);
for (Scene scene : scenesData) { for (Scene scene : scenesData) {
String sceneName = scene.getName(); String sceneName = scene.getName();
assertNotNull(sceneName); assertNotNull(sceneName);
}
} }
} catch (HubException e) { } catch (HubException e) {
fail(e.getMessage()); fail(e.getMessage());
@ -187,31 +183,27 @@ public class HDPowerViewJUnitTests {
Integer capabilitiesValue = shadeData.capabilities; Integer capabilitiesValue = shadeData.capabilities;
assertNotNull(capabilitiesValue); assertNotNull(capabilitiesValue);
if (positions != null && capabilitiesValue != null) { Capabilities capabilities = new ShadeCapabilitiesDatabase()
Capabilities capabilities = new ShadeCapabilitiesDatabase() .getCapabilities(capabilitiesValue.intValue());
.getCapabilities(capabilitiesValue.intValue());
State pos = positions.getState(capabilities, PRIMARY_POSITION); State pos = positions.getState(capabilities, PRIMARY_POSITION);
assertEquals(PercentType.class, pos.getClass()); assertEquals(PercentType.class, pos.getClass());
int position = ((PercentType) pos).intValue(); int position = ((PercentType) pos).intValue();
position = position + ((position <= 10) ? 5 : -5); position = position + ((position <= 10) ? 5 : -5);
ShadePosition targetPosition = new ShadePosition().setPosition(capabilities, PRIMARY_POSITION, ShadePosition targetPosition = new ShadePosition().setPosition(capabilities, PRIMARY_POSITION,
position); position);
assertNotNull(targetPosition); assertNotNull(targetPosition);
if (allowShadeMovementCommands) { if (allowShadeMovementCommands) {
webTargets.moveShade(shadeId, targetPosition); webTargets.moveShade(shadeId, targetPosition);
ShadeData newData = webTargets.getShade(shadeId); ShadeData newData = webTargets.getShade(shadeId);
ShadePosition actualPosition = newData.positions; ShadePosition actualPosition = newData.positions;
assertNotNull(actualPosition); assertNotNull(actualPosition);
if (actualPosition != null) { assertEquals(targetPosition.getState(capabilities, PRIMARY_POSITION),
assertEquals(targetPosition.getState(capabilities, PRIMARY_POSITION), actualPosition.getState(capabilities, PRIMARY_POSITION));
actualPosition.getState(capabilities, PRIMARY_POSITION));
}
}
} }
} }
} catch (HubException e) { } catch (HubException e) {
@ -273,16 +265,12 @@ public class HDPowerViewJUnitTests {
Scenes scenes = gson.fromJson(json, Scenes.class); Scenes scenes = gson.fromJson(json, Scenes.class);
assertNotNull(scenes); assertNotNull(scenes);
if (scenes != null) { List<Scene> sceneData = scenes.sceneData;
List<Scene> sceneData = scenes.sceneData; assertNotNull(sceneData);
assertNotNull(sceneData); assertEquals(4, sceneData.size());
if (sceneData != null) { Scene scene = sceneData.get(0);
assertEquals(4, sceneData.size()); assertEquals("Door Open", scene.getName());
Scene scene = sceneData.get(0); assertEquals(18097, scene.id);
assertEquals("Door Open", scene.getName());
assertEquals(18097, scene.id);
}
}
} }
/** /**
@ -297,17 +285,13 @@ public class HDPowerViewJUnitTests {
SceneCollections sceneCollections = gson.fromJson(json, SceneCollections.class); SceneCollections sceneCollections = gson.fromJson(json, SceneCollections.class);
assertNotNull(sceneCollections); assertNotNull(sceneCollections);
if (sceneCollections != null) { List<SceneCollection> sceneCollectionData = sceneCollections.sceneCollectionData;
List<SceneCollection> sceneCollectionData = sceneCollections.sceneCollectionData; assertNotNull(sceneCollectionData);
assertNotNull(sceneCollectionData); assertEquals(1, sceneCollectionData.size());
if (sceneCollectionData != null) {
assertEquals(1, sceneCollectionData.size());
SceneCollection sceneCollection = sceneCollectionData.get(0); SceneCollection sceneCollection = sceneCollectionData.get(0);
assertEquals("Børn op", sceneCollection.getName()); assertEquals("Børn op", sceneCollection.getName());
assertEquals(27119, sceneCollection.id); assertEquals(27119, sceneCollection.id);
}
}
} }
/** /**
@ -321,79 +305,67 @@ public class HDPowerViewJUnitTests {
Shades shades = gson.fromJson(json, Shades.class); Shades shades = gson.fromJson(json, Shades.class);
assertNotNull(shades); assertNotNull(shades);
if (shades != null) { List<ShadeData> shadesData = shades.shadeData;
List<ShadeData> shadesData = shades.shadeData; assertNotNull(shadesData);
assertNotNull(shadesData);
if (shadesData != null) { assertEquals(1, shadesData.size());
assertEquals(1, shadesData.size()); ShadeData shadeData = shadesData.get(0);
ShadeData shadeData = shadesData.get(0); assertNotNull(shadeData);
assertNotNull(shadeData);
assertEquals("Gardin 1", shadeData.getName()); assertEquals("Gardin 1", shadeData.getName());
assertEquals(63778, shadeData.id); assertEquals(63778, shadeData.id);
ShadePosition shadePos = shadeData.positions; ShadePosition shadePos = shadeData.positions;
assertNotNull(shadePos); assertNotNull(shadePos);
if (shadePos != null) { Integer capabilitiesValue = shadeData.capabilities;
Integer capabilitiesValue = shadeData.capabilities; assertNotNull(capabilitiesValue);
assertNotNull(capabilitiesValue); assertEquals(7, capabilitiesValue.intValue());
if (capabilitiesValue != null) { ShadeCapabilitiesDatabase db = new ShadeCapabilitiesDatabase();
assertEquals(7, capabilitiesValue.intValue()); Capabilities capabilities = db.getCapabilities(capabilitiesValue);
ShadeCapabilitiesDatabase db = new ShadeCapabilitiesDatabase();
Capabilities capabilities = db.getCapabilities(capabilitiesValue);
State pos = shadePos.getState(capabilities, PRIMARY_POSITION); State pos = shadePos.getState(capabilities, PRIMARY_POSITION);
assertEquals(PercentType.class, pos.getClass()); assertEquals(PercentType.class, pos.getClass());
assertEquals(59, ((PercentType) pos).intValue()); assertEquals(59, ((PercentType) pos).intValue());
pos = shadePos.getState(capabilities, SECONDARY_POSITION); pos = shadePos.getState(capabilities, SECONDARY_POSITION);
assertEquals(PercentType.class, pos.getClass()); assertEquals(PercentType.class, pos.getClass());
assertEquals(35, ((PercentType) pos).intValue()); assertEquals(35, ((PercentType) pos).intValue());
pos = shadePos.getState(capabilities, VANE_TILT_POSITION); pos = shadePos.getState(capabilities, VANE_TILT_POSITION);
assertEquals(UnDefType.class, pos.getClass()); assertEquals(UnDefType.class, pos.getClass());
assertEquals(3, shadeData.batteryStatus); assertEquals(3, shadeData.batteryStatus);
assertEquals(4, shadeData.signalStrength); assertEquals(4, shadeData.signalStrength);
assertEquals(8, shadeData.type); assertEquals(8, shadeData.type);
assertTrue(db.isTypeInDatabase(shadeData.type)); assertTrue(db.isTypeInDatabase(shadeData.type));
assertTrue(db.isCapabilitiesInDatabase(capabilitiesValue.intValue())); assertTrue(db.isCapabilitiesInDatabase(capabilitiesValue.intValue()));
assertEquals(db.getType(shadeData.type).getCapabilities(), capabilitiesValue.intValue()); assertEquals(db.getType(shadeData.type).getCapabilities(), capabilitiesValue.intValue());
assertTrue(db.getCapabilities(capabilitiesValue.intValue()).supportsSecondary()); assertTrue(db.getCapabilities(capabilitiesValue.intValue()).supportsSecondary());
assertNotEquals(db.getType(shadeData.type).getCapabilities(), capabilitiesValue.intValue() + 1); assertNotEquals(db.getType(shadeData.type).getCapabilities(), capabilitiesValue.intValue() + 1);
// ==== when changing position1, position2 value is not changed (vice-versa) ==== // ==== when changing position1, position2 value is not changed (vice-versa) ====
ShadePosition shadePosition = shadeData.positions; ShadePosition shadePosition = shadeData.positions;
assertNotNull(shadePosition); assertNotNull(shadePosition);
if (shadePosition != null) { // ==== position2 ====
// ==== position2 ==== State position2Old = shadePosition.getState(capabilities, SECONDARY_POSITION);
State position2Old = shadePosition.getState(capabilities, SECONDARY_POSITION); shadePosition.setPosition(capabilities, PRIMARY_POSITION, 99);
shadePosition.setPosition(capabilities, PRIMARY_POSITION, 99); State position2New = shadePosition.getState(capabilities, SECONDARY_POSITION);
State position2New = shadePosition.getState(capabilities, SECONDARY_POSITION); assertEquals(PercentType.class, position2Old.getClass());
assertEquals(PercentType.class, position2Old.getClass()); assertEquals(PercentType.class, position2New.getClass());
assertEquals(PercentType.class, position2New.getClass()); assertEquals(((PercentType) position2Old).intValue(), ((PercentType) position2New).intValue());
assertEquals(((PercentType) position2Old).intValue(),
((PercentType) position2New).intValue());
// ==== position2 ==== // ==== position2 ====
State position1Old = shadePosition.getState(capabilities, PRIMARY_POSITION); State position1Old = shadePosition.getState(capabilities, PRIMARY_POSITION);
shadePosition.setPosition(capabilities, SECONDARY_POSITION, 99); shadePosition.setPosition(capabilities, SECONDARY_POSITION, 99);
State position1New = shadePosition.getState(capabilities, PRIMARY_POSITION); State position1New = shadePosition.getState(capabilities, PRIMARY_POSITION);
assertEquals(PercentType.class, position1Old.getClass()); assertEquals(PercentType.class, position1Old.getClass());
assertEquals(PercentType.class, position1New.getClass()); assertEquals(PercentType.class, position1New.getClass());
assertEquals(((PercentType) position1Old).intValue(), assertEquals(((PercentType) position1Old).intValue(), ((PercentType) position1New).intValue());
((PercentType) position1New).intValue());
}
}
}
}
}
} }
} }