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

Use renamed Units class (#9267)

Browse Source 
Signed-off-by: Wouter Born <github@maindrain.net>
This commit is contained in:
Wouter Born
2020-12-07 10:34:02 +01:00
committed by GitHub
parent d0480d0f2e
commit ac6f08908f
208 changed files with 1087 additions and 1169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/test/cases/AstroParametrizedTestCases.java
View File

@@ -20,7 +20,7 @@ import java.util.List;
import org.openhab.binding.astro.test.AstroStateTest;
import org.openhab.core.library.types.DateTimeType;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.unit.SmartHomeUnits;
import org.openhab.core.library.unit.Units;
/**
* Test cases used in the {@link AstroStateTest}
@@ -53,7 +53,7 @@ public final class AstroParametrizedTestCases {
cases[2][0] = TEST_SUN_THING_ID;
cases[2][1] = "rise#duration";
cases[2][2] = new QuantityType<>(2, SmartHomeUnits.MINUTE);
cases[2][2] = new QuantityType<>(2, Units.MINUTE);
cases[3][0] = TEST_SUN_THING_ID;
cases[3][1] = "set#start";
@@ -65,7 +65,7 @@ public final class AstroParametrizedTestCases {
cases[5][0] = TEST_SUN_THING_ID;
cases[5][1] = "set#duration";
cases[5][2] = new QuantityType<>(2, SmartHomeUnits.MINUTE);
cases[5][2] = new QuantityType<>(2, Units.MINUTE);
cases[6][0] = TEST_SUN_THING_ID;
cases[6][1] = "noon#start";
@@ -77,7 +77,7 @@ public final class AstroParametrizedTestCases {
cases[8][0] = TEST_SUN_THING_ID;
cases[8][1] = "noon#duration";
cases[8][2] = new QuantityType<>(1, SmartHomeUnits.MINUTE);
cases[8][2] = new QuantityType<>(1, Units.MINUTE);
cases[9][0] = TEST_SUN_THING_ID;
cases[9][1] = "night#start";
@@ -89,7 +89,7 @@ public final class AstroParametrizedTestCases {
cases[11][0] = TEST_SUN_THING_ID;
cases[11][1] = "night#duration";
cases[11][2] = new QuantityType<>(589, SmartHomeUnits.MINUTE);
cases[11][2] = new QuantityType<>(589, Units.MINUTE);
cases[12][0] = TEST_SUN_THING_ID;
cases[12][1] = "morningNight#start";
@@ -101,7 +101,7 @@ public final class AstroParametrizedTestCases {
cases[14][0] = TEST_SUN_THING_ID;
cases[14][1] = "morningNight#duration";
cases[14][2] = new QuantityType<>(272, SmartHomeUnits.MINUTE);
cases[14][2] = new QuantityType<>(272, Units.MINUTE);
cases[15][0] = TEST_SUN_THING_ID;
cases[15][1] = "astroDawn#start";
@@ -113,7 +113,7 @@ public final class AstroParametrizedTestCases {
cases[17][0] = TEST_SUN_THING_ID;
cases[17][1] = "astroDawn#duration";
cases[17][2] = new QuantityType<>(26, SmartHomeUnits.MINUTE);
cases[17][2] = new QuantityType<>(26, Units.MINUTE);
cases[18][0] = TEST_SUN_THING_ID;
cases[18][1] = "nauticDawn#start";
@@ -125,7 +125,7 @@ public final class AstroParametrizedTestCases {
cases[20][0] = TEST_SUN_THING_ID;
cases[20][1] = "nauticDawn#duration";
cases[20][2] = new QuantityType<>(26, SmartHomeUnits.MINUTE);
cases[20][2] = new QuantityType<>(26, Units.MINUTE);
cases[21][0] = TEST_SUN_THING_ID;
cases[21][1] = "civilDawn#start";
@@ -137,7 +137,7 @@ public final class AstroParametrizedTestCases {
cases[23][0] = TEST_SUN_THING_ID;
cases[23][1] = "civilDawn#duration";
cases[23][2] = new QuantityType<>(22, SmartHomeUnits.MINUTE);
cases[23][2] = new QuantityType<>(22, Units.MINUTE);
cases[24][0] = TEST_SUN_THING_ID;
cases[24][1] = "astroDusk#start";
@@ -149,7 +149,7 @@ public final class AstroParametrizedTestCases {
cases[26][0] = TEST_SUN_THING_ID;
cases[26][1] = "astroDusk#duration";
cases[26][2] = new QuantityType<>(26, SmartHomeUnits.MINUTE);
cases[26][2] = new QuantityType<>(26, Units.MINUTE);
cases[27][0] = TEST_SUN_THING_ID;
cases[27][1] = "nauticDusk#start";
@@ -161,7 +161,7 @@ public final class AstroParametrizedTestCases {
cases[29][0] = TEST_SUN_THING_ID;
cases[29][1] = "nauticDusk#duration";
cases[29][2] = new QuantityType<>(26, SmartHomeUnits.MINUTE);
cases[29][2] = new QuantityType<>(26, Units.MINUTE);
cases[30][0] = TEST_SUN_THING_ID;
cases[30][1] = "civilDusk#start";
@@ -173,7 +173,7 @@ public final class AstroParametrizedTestCases {
cases[32][0] = TEST_SUN_THING_ID;
cases[32][1] = "civilDusk#duration";
cases[32][2] = new QuantityType<>(23, SmartHomeUnits.MINUTE);
cases[32][2] = new QuantityType<>(23, Units.MINUTE);
cases[33][0] = TEST_SUN_THING_ID;
cases[33][1] = "eveningNight#start";
@@ -185,7 +185,7 @@ public final class AstroParametrizedTestCases {
cases[35][0] = TEST_SUN_THING_ID;
cases[35][1] = "eveningNight#duration";
cases[35][2] = new QuantityType<>(318, SmartHomeUnits.MINUTE);
cases[35][2] = new QuantityType<>(318, Units.MINUTE);
cases[36][0] = TEST_SUN_THING_ID;
cases[36][1] = "daylight#start";
@@ -197,7 +197,7 @@ public final class AstroParametrizedTestCases {
cases[38][0] = TEST_SUN_THING_ID;
cases[38][1] = "daylight#duration";
cases[38][2] = new QuantityType<>(697, SmartHomeUnits.MINUTE);
cases[38][2] = new QuantityType<>(697, Units.MINUTE);
cases[39][0] = TEST_MOON_THING_ID;
cases[39][1] = "rise#start";
@@ -209,7 +209,7 @@ public final class AstroParametrizedTestCases {
cases[41][0] = TEST_MOON_THING_ID;
cases[41][1] = "rise#duration";
cases[41][2] = new QuantityType<>(0, SmartHomeUnits.MINUTE);
cases[41][2] = new QuantityType<>(0, Units.MINUTE);
}
public List<Object[]> getCases() {

16
itests/org.openhab.binding.nest.tests/src/main/java/org/openhab/binding/nest/handler/NestThermostatHandlerTest.java
View File

@@ -30,7 +30,7 @@ import org.openhab.binding.nest.internal.handler.NestThermostatHandler;
import org.openhab.core.config.core.Configuration;
import org.openhab.core.library.types.QuantityType;
import org.openhab.core.library.types.StringType;
import org.openhab.core.library.unit.SmartHomeUnits;
import org.openhab.core.library.unit.Units;
import org.openhab.core.thing.Bridge;
import org.openhab.core.thing.Thing;
import org.openhab.core.thing.ThingStatus;
@@ -76,11 +76,11 @@ public class NestThermostatHandlerTest extends NestThingHandlerOSGiTest {
assertThatItemHasState(CHANNEL_ECO_MAX_SET_POINT, new QuantityType<>(24, CELSIUS));
assertThatItemHasState(CHANNEL_ECO_MIN_SET_POINT, new QuantityType<>(12.5, CELSIUS));
assertThatItemHasState(CHANNEL_FAN_TIMER_ACTIVE, OFF);
assertThatItemHasState(CHANNEL_FAN_TIMER_DURATION, new QuantityType<>(15, SmartHomeUnits.MINUTE));
assertThatItemHasState(CHANNEL_FAN_TIMER_DURATION, new QuantityType<>(15, Units.MINUTE));
assertThatItemHasState(CHANNEL_FAN_TIMER_TIMEOUT, parseDateTimeType("1970-01-01T00:00:00.000Z"));
assertThatItemHasState(CHANNEL_HAS_FAN, ON);
assertThatItemHasState(CHANNEL_HAS_LEAF, ON);
assertThatItemHasState(CHANNEL_HUMIDITY, new QuantityType<>(25, SmartHomeUnits.PERCENT));
assertThatItemHasState(CHANNEL_HUMIDITY, new QuantityType<>(25, Units.PERCENT));
assertThatItemHasState(CHANNEL_LAST_CONNECTION, parseDateTimeType("2017-02-02T21:00:06.000Z"));
assertThatItemHasState(CHANNEL_LOCKED, OFF);
assertThatItemHasState(CHANNEL_LOCKED_MAX_SET_POINT, new QuantityType<>(22, CELSIUS));
@@ -94,7 +94,7 @@ public class NestThermostatHandlerTest extends NestThingHandlerOSGiTest {
assertThatItemHasState(CHANNEL_SUNLIGHT_CORRECTION_ACTIVE, OFF);
assertThatItemHasState(CHANNEL_SUNLIGHT_CORRECTION_ENABLED, ON);
assertThatItemHasState(CHANNEL_TEMPERATURE, new QuantityType<>(19, CELSIUS));
assertThatItemHasState(CHANNEL_TIME_TO_TARGET, new QuantityType<>(0, SmartHomeUnits.MINUTE));
assertThatItemHasState(CHANNEL_TIME_TO_TARGET, new QuantityType<>(0, Units.MINUTE));
assertThatItemHasState(CHANNEL_USING_EMERGENCY_HEAT, OFF);
assertThatAllItemStatesAreNotNull();
@@ -114,11 +114,11 @@ public class NestThermostatHandlerTest extends NestThingHandlerOSGiTest {
assertThatItemHasState(CHANNEL_ECO_MAX_SET_POINT, new QuantityType<>(76, FAHRENHEIT));
assertThatItemHasState(CHANNEL_ECO_MIN_SET_POINT, new QuantityType<>(55, FAHRENHEIT));
assertThatItemHasState(CHANNEL_FAN_TIMER_ACTIVE, OFF);
assertThatItemHasState(CHANNEL_FAN_TIMER_DURATION, new QuantityType<>(15, SmartHomeUnits.MINUTE));
assertThatItemHasState(CHANNEL_FAN_TIMER_DURATION, new QuantityType<>(15, Units.MINUTE));
assertThatItemHasState(CHANNEL_FAN_TIMER_TIMEOUT, parseDateTimeType("1970-01-01T00:00:00.000Z"));
assertThatItemHasState(CHANNEL_HAS_FAN, ON);
assertThatItemHasState(CHANNEL_HAS_LEAF, ON);
assertThatItemHasState(CHANNEL_HUMIDITY, new QuantityType<>(25, SmartHomeUnits.PERCENT));
assertThatItemHasState(CHANNEL_HUMIDITY, new QuantityType<>(25, Units.PERCENT));
assertThatItemHasState(CHANNEL_LAST_CONNECTION, parseDateTimeType("2017-02-02T21:00:06.000Z"));
assertThatItemHasState(CHANNEL_LOCKED, OFF);
assertThatItemHasState(CHANNEL_LOCKED_MAX_SET_POINT, new QuantityType<>(72, FAHRENHEIT));
@@ -132,7 +132,7 @@ public class NestThermostatHandlerTest extends NestThingHandlerOSGiTest {
assertThatItemHasState(CHANNEL_SUNLIGHT_CORRECTION_ACTIVE, OFF);
assertThatItemHasState(CHANNEL_SUNLIGHT_CORRECTION_ENABLED, ON);
assertThatItemHasState(CHANNEL_TEMPERATURE, new QuantityType<>(66, FAHRENHEIT));
assertThatItemHasState(CHANNEL_TIME_TO_TARGET, new QuantityType<>(0, SmartHomeUnits.MINUTE));
assertThatItemHasState(CHANNEL_TIME_TO_TARGET, new QuantityType<>(0, Units.MINUTE));
assertThatItemHasState(CHANNEL_USING_EMERGENCY_HEAT, OFF);
assertThatAllItemStatesAreNotNull();
@@ -194,7 +194,7 @@ public class NestThermostatHandlerTest extends NestThingHandlerOSGiTest {
public void handleFanTimerDurationCommands() throws IOException {
int[] durations = { 15, 30, 45, 60, 120, 240, 480, 960, 15 };
for (int duration : durations) {
handleCommand(CHANNEL_FAN_TIMER_DURATION, new QuantityType<>(duration, SmartHomeUnits.MINUTE));
handleCommand(CHANNEL_FAN_TIMER_DURATION, new QuantityType<>(duration, Units.MINUTE));
assertNestApiPropertyState(THERMOSTAT1_DEVICE_ID, "fan_timer_duration", String.valueOf(duration));
}
}