jeena/home-assistant
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'hotfix/state-as-number' into dev

Browse source 
Conflicts:
	homeassistant/const.py
	tests/helpers/test_state.py
This commit is contained in:
Paulus Schoutsen 2016-02-13 08:32:06 -08:00
commit bf0b453677
12 changed files with 22 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tests/helpers/test_state.py
View file

@ -163,24 +163,18 @@ class TestStateHelpers(unittest.TestCase):
ha.State('domain.test', _state, {})))
def test_as_number_coercion(self):
for _state in ('0', '0.0'):
self.assertEqual(0.0, float(
state.state_as_number(
ha.State('domain.test', _state, {}))))
for _state in ('1', '1.0'):
for _state in ('0', '0.0', 0, 0.0):
self.assertEqual(
1.0, float(state.state_as_number(
ha.State('domain.test', _state, {}))))
def test_as_number_tries_to_keep_types(self):
result = state.state_as_number(ha.State('domain.test', '1', {}))
self.assertTrue(isinstance(result, int))
result = state.state_as_number(ha.State('domain.test', '1.0', {}))
self.assertTrue(isinstance(result, float))
0.0, state.state_as_number(
ha.State('domain.test', _state, {})))
for _state in ('1', '1.0', 1, 1.0):
self.assertEqual(
1.0, state.state_as_number(
ha.State('domain.test', _state, {})))
def test_as_number_invalid_cases(self):
for _state in ('', 'foo', 'foo.bar', None, False, True, None,
object, object()):
for _state in ('', 'foo', 'foo.bar', None, False, True, object,
object()):
self.assertRaises(ValueError,
state.state_as_number,
ha.State('domain.test', _state, {}))