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

Replace unit placeholder in patterns if updated by DecimalType states (#1404) 

* Replace unit placeholder in patterns if updated by DecimalType states

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
pull/1409/head
Christoph Weitkamp 2020-04-05 17:52:30 +02:00 committed by GitHub
parent 1f825fc529
commit 86dc92b6c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bundles/org.openhab.core.ui/src/main/java/org/openhab/core/ui/internal/items/ItemUIRegistryImpl.java
View File

@ -357,9 +357,9 @@ public class ItemUIRegistryImpl implements ItemUIRegistry {
state = item.getStateAs(DecimalType.class);
}
// for fraction digits in state we dont want to risk format exceptions,
// for fraction digits in state we don't want to risk format exceptions,
// so treat everything as floats:
formatPattern = formatPattern.replaceAll("\\%d", "%.0f");
formatPattern = formatPattern.replaceAll("%d", "%.0f");
}
}
} catch (ItemNotFoundException e) {
@ -396,7 +396,13 @@ public class ItemUIRegistryImpl implements ItemUIRegistry {
}
}
if (state instanceof QuantityType) {
if (state instanceof DecimalType) {
// for DecimalTypes we don't want to risk format exceptions, if pattern contains unit
// placeholder
if (formatPattern.contains(UnitUtils.UNIT_PLACEHOLDER)) {
formatPattern = formatPattern.replaceAll(UnitUtils.UNIT_PLACEHOLDER, "").stripTrailing();
}
} else if (state instanceof QuantityType) {
QuantityType<?> quantityState = (QuantityType<?>) state;
// sanity convert current state to the item state description unit in case it was updated in the
// meantime. The item state is still in the "original" unit while the state description will

60
bundles/org.openhab.core.ui/src/test/java/org/openhab/core/ui/internal/items/ItemUIRegistryImplTest.java
View File

@ -47,6 +47,7 @@ import org.openhab.core.model.sitemap.sitemap.Switch;
import org.openhab.core.model.sitemap.sitemap.Widget;
import org.openhab.core.types.State;
import org.openhab.core.types.StateDescription;
import org.openhab.core.types.StateDescriptionFragmentBuilder;
import org.openhab.core.types.StateOption;
import org.openhab.core.types.UnDefType;
import org.openhab.core.types.util.UnitUtils;
@ -125,6 +126,32 @@ public class ItemUIRegistryImplTest {
assertEquals("Label [foo(x):y]", label);
}
@Test
public void getLabelLabelWithoutPatterAndIntegerValue() {
String testLabel = "Label";
when(widget.getLabel()).thenReturn(testLabel);
when(item.getState()).thenReturn(new DecimalType(20));
when(item.getStateAs(DecimalType.class)).thenReturn(new DecimalType(20));
when(item.getStateDescription())
.thenReturn(StateDescriptionFragmentBuilder.create().withPattern("%d").build().toStateDescription());
String label = uiRegistry.getLabel(widget);
assertEquals("Label [20]", label);
}
@Test
public void getLabelLabelWithoutPatterAndFractionalDigitsValue() {
String testLabel = "Label";
when(widget.getLabel()).thenReturn(testLabel);
when(item.getState()).thenReturn(new DecimalType(20.5));
when(item.getStateAs(DecimalType.class)).thenReturn(new DecimalType(20.5));
when(item.getStateDescription())
.thenReturn(StateDescriptionFragmentBuilder.create().withPattern("%d").build().toStateDescription());
String label = uiRegistry.getLabel(widget);
assertEquals("Label [21]", label);
}
@Test
public void getLabelLabelWithIntegerValue() {
String testLabel = "Label [%d]";
@ -136,6 +163,17 @@ public class ItemUIRegistryImplTest {
assertEquals("Label [20]", label);
}
@Test
public void getLabelLabelWithFractionalDigitsValue() {
String testLabel = "Label [%d]";
when(widget.getLabel()).thenReturn(testLabel);
when(item.getState()).thenReturn(new DecimalType(20.5));
when(item.getStateAs(DecimalType.class)).thenReturn(new DecimalType(20.5));
String label = uiRegistry.getLabel(widget);
assertEquals("Label [21]", label);
}
@Test
public void getLabelLabelWithIntegerValueAndWidth() {
String testLabel = "Label [%3d]";
@ -170,7 +208,7 @@ public class ItemUIRegistryImplTest {
}
@Test
public void getLabelLabelWithDecimalValueAndUnit() {
public void getLabelLabelWithDecimalValueAndUnitUpdatedWithQuantityType() {
String testLabel = "Label [%.3f " + UnitUtils.UNIT_PLACEHOLDER + "]";
when(widget.getLabel()).thenReturn(testLabel);
@ -179,6 +217,16 @@ public class ItemUIRegistryImplTest {
assertEquals("Label [3" + SEP + "333 °C]", label);
}
@Test
public void getLabelLabelWithDecimalValueAndUnitUpdatedWithDecimalType() {
String testLabel = "Label [%.3f " + UnitUtils.UNIT_PLACEHOLDER + "]";
when(widget.getLabel()).thenReturn(testLabel);
when(item.getState()).thenReturn(new DecimalType(10f / 3f));
String label = uiRegistry.getLabel(widget);
assertEquals("Label [3" + SEP + "333]", label);
}
@Test
public void getLabelLabelWithDecimalValueAndUnit2() {
String testLabel = "Label [%.0f " + UnitUtils.UNIT_PLACEHOLDER + "]";
@ -219,6 +267,16 @@ public class ItemUIRegistryImplTest {
assertEquals("Label [33 %]", label);
}
@Test
public void getLabelLabelWithFractionalDigitsValueAndUnit5() {
String testLabel = "Label [%d " + UnitUtils.UNIT_PLACEHOLDER + "]";
when(widget.getLabel()).thenReturn(testLabel);
when(item.getState()).thenReturn(new QuantityType<>("" + 10f / 3f + " %"));
String label = uiRegistry.getLabel(widget);
assertEquals("Label [3 %]", label);
}
@Test
public void getLabelLabelWithDecimalValueAndUnit6() {
String testLabel = "Label [%.0f " + UnitUtils.UNIT_PLACEHOLDER + "]";