From 55b51cb3fa240fc9bae59c909571c1de605c02b1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 23 Apr 2016 19:57:36 +0200 Subject: [PATCH] Update rfxtrx tests to handle new config --- homeassistant/components/rfxtrx.py | 1 - homeassistant/components/sensor/rfxtrx.py | 1 - tests/components/light/test_rfxtrx.py | 65 +++++++-- tests/components/sensor/test_rfxtrx.py | 160 ++++++++++++---------- tests/components/switch/test_rfxtrx.py | 60 ++++---- tests/components/test_rfxtrx.py | 3 +- 6 files changed, 179 insertions(+), 111 deletions(-) diff --git a/homeassistant/components/rfxtrx.py b/homeassistant/components/rfxtrx.py index a217570e4f3..7f8c413b065 100644 --- a/homeassistant/components/rfxtrx.py +++ b/homeassistant/components/rfxtrx.py @@ -57,7 +57,6 @@ def _valid_device(value): for key, device in value.items(): # Still accept old configuration if 'packetid' in device.keys(): - print(key, device.keys(), device, config) msg = 'You are using an outdated configuration of the rfxtrx ' +\ 'devuce, {}. Your new config should be:\n{}: \n\t name:{}\n'\ .format(key, device.get('packetid'), diff --git a/homeassistant/components/sensor/rfxtrx.py b/homeassistant/components/sensor/rfxtrx.py index 7fde6a6dc77..fadc1af1454 100644 --- a/homeassistant/components/sensor/rfxtrx.py +++ b/homeassistant/components/sensor/rfxtrx.py @@ -42,7 +42,6 @@ def _valid_sensor(value): for key, device in value.items(): # Still accept old configuration if 'packetid' in device.keys(): - print(key, device.keys(), device, config) msg = 'You are using an outdated configuration of the rfxtrx ' +\ 'sensor, {}. Your new config should be:\n{}: \n\t name:{}\n'\ .format(key, device.get('packetid'), diff --git a/tests/components/light/test_rfxtrx.py b/tests/components/light/test_rfxtrx.py index f63ee6e3a74..2acc7e7bbb4 100644 --- a/tests/components/light/test_rfxtrx.py +++ b/tests/components/light/test_rfxtrx.py @@ -29,9 +29,8 @@ class TestLightRfxtrx(unittest.TestCase): 'light': {'platform': 'rfxtrx', 'automatic_add': True, 'devices': - {'213c7f216': { + {'0b1100cd0213c7f210010f51': { 'name': 'Test', - 'packetid': '0b1100cd0213c7f210010f51', rfxtrx_core.ATTR_FIREEVENT: True}}}})) self.assertTrue(_setup_component(self.hass, 'light', { @@ -62,7 +61,7 @@ class TestLightRfxtrx(unittest.TestCase): 'devices': {}}})) self.assertEqual(0, len(rfxtrx_core.RFX_DEVICES)) - def test_one_light(self): + def test_old_config(self): """Test with 1 light.""" self.assertTrue(_setup_component(self.hass, 'light', { 'light': {'platform': 'rfxtrx', @@ -76,7 +75,50 @@ class TestLightRfxtrx(unittest.TestCase): rfxtrxmod.Core("", transport_protocol=rfxtrxmod.DummyTransport) self.assertEqual(1, len(rfxtrx_core.RFX_DEVICES)) - entity = rfxtrx_core.RFX_DEVICES['123efab1'] + entity = rfxtrx_core.RFX_DEVICES['213c7f216'] + self.assertEqual('Test', entity.name) + self.assertEqual('off', entity.state) + self.assertTrue(entity.assumed_state) + self.assertEqual(entity.signal_repetitions, 1) + self.assertFalse(entity.should_fire_event) + self.assertFalse(entity.should_poll) + + self.assertFalse(entity.is_on) + + entity.turn_on() + self.assertTrue(entity.is_on) + self.assertEqual(entity.brightness, 255) + + entity.turn_off() + self.assertFalse(entity.is_on) + self.assertEqual(entity.brightness, 0) + + entity.turn_on(brightness=100) + self.assertTrue(entity.is_on) + self.assertEqual(entity.brightness, 100) + + entity.turn_on(brightness=10) + self.assertTrue(entity.is_on) + self.assertEqual(entity.brightness, 10) + + entity.turn_on(brightness=255) + self.assertTrue(entity.is_on) + self.assertEqual(entity.brightness, 255) + + def test_one_light(self): + """Test with 1 light.""" + self.assertTrue(_setup_component(self.hass, 'light', { + 'light': {'platform': 'rfxtrx', + 'devices': + {'0b1100cd0213c7f210010f51': { + 'name': 'Test'}}}})) + + import RFXtrx as rfxtrxmod + rfxtrx_core.RFXOBJECT =\ + rfxtrxmod.Core("", transport_protocol=rfxtrxmod.DummyTransport) + + self.assertEqual(1, len(rfxtrx_core.RFX_DEVICES)) + entity = rfxtrx_core.RFX_DEVICES['213c7f216'] self.assertEqual('Test', entity.name) self.assertEqual('off', entity.state) self.assertTrue(entity.assumed_state) @@ -112,15 +154,12 @@ class TestLightRfxtrx(unittest.TestCase): 'light': {'platform': 'rfxtrx', 'signal_repetitions': 3, 'devices': - {'123efab1': { - 'name': 'Test', - 'packetid': '0b1100cd0213c7f230010f71'}, - '118cdea2': { - 'name': 'Bath', - 'packetid': '0b1100100118cdea02010f70'}, - '213c7f216': { - 'name': 'Living', - 'packetid': '0b1100100118cdea02010f70'}}}})) + {'0b1100cd0213c7f230010f71': { + 'name': 'Test'}, + '0b1100100118cdea02010f70': { + 'name': 'Bath'}, + '0b1100101118cdea02010f70': { + 'name': 'Living'}}}})) self.assertEqual(3, len(rfxtrx_core.RFX_DEVICES)) device_num = 0 diff --git a/tests/components/sensor/test_rfxtrx.py b/tests/components/sensor/test_rfxtrx.py index f0e07326f46..f7725d9a89c 100644 --- a/tests/components/sensor/test_rfxtrx.py +++ b/tests/components/sensor/test_rfxtrx.py @@ -30,7 +30,7 @@ class TestSensorRfxtrx(unittest.TestCase): {}}})) self.assertEqual(0, len(rfxtrx_core.RFX_DEVICES)) - def test_one_sensor(self): + def test_old_config_sensor(self): """Test with 1 sensor.""" self.assertTrue(_setup_component(self.hass, 'sensor', { 'sensor': {'platform': 'rfxtrx', @@ -41,8 +41,27 @@ class TestSensorRfxtrx(unittest.TestCase): 'data_type': 'Temperature'}}}})) self.assertEqual(1, len(rfxtrx_core.RFX_DEVICES)) - print(rfxtrx_core.RFX_DEVICES) - entity = rfxtrx_core.RFX_DEVICES['sensor_0502'] + entity = rfxtrx_core.RFX_DEVICES['sensor_0502']['Temperature'] + self.assertEqual('Test', entity.name) + self.assertEqual(TEMP_CELSIUS, entity.unit_of_measurement) + self.assertEqual(14.9, entity.state) + self.assertEqual({'Humidity status': 'normal', 'Temperature': 14.9, + 'Rssi numeric': 6, 'Humidity': 34, + 'Battery numeric': 9, + 'Humidity status numeric': 2}, + entity.device_state_attributes) + + def test_one_sensor(self): + """Test with 1 sensor.""" + self.assertTrue(_setup_component(self.hass, 'sensor', { + 'sensor': {'platform': 'rfxtrx', + 'devices': + {'0a52080705020095220269': { + 'name': 'Test', + 'data_type': 'Temperature'}}}})) + + self.assertEqual(1, len(rfxtrx_core.RFX_DEVICES)) + entity = rfxtrx_core.RFX_DEVICES['sensor_0502']['Temperature'] self.assertEqual('Test', entity.name) self.assertEqual(TEMP_CELSIUS, entity.unit_of_measurement) self.assertEqual(14.9, entity.state) @@ -57,44 +76,44 @@ class TestSensorRfxtrx(unittest.TestCase): self.assertTrue(_setup_component(self.hass, 'sensor', { 'sensor': {'platform': 'rfxtrx', 'devices': - {'sensor_0502': { + {'0a52080705020095220269': { 'name': 'Test', - 'packetid': '0a52080705020095220269', 'data_type': 'Temperature'}, - 'sensor_0601': { - 'name': 'Bath_Humidity', - 'packetid': '0a520802060100ff0e0269', - 'data_type': 'Humidity'}, - 'sensor_0601 2': { + '0a520802060100ff0e0269': { 'name': 'Bath', - 'packetid': '0a520802060100ff0e0269'}}}})) + 'data_type': ['Temperature', 'Humidity'] + }}}})) - self.assertEqual(3, len(rfxtrx_core.RFX_DEVICES)) + self.assertEqual(2, len(rfxtrx_core.RFX_DEVICES)) device_num = 0 for id in rfxtrx_core.RFX_DEVICES: - entity = rfxtrx_core.RFX_DEVICES[id] - if entity.name == 'Bath_Humidity': + if id == 'sensor_0601': device_num = device_num + 1 - self.assertEqual('%', entity.unit_of_measurement) - self.assertEqual(14, entity.state) + self.assertEqual(len(rfxtrx_core.RFX_DEVICES[id]), 2) + _entity_temp = rfxtrx_core.RFX_DEVICES[id]['Temperature'] + _entity_hum = rfxtrx_core.RFX_DEVICES[id]['Humidity'] + self.assertEqual('%', _entity_hum.unit_of_measurement) + self.assertEqual(14, _entity_hum.state) self.assertEqual({'Battery numeric': 9, 'Temperature': 25.5, 'Humidity': 14, 'Humidity status': 'normal', 'Humidity status numeric': 2, 'Rssi numeric': 6}, - entity.device_state_attributes) - self.assertEqual('Bath_Humidity', entity.__str__()) - elif entity.name == 'Bath': - device_num = device_num + 1 - self.assertEqual(TEMP_CELSIUS, entity.unit_of_measurement) - self.assertEqual(25.5, entity.state) + _entity_hum.device_state_attributes) + self.assertEqual('Bath', _entity_hum.__str__()) + + self.assertEqual(TEMP_CELSIUS, + _entity_temp.unit_of_measurement) + self.assertEqual(25.5, _entity_temp.state) self.assertEqual({'Battery numeric': 9, 'Temperature': 25.5, 'Humidity': 14, 'Humidity status': 'normal', 'Humidity status numeric': 2, 'Rssi numeric': 6}, - entity.device_state_attributes) - self.assertEqual('Bath', entity.__str__()) - elif entity.name == 'Test': + _entity_temp.device_state_attributes) + self.assertEqual('Bath', _entity_temp.__str__()) + elif id == 'sensor_0502': device_num = device_num + 1 + entity = rfxtrx_core.RFX_DEVICES[id]['Temperature'] + self.assertEqual(TEMP_CELSIUS, entity.unit_of_measurement) self.assertEqual(14.9, entity.state) self.assertEqual({'Humidity status': 'normal', @@ -105,7 +124,7 @@ class TestSensorRfxtrx(unittest.TestCase): entity.device_state_attributes) self.assertEqual('Test', entity.__str__()) - self.assertEqual(3, device_num) + self.assertEqual(2, device_num) def test_discover_sensor(self): """Test with discovery of sensor.""" @@ -118,7 +137,7 @@ class TestSensorRfxtrx(unittest.TestCase): event.data = bytearray(b'\nR\x08\x01\x07\x01\x00\xb8\x1b\x02y') rfxtrx_core.RECEIVED_EVT_SUBSCRIBERS[0](event) - entity = rfxtrx_core.RFX_DEVICES['sensor_0701'] + entity = rfxtrx_core.RFX_DEVICES['sensor_0701']['Temperature'] self.assertEqual(1, len(rfxtrx_core.RFX_DEVICES)) self.assertEqual({'Humidity status': 'normal', 'Temperature': 18.4, @@ -135,7 +154,7 @@ class TestSensorRfxtrx(unittest.TestCase): event = rfxtrx_core.get_rfx_object('0a52080405020095240279') event.data = bytearray(b'\nR\x08\x04\x05\x02\x00\x95$\x02y') rfxtrx_core.RECEIVED_EVT_SUBSCRIBERS[0](event) - entity = rfxtrx_core.RFX_DEVICES['sensor_0502'] + entity = rfxtrx_core.RFX_DEVICES['sensor_0502']['Temperature'] self.assertEqual(2, len(rfxtrx_core.RFX_DEVICES)) self.assertEqual({'Humidity status': 'normal', 'Temperature': 14.9, @@ -149,7 +168,7 @@ class TestSensorRfxtrx(unittest.TestCase): event = rfxtrx_core.get_rfx_object('0a52085e070100b31b0279') event.data = bytearray(b'\nR\x08^\x07\x01\x00\xb3\x1b\x02y') rfxtrx_core.RECEIVED_EVT_SUBSCRIBERS[0](event) - entity = rfxtrx_core.RFX_DEVICES['sensor_0701'] + entity = rfxtrx_core.RFX_DEVICES['sensor_0701']['Temperature'] self.assertEqual(2, len(rfxtrx_core.RFX_DEVICES)) self.assertEqual({'Humidity status': 'normal', 'Temperature': 17.9, @@ -197,45 +216,44 @@ class TestSensorRfxtrx(unittest.TestCase): self.assertTrue(_setup_component(self.hass, 'sensor', { 'sensor': {'platform': 'rfxtrx', 'devices': - {'sensor_0502': { + {'0a52080705020095220269': { 'name': 'Test', - 'packetid': '0a52080705020095220269', 'data_type': 'Temperature'}, - 'sensor_0601': { - 'name': 'Bath_Humidity', - 'packetid': '0a520802060100ff0e0269', - 'data_type': 'Humidity'}, - 'sensor_0601 2': { + '0a520802060100ff0e0269': { 'name': 'Bath', - 'packetid': '0a520802060100ff0e0269'}}}})) - - self.assertEqual(3, len(rfxtrx_core.RFX_DEVICES)) + 'data_type': ['Temperature', 'Humidity'] + }}}})) + self.assertEqual(2, len(rfxtrx_core.RFX_DEVICES)) device_num = 0 for id in rfxtrx_core.RFX_DEVICES: - entity = rfxtrx_core.RFX_DEVICES[id] - if entity.name == 'Bath_Humidity': + if id == 'sensor_0601': device_num = device_num + 1 - self.assertEqual('%', entity.unit_of_measurement) - self.assertEqual(14, entity.state) + self.assertEqual(len(rfxtrx_core.RFX_DEVICES[id]), 2) + _entity_temp = rfxtrx_core.RFX_DEVICES[id]['Temperature'] + _entity_hum = rfxtrx_core.RFX_DEVICES[id]['Humidity'] + self.assertEqual('%', _entity_hum.unit_of_measurement) + self.assertEqual(14, _entity_hum.state) self.assertEqual({'Battery numeric': 9, 'Temperature': 25.5, 'Humidity': 14, 'Humidity status': 'normal', 'Humidity status numeric': 2, 'Rssi numeric': 6}, - entity.device_state_attributes) - self.assertEqual('Bath_Humidity', entity.__str__()) - elif entity.name == 'Bath': - device_num = device_num + 1 - self.assertEqual(TEMP_CELSIUS, entity.unit_of_measurement) - self.assertEqual(25.5, entity.state) + _entity_hum.device_state_attributes) + self.assertEqual('Bath', _entity_hum.__str__()) + + self.assertEqual(TEMP_CELSIUS, + _entity_temp.unit_of_measurement) + self.assertEqual(25.5, _entity_temp.state) self.assertEqual({'Battery numeric': 9, 'Temperature': 25.5, 'Humidity': 14, 'Humidity status': 'normal', 'Humidity status numeric': 2, 'Rssi numeric': 6}, - entity.device_state_attributes) - self.assertEqual('Bath', entity.__str__()) - elif entity.name == 'Test': + _entity_temp.device_state_attributes) + self.assertEqual('Bath', _entity_temp.__str__()) + elif id == 'sensor_0502': device_num = device_num + 1 + entity = rfxtrx_core.RFX_DEVICES[id]['Temperature'] + self.assertEqual(TEMP_CELSIUS, entity.unit_of_measurement) self.assertEqual(14.9, entity.state) self.assertEqual({'Humidity status': 'normal', @@ -246,7 +264,7 @@ class TestSensorRfxtrx(unittest.TestCase): entity.device_state_attributes) self.assertEqual('Test', entity.__str__()) - self.assertEqual(3, device_num) + self.assertEqual(2, device_num) event = rfxtrx_core.get_rfx_object('0a520802060101ff0f0269') event.data = bytearray(b'\nR\x08\x01\x07\x01\x00\xb8\x1b\x02y') @@ -257,33 +275,36 @@ class TestSensorRfxtrx(unittest.TestCase): event.data = bytearray(b'\nR\x08\x04\x05\x02\x00\x95$\x02y') rfxtrx_core.RECEIVED_EVT_SUBSCRIBERS[0](event) - self.assertEqual(3, len(rfxtrx_core.RFX_DEVICES)) + self.assertEqual(2, len(rfxtrx_core.RFX_DEVICES)) device_num = 0 for id in rfxtrx_core.RFX_DEVICES: - entity = rfxtrx_core.RFX_DEVICES[id] - if entity.name == 'Bath_Humidity': + if id == 'sensor_0601': device_num = device_num + 1 - self.assertEqual('%', entity.unit_of_measurement) - self.assertEqual(15, entity.state) + self.assertEqual(len(rfxtrx_core.RFX_DEVICES[id]), 2) + _entity_temp = rfxtrx_core.RFX_DEVICES[id]['Temperature'] + _entity_hum = rfxtrx_core.RFX_DEVICES[id]['Humidity'] + self.assertEqual('%', _entity_hum.unit_of_measurement) + self.assertEqual(15, _entity_hum.state) self.assertEqual({'Battery numeric': 9, 'Temperature': 51.1, 'Humidity': 15, 'Humidity status': 'normal', 'Humidity status numeric': 2, 'Rssi numeric': 6}, - entity.device_state_attributes) - self.assertEqual('Bath_Humidity', entity.__str__()) - elif entity.name == 'Bath': - device_num = device_num + 1 - self.assertEqual(TEMP_CELSIUS, entity.unit_of_measurement) - self.assertEqual(51.1, entity.state) + _entity_hum.device_state_attributes) + self.assertEqual('Bath', _entity_hum.__str__()) + + self.assertEqual(TEMP_CELSIUS, + _entity_temp.unit_of_measurement) + self.assertEqual(51.1, _entity_temp.state) self.assertEqual({'Battery numeric': 9, 'Temperature': 51.1, 'Humidity': 15, 'Humidity status': 'normal', 'Humidity status numeric': 2, 'Rssi numeric': 6}, - entity.device_state_attributes) - self.assertEqual('Bath', entity.__str__()) - elif entity.name == 'Test': + _entity_temp.device_state_attributes) + self.assertEqual('Bath', _entity_temp.__str__()) + elif id == 'sensor_0502': device_num = device_num + 1 + entity = rfxtrx_core.RFX_DEVICES[id]['Temperature'] self.assertEqual(TEMP_CELSIUS, entity.unit_of_measurement) self.assertEqual(13.3, entity.state) self.assertEqual({'Humidity status': 'normal', @@ -294,6 +315,5 @@ class TestSensorRfxtrx(unittest.TestCase): entity.device_state_attributes) self.assertEqual('Test', entity.__str__()) - self.assertEqual(3, device_num) - - self.assertEqual(3, len(rfxtrx_core.RFX_DEVICES)) + self.assertEqual(2, device_num) + self.assertEqual(2, len(rfxtrx_core.RFX_DEVICES)) diff --git a/tests/components/switch/test_rfxtrx.py b/tests/components/switch/test_rfxtrx.py index 59066c2b44f..1abbdc2a5ac 100644 --- a/tests/components/switch/test_rfxtrx.py +++ b/tests/components/switch/test_rfxtrx.py @@ -29,9 +29,8 @@ class TestSwitchRfxtrx(unittest.TestCase): 'switch': {'platform': 'rfxtrx', 'automatic_add': True, 'devices': - {'213c7f216': { + {'0b1100cd0213c7f210010f51': { 'name': 'Test', - 'packetid': '0b1100cd0213c7f210010f51', rfxtrx_core.ATTR_FIREEVENT: True} }}})) @@ -71,17 +70,6 @@ class TestSwitchRfxtrx(unittest.TestCase): }}})) def test_invalid_config4(self): - self.assertFalse(_setup_component(self.hass, 'switch', { - 'switch': {'platform': 'rfxtrx', - 'automatic_add': True, - 'devices': - {'AA3c7f216': { - 'name': 'Test', - 'packetid': '0b1100cd0213c7f210010f51', - rfxtrx_core.ATTR_FIREEVENT: True} - }}})) - - def test_invalid_config5(self): """Test configuration.""" self.assertFalse(_setup_component(self.hass, 'switch', { 'switch': {'platform': 'rfxtrx', @@ -100,7 +88,7 @@ class TestSwitchRfxtrx(unittest.TestCase): {}}})) self.assertEqual(0, len(rfxtrx_core.RFX_DEVICES)) - def test_one_switch(self): + def test_old_config(self): """Test with 1 switch.""" self.assertTrue(_setup_component(self.hass, 'switch', { 'switch': {'platform': 'rfxtrx', @@ -114,7 +102,34 @@ class TestSwitchRfxtrx(unittest.TestCase): rfxtrxmod.Core("", transport_protocol=rfxtrxmod.DummyTransport) self.assertEqual(1, len(rfxtrx_core.RFX_DEVICES)) - entity = rfxtrx_core.RFX_DEVICES['123efab1'] + entity = rfxtrx_core.RFX_DEVICES['213c7f216'] + self.assertEqual('Test', entity.name) + self.assertEqual('off', entity.state) + self.assertTrue(entity.assumed_state) + self.assertEqual(entity.signal_repetitions, 1) + self.assertFalse(entity.should_fire_event) + self.assertFalse(entity.should_poll) + + self.assertFalse(entity.is_on) + entity.turn_on() + self.assertTrue(entity.is_on) + entity.turn_off() + self.assertFalse(entity.is_on) + + def test_one_switch(self): + """Test with 1 switch.""" + self.assertTrue(_setup_component(self.hass, 'switch', { + 'switch': {'platform': 'rfxtrx', + 'devices': + {'0b1100cd0213c7f210010f51': { + 'name': 'Test'}}}})) + + import RFXtrx as rfxtrxmod + rfxtrx_core.RFXOBJECT =\ + rfxtrxmod.Core("", transport_protocol=rfxtrxmod.DummyTransport) + + self.assertEqual(1, len(rfxtrx_core.RFX_DEVICES)) + entity = rfxtrx_core.RFX_DEVICES['213c7f216'] self.assertEqual('Test', entity.name) self.assertEqual('off', entity.state) self.assertTrue(entity.assumed_state) @@ -134,15 +149,12 @@ class TestSwitchRfxtrx(unittest.TestCase): 'switch': {'platform': 'rfxtrx', 'signal_repetitions': 3, 'devices': - {'123efab1': { - 'name': 'Test', - 'packetid': '0b1100cd0213c7f230010f71'}, - '118cdea2': { - 'name': 'Bath', - 'packetid': '0b1100100118cdea02010f70'}, - '213c7f216': { - 'name': 'Living', - 'packetid': '0b1100100118cdea02010f70'}}}})) + {'0b1100cd0213c7f230010f71': { + 'name': 'Test'}, + '0b1100100118cdea02010f70': { + 'name': 'Bath'}, + '0b1100101118cdea02010f70': { + 'name': 'Living'}}}})) self.assertEqual(3, len(rfxtrx_core.RFX_DEVICES)) device_num = 0 diff --git a/tests/components/test_rfxtrx.py b/tests/components/test_rfxtrx.py index fe240f85461..3ad9522ec53 100644 --- a/tests/components/test_rfxtrx.py +++ b/tests/components/test_rfxtrx.py @@ -82,9 +82,8 @@ class TestRFXTRX(unittest.TestCase): 'switch': {'platform': 'rfxtrx', 'automatic_add': True, 'devices': - {'213c7f216': { + {'0b1100cd0213c7f210010f51': { 'name': 'Test', - 'packetid': '0b1100cd0213c7f210010f51', rfxtrx.ATTR_FIREEVENT: True} }}}))