Skip to content
This repository has been archived by the owner on May 7, 2020. It is now read-only.

BasicUI: Treat Switch on NumberItem not as ON/OFF Switch #3493

Merged
merged 4 commits into from
May 22, 2017
Merged

BasicUI: Treat Switch on NumberItem not as ON/OFF Switch #3493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc04127
BasicUI: Treat Switch on NumberItem not as ON/OFF Switch
triller-telekom May 19, 2017
a5e1b0a
Only convert state of plain switches without mappings
triller-telekom May 19, 2017
beb8f0d
Fix exception in test due to new check in implementation
triller-telekom May 22, 2017
9c96499
Test for state conversion on switch with mapping
triller-telekom May 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions ...ui.test/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import java.text.DecimalFormatSymbols;

import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.smarthome.core.items.Item;
import org.eclipse.smarthome.core.items.ItemNotFoundException;
import org.eclipse.smarthome.core.items.ItemRegistry;
Expand All @@ -26,6 +27,7 @@
import org.eclipse.smarthome.core.types.State;
import org.eclipse.smarthome.core.types.StateDescription;
import org.eclipse.smarthome.core.types.UnDefType;
import org.eclipse.smarthome.model.sitemap.Mapping;
import org.eclipse.smarthome.model.sitemap.Sitemap;
import org.eclipse.smarthome.model.sitemap.SitemapFactory;
import org.eclipse.smarthome.model.sitemap.Slider;
Expand Down Expand Up @@ -328,12 +330,36 @@ public void testStateConversionForSwitchWidgetThroughGetState() throws ItemNotFo

Switch switchWidget = mock(Switch.class);
when(switchWidget.getItem()).thenReturn("myItem");
when(switchWidget.getMappings()).thenReturn(new BasicEList<Mapping>());

State stateForSwitch = uiRegistry.getState(switchWidget);

assertEquals(OnOffType.ON, stateForSwitch);
}

@Test
public void testStateConversionForSwitchWidgetWithMappingThroughGetState() throws ItemNotFoundException {
State colorState = new HSBType("23,42,50");

ColorItem colorItem = new ColorItem("myItem");
colorItem.setLabel("myItem");
colorItem.setState(colorState);

when(registry.getItem("myItem")).thenReturn(colorItem);

Switch switchWidget = mock(Switch.class);
when(switchWidget.getItem()).thenReturn("myItem");

Mapping mapping = mock(Mapping.class);
BasicEList<Mapping> mappings = new BasicEList<Mapping>();
mappings.add(mapping);
when(switchWidget.getMappings()).thenReturn(mappings);

State stateForSwitch = uiRegistry.getState(switchWidget);

assertEquals(colorState, stateForSwitch);
}

@Test
public void testStateConversionForSliderWidgetThroughGetState() throws ItemNotFoundException {
State colorState = new HSBType("23,42,75");
Expand Down
5 changes: 4 additions & 1 deletion ...marthome.ui/src/main/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,10 @@ private State convertState(Widget w, Item i) {
if (w instanceof Slider || (w instanceof Switch && i instanceof RollershutterItem)) {
returnState = i.getStateAs(PercentType.class);
} else if (w instanceof Switch) {
returnState = i.getStateAs(OnOffType.class);
Switch sw = (Switch) w;
if (sw.getMappings().size() == 0) {
returnState = i.getStateAs(OnOffType.class);
}
}

// if returnState is null, a conversion was not possible
Expand Down