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

Use core unit classes (#9261)

Browse Source 
Add-ons should not depend on tec.uom.se classes but use core unit classes instead so they are less impacted when this library is replaced or upgraded.

Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-12-06 19:57:26 +01:00
committed by GitHub
parent 4fafb06251
commit ac18da7fc3
14 changed files with 46 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bundles/org.openhab.binding.siemensrds/src/test/java/org/openhab/binding/siemensrds/test/RdsTestData.java
View File

@@ -36,10 +36,9 @@ import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.types.StringType;
import org.openhab.core.library.unit.ImperialUnits;
import org.openhab.core.library.unit.SIUnits;
import org.openhab.core.library.unit.SmartHomeUnits;
import org.openhab.core.types.State;
import tec.uom.se.unit.Units;
/**
* test suite
*
@@ -295,13 +294,13 @@ public class RdsTestData {
state = dataPoints.getPointByClass("'SpTRShft").getState();
assertTrue(state instanceof QuantityType<?>);
QuantityType<?> kelvin = ((QuantityType<?>) state).toUnit(Units.KELVIN);
QuantityType<?> kelvin = ((QuantityType<?>) state).toUnit(SmartHomeUnits.KELVIN);
assertNotNull(kelvin);
assertEquals(0, kelvin.floatValue(), 0.01);
state = dataPoints.getPointByClass("'RHuRel").getState();
assertTrue(state instanceof QuantityType<?>);
QuantityType<?> relativeHumidity = ((QuantityType<?>) state).toUnit(Units.PERCENT);
QuantityType<?> relativeHumidity = ((QuantityType<?>) state).toUnit(SmartHomeUnits.PERCENT);
assertNotNull(relativeHumidity);
assertEquals(46.86865, relativeHumidity.floatValue(), 0.1);
@@ -321,7 +320,7 @@ public class RdsTestData {
state = dataPoints.getPointByClass("'TRBltnMsvAdj").getState();
assertTrue(state instanceof QuantityType<?>);
kelvin = ((QuantityType<?>) state).toUnit(Units.KELVIN);
kelvin = ((QuantityType<?>) state).toUnit(SmartHomeUnits.KELVIN);
assertNotNull(kelvin);
assertEquals(35.0, celsius.floatValue(), 0.01);
@@ -377,7 +376,7 @@ public class RdsTestData {
@Nullable
String x = entry.getKey();
assertNotNull(x);
String y = ((BasePoint) point).getPointClass();
String y = point.getPointClass();
String z = dataPoints.pointClassToId(y);
assertEquals(x, z);
}
@@ -469,21 +468,21 @@ public class RdsTestData {
// test temperature units code (C)
BasePoint tempPoint = dataPoints.getPointByClass("'SpTR");
assertTrue(tempPoint instanceof BasePoint);
assertEquals(SIUnits.CELSIUS, ((BasePoint) tempPoint).getUnit());
assertEquals(SIUnits.CELSIUS, tempPoint.getUnit());
// test temperature units code (F)
tempPoint = dataPoints.getPointByClass("'SpHPcf");
assertTrue(tempPoint instanceof BasePoint);
assertEquals(ImperialUnits.FAHRENHEIT, ((BasePoint) tempPoint).getUnit());
assertEquals(ImperialUnits.FAHRENHEIT, tempPoint.getUnit());
// test temperature units code (K)
tempPoint = dataPoints.getPointByClass("'SpHPcf");
assertTrue(tempPoint instanceof BasePoint);
assertEquals(ImperialUnits.FAHRENHEIT, ((BasePoint) tempPoint).getUnit());
assertEquals(ImperialUnits.FAHRENHEIT, tempPoint.getUnit());
tempPoint = dataPoints.getPointByClass("'SpTRShft");
assertTrue(tempPoint instanceof BasePoint);
assertEquals(Units.KELVIN, ((BasePoint) tempPoint).getUnit());
assertEquals(SmartHomeUnits.KELVIN, tempPoint.getUnit());
} catch (RdsCloudException e) {
fail(e.getMessage());
}
@@ -503,13 +502,13 @@ public class RdsTestData {
PlantInfo plant;
plant = plantList.get(0);
assertTrue(plant instanceof PlantInfo);
assertEquals("Pd1774247-7de7-4896-ac76-b7e0dd943c40", ((PlantInfo) plant).getId());
assertEquals("Pd1774247-7de7-4896-ac76-b7e0dd943c40", plant.getId());
assertTrue(plant.isOnline());
plant = plantList.get(1);
assertTrue(plant instanceof PlantInfo);
assertEquals("Pfaf770c8-abeb-4742-ad65-ead39030d369", ((PlantInfo) plant).getId());
assertTrue(((PlantInfo) plant).isOnline());
assertEquals("Pfaf770c8-abeb-4742-ad65-ead39030d369", plant.getId());
assertTrue(plant.isOnline());
} catch (RdsCloudException e) {
fail(e.getMessage());
}