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.ThingUID;
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}.
@ -54,6 +58,8 @@ public class AutomationChannelBuilderTest {
@BeforeEach
private void setUp() {
final Logger logger = (Logger) LoggerFactory.getLogger(AutomationChannelBuilder.class);
logger.setLevel(Level.OFF);
builder = AutomationChannelBuilder.create(translationProvider, CHANNEL_GROUP_UID);
Scene scene = new Scene();

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

@ -121,7 +121,6 @@ public class HDPowerViewJUnitTests {
List<ShadeData> shadesData = shadesX.shadeData;
assertNotNull(shadesData);
if (shadesData != null) {
assertTrue(!shadesData.isEmpty());
ShadeData shadeData;
shadeData = shadesData.get(0);
@ -138,7 +137,6 @@ public class HDPowerViewJUnitTests {
String shadeName = shadexData.getName();
assertNotNull(shadeName);
}
}
} catch (HubException e) {
fail(e.getMessage());
}
@ -152,7 +150,6 @@ public class HDPowerViewJUnitTests {
List<Scene> scenesData = scenes.sceneData;
assertNotNull(scenesData);
if (scenesData != null) {
assertTrue(!scenesData.isEmpty());
Scene sceneZero = scenesData.get(0);
assertNotNull(sceneZero);
@ -163,7 +160,6 @@ public class HDPowerViewJUnitTests {
String sceneName = scene.getName();
assertNotNull(sceneName);
}
}
} catch (HubException e) {
fail(e.getMessage());
}
@ -187,7 +183,6 @@ public class HDPowerViewJUnitTests {
Integer capabilitiesValue = shadeData.capabilities;
assertNotNull(capabilitiesValue);
if (positions != null && capabilitiesValue != null) {
Capabilities capabilities = new ShadeCapabilitiesDatabase()
.getCapabilities(capabilitiesValue.intValue());
@ -207,13 +202,10 @@ public class HDPowerViewJUnitTests {
ShadeData newData = webTargets.getShade(shadeId);
ShadePosition actualPosition = newData.positions;
assertNotNull(actualPosition);
if (actualPosition != null) {
assertEquals(targetPosition.getState(capabilities, PRIMARY_POSITION),
actualPosition.getState(capabilities, PRIMARY_POSITION));
}
}
}
}
} catch (HubException e) {
fail(e.getMessage());
}
@ -273,17 +265,13 @@ public class HDPowerViewJUnitTests {
Scenes scenes = gson.fromJson(json, Scenes.class);
assertNotNull(scenes);
if (scenes != null) {
List<Scene> sceneData = scenes.sceneData;
assertNotNull(sceneData);
if (sceneData != null) {
assertEquals(4, sceneData.size());
Scene scene = sceneData.get(0);
assertEquals("Door Open", scene.getName());
assertEquals(18097, scene.id);
}
}
}
/**
* Test generic JSON scene collection response.
@ -297,18 +285,14 @@ public class HDPowerViewJUnitTests {
SceneCollections sceneCollections = gson.fromJson(json, SceneCollections.class);
assertNotNull(sceneCollections);
if (sceneCollections != null) {
List<SceneCollection> sceneCollectionData = sceneCollections.sceneCollectionData;
assertNotNull(sceneCollectionData);
if (sceneCollectionData != null) {
assertEquals(1, sceneCollectionData.size());
SceneCollection sceneCollection = sceneCollectionData.get(0);
assertEquals("Børn op", sceneCollection.getName());
assertEquals(27119, sceneCollection.id);
}
}
}
/**
* Test the JSON parsing for a duette top down bottom up shade.
@ -321,11 +305,9 @@ public class HDPowerViewJUnitTests {
Shades shades = gson.fromJson(json, Shades.class);
assertNotNull(shades);
if (shades != null) {
List<ShadeData> shadesData = shades.shadeData;
assertNotNull(shadesData);
if (shadesData != null) {
assertEquals(1, shadesData.size());
ShadeData shadeData = shadesData.get(0);
assertNotNull(shadeData);
@ -336,10 +318,8 @@ public class HDPowerViewJUnitTests {
ShadePosition shadePos = shadeData.positions;
assertNotNull(shadePos);
if (shadePos != null) {
Integer capabilitiesValue = shadeData.capabilities;
assertNotNull(capabilitiesValue);
if (capabilitiesValue != null) {
assertEquals(7, capabilitiesValue.intValue());
ShadeCapabilitiesDatabase db = new ShadeCapabilitiesDatabase();
Capabilities capabilities = db.getCapabilities(capabilitiesValue);
@ -372,15 +352,13 @@ public class HDPowerViewJUnitTests {
// ==== when changing position1, position2 value is not changed (vice-versa) ====
ShadePosition shadePosition = shadeData.positions;
assertNotNull(shadePosition);
if (shadePosition != null) {
// ==== position2 ====
State position2Old = shadePosition.getState(capabilities, SECONDARY_POSITION);
shadePosition.setPosition(capabilities, PRIMARY_POSITION, 99);
State position2New = shadePosition.getState(capabilities, SECONDARY_POSITION);
assertEquals(PercentType.class, position2Old.getClass());
assertEquals(PercentType.class, position2New.getClass());
assertEquals(((PercentType) position2Old).intValue(),
((PercentType) position2New).intValue());
assertEquals(((PercentType) position2Old).intValue(), ((PercentType) position2New).intValue());
// ==== position2 ====
State position1Old = shadePosition.getState(capabilities, PRIMARY_POSITION);
@ -388,12 +366,6 @@ public class HDPowerViewJUnitTests {
State position1New = shadePosition.getState(capabilities, PRIMARY_POSITION);
assertEquals(PercentType.class, position1Old.getClass());
assertEquals(PercentType.class, position1New.getClass());
assertEquals(((PercentType) position1Old).intValue(),
((PercentType) position1New).intValue());
}
}
}
}
}
assertEquals(((PercentType) position1Old).intValue(), ((PercentType) position1New).intValue());
}
}