Rename input_slider to input_number and add numeric text box option (#9494)
* * Rename input_slider to input_number * Update input_number to optionally display slider, input box, or both * input_number support either input box or slider mode, but not both * input_number : change service from select_value to set_value * input_number : add test for mode setting to tests
This commit is contained in:
1 parent
29e973d060
commit
3c0d02f057
6 files changed
+101
-58
No files matched your search
@@ -409,8 +409,8 @@ class TestTemplateCover(unittest.TestCase):
|
||||
def test_set_position(self):
|
||||
"""Test the set_position command."""
|
||||
with assert_setup_component(1, 'cover'):
|
||||
assert setup.setup_component(self.hass, 'input_slider', {
|
||||
'input_slider': {
|
||||
assert setup.setup_component(self.hass, 'input_number', {
|
||||
'input_number': {
|
||||
'test': {
|
||||
'min': '0',
|
||||
'max': '100',
|
||||
@@ -424,10 +424,10 @@ class TestTemplateCover(unittest.TestCase):
|
||||
'covers': {
|
||||
'test_template_cover': {
|
||||
'position_template':
|
||||
"{{ states.input_slider.test.state | int }}",
|
||||
"{{ states.input_number.test.state | int }}",
|
||||
'set_cover_position': {
|
||||
'service': 'input_slider.select_value',
|
||||
'entity_id': 'input_slider.test',
|
||||
'service': 'input_number.set_value',
|
||||
'entity_id': 'input_number.test',
|
||||
'data_template': {
|
||||
'value': '{{ position }}'
|
||||
},
|
||||
@@ -440,7 +440,7 @@ class TestTemplateCover(unittest.TestCase):
|
||||
self.hass.start()
|
||||
self.hass.block_till_done()
|
||||
|
||||
state = self.hass.states.set('input_slider.test', 42)
|
||||
state = self.hass.states.set('input_number.test', 42)
|
||||
self.hass.block_till_done()
|
||||
state = self.hass.states.get('cover.test_template_cover')
|
||||
assert state.state == STATE_OPEN
|
||||
|
||||
@@ -5,7 +5,7 @@ import unittest
|
||||
from homeassistant.const import (
|
||||
STATE_OFF, STATE_ON, STATE_UNKNOWN, STATE_PLAYING, STATE_PAUSED)
|
||||
import homeassistant.components.switch as switch
|
||||
import homeassistant.components.input_slider as input_slider
|
||||
import homeassistant.components.input_number as input_number
|
||||
import homeassistant.components.input_select as input_select
|
||||
import homeassistant.components.media_player as media_player
|
||||
import homeassistant.components.media_player.universal as universal
|
||||
@@ -166,7 +166,7 @@ class TestMediaPlayer(unittest.TestCase):
|
||||
self.mock_state_switch_id = switch.ENTITY_ID_FORMAT.format('state')
|
||||
self.hass.states.set(self.mock_state_switch_id, STATE_OFF)
|
||||
|
||||
self.mock_volume_id = input_slider.ENTITY_ID_FORMAT.format(
|
||||
self.mock_volume_id = input_number.ENTITY_ID_FORMAT.format(
|
||||
'volume_level')
|
||||
self.hass.states.set(self.mock_volume_id, 0)
|
||||
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
"""The tests for the Input slider component."""
|
||||
"""The tests for the Input number component."""
|
||||
# pylint: disable=protected-access
|
||||
import asyncio
|
||||
import unittest
|
||||
|
||||
from homeassistant.core import CoreState, State
|
||||
from homeassistant.setup import setup_component, async_setup_component
|
||||
from homeassistant.components.input_slider import (DOMAIN, select_value)
|
||||
from homeassistant.components.input_number import (DOMAIN, set_value)
|
||||
|
||||
from tests.common import get_test_home_assistant, mock_restore_cache
|
||||
|
||||
|
||||
class TestInputSlider(unittest.TestCase):
|
||||
"""Test the input slider component."""
|
||||
class TestInputNumber(unittest.TestCase):
|
||||
"""Test the input number component."""
|
||||
|
||||
# pylint: disable=invalid-name
|
||||
def setUp(self):
|
||||
@@ -38,8 +38,8 @@ class TestInputSlider(unittest.TestCase):
|
||||
self.assertFalse(
|
||||
setup_component(self.hass, DOMAIN, {DOMAIN: cfg}))
|
||||
|
||||
def test_select_value(self):
|
||||
"""Test select_value method."""
|
||||
def test_set_value(self):
|
||||
"""Test set_value method."""
|
||||
self.assertTrue(setup_component(self.hass, DOMAIN, {DOMAIN: {
|
||||
'test_1': {
|
||||
'initial': 50,
|
||||
@@ -47,36 +47,68 @@ class TestInputSlider(unittest.TestCase):
|
||||
'max': 100,
|
||||
},
|
||||
}}))
|
||||
entity_id = 'input_slider.test_1'
|
||||
entity_id = 'input_number.test_1'
|
||||
|
||||
state = self.hass.states.get(entity_id)
|
||||
self.assertEqual(50, float(state.state))
|
||||
|
||||
select_value(self.hass, entity_id, '30.4')
|
||||
set_value(self.hass, entity_id, '30.4')
|
||||
self.hass.block_till_done()
|
||||
|
||||
state = self.hass.states.get(entity_id)
|
||||
self.assertEqual(30.4, float(state.state))
|
||||
|
||||
select_value(self.hass, entity_id, '70')
|
||||
set_value(self.hass, entity_id, '70')
|
||||
self.hass.block_till_done()
|
||||
|
||||
state = self.hass.states.get(entity_id)
|
||||
self.assertEqual(70, float(state.state))
|
||||
|
||||
select_value(self.hass, entity_id, '110')
|
||||
set_value(self.hass, entity_id, '110')
|
||||
self.hass.block_till_done()
|
||||
|
||||
state = self.hass.states.get(entity_id)
|
||||
self.assertEqual(70, float(state.state))
|
||||
|
||||
def test_mode(self):
|
||||
"""Test mode settings."""
|
||||
self.assertTrue(
|
||||
setup_component(self.hass, DOMAIN, {DOMAIN: {
|
||||
'test_default_slider': {
|
||||
'min': 0,
|
||||
'max': 100,
|
||||
},
|
||||
'test_explicit_box': {
|
||||
'min': 0,
|
||||
'max': 100,
|
||||
'mode': 'box',
|
||||
},
|
||||
'test_explicit_slider': {
|
||||
'min': 0,
|
||||
'max': 100,
|
||||
'mode': 'slider',
|
||||
},
|
||||
}}))
|
||||
|
||||
state = self.hass.states.get('input_number.test_default_slider')
|
||||
assert state
|
||||
self.assertEqual('slider', state.attributes['mode'])
|
||||
|
||||
state = self.hass.states.get('input_number.test_explicit_box')
|
||||
assert state
|
||||
self.assertEqual('box', state.attributes['mode'])
|
||||
|
||||
state = self.hass.states.get('input_number.test_explicit_slider')
|
||||
assert state
|
||||
self.assertEqual('slider', state.attributes['mode'])
|
||||
|
||||
|
||||
@asyncio.coroutine
|
||||
def test_restore_state(hass):
|
||||
"""Ensure states are restored on startup."""
|
||||
mock_restore_cache(hass, (
|
||||
State('input_slider.b1', '70'),
|
||||
State('input_slider.b2', '200'),
|
||||
State('input_number.b1', '70'),
|
||||
State('input_number.b2', '200'),
|
||||
))
|
||||
|
||||
hass.state = CoreState.starting
|
||||
@@ -93,11 +125,11 @@ def test_restore_state(hass):
|
||||
},
|
||||
}})
|
||||
|
||||
state = hass.states.get('input_slider.b1')
|
||||
state = hass.states.get('input_number.b1')
|
||||
assert state
|
||||
assert float(state.state) == 70
|
||||
|
||||
state = hass.states.get('input_slider.b2')
|
||||
state = hass.states.get('input_number.b2')
|
||||
assert state
|
||||
assert float(state.state) == 10
|
||||
|
||||
@@ -106,8 +138,8 @@ def test_restore_state(hass):
|
||||
def test_initial_state_overrules_restore_state(hass):
|
||||
"""Ensure states are restored on startup."""
|
||||
mock_restore_cache(hass, (
|
||||
State('input_slider.b1', '70'),
|
||||
State('input_slider.b2', '200'),
|
||||
State('input_number.b1', '70'),
|
||||
State('input_number.b2', '200'),
|
||||
))
|
||||
|
||||
hass.state = CoreState.starting
|
||||
@@ -126,11 +158,11 @@ def test_initial_state_overrules_restore_state(hass):
|
||||
},
|
||||
}})
|
||||
|
||||
state = hass.states.get('input_slider.b1')
|
||||
state = hass.states.get('input_number.b1')
|
||||
assert state
|
||||
assert float(state.state) == 50
|
||||
|
||||
state = hass.states.get('input_slider.b2')
|
||||
state = hass.states.get('input_number.b2')
|
||||
assert state
|
||||
assert float(state.state) == 60
|
||||
|
||||
@@ -148,6 +180,6 @@ def test_no_initial_state_and_no_restore_state(hass):
|
||||
},
|
||||
}})
|
||||
|
||||
state = hass.states.get('input_slider.b1')
|
||||
state = hass.states.get('input_number.b1')
|
||||
assert state
|
||||
assert float(state.state) == 0
|
||||
Reference in new issue
Block a user