GeoNet NZ Quakes code improvements (#32338)
* code quality improvements * code quality improvements and fixed tests * explicitly set unique ids * improve unique id creation * remove entities from entity registry * added test for removing entities from entity registry * revert entity registry handling from sensor and test code * check for entity registry removal in geolocation test case * make import absolute; isort * change quality scale
This commit is contained in:
1 parent
dd7d8d4792
commit
2abdfc9da6
11 files changed
+152
-147
No files matched your search
@@ -0,0 +1,36 @@
|
||||
"""Configuration for GeoNet NZ Quakes tests."""
|
||||
import pytest
|
||||
|
||||
from homeassistant.components.geonetnz_quakes import (
|
||||
CONF_MINIMUM_MAGNITUDE,
|
||||
CONF_MMI,
|
||||
DOMAIN,
|
||||
)
|
||||
from homeassistant.const import (
|
||||
CONF_LATITUDE,
|
||||
CONF_LONGITUDE,
|
||||
CONF_RADIUS,
|
||||
CONF_SCAN_INTERVAL,
|
||||
CONF_UNIT_SYSTEM,
|
||||
)
|
||||
|
||||
from tests.common import MockConfigEntry
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def config_entry():
|
||||
"""Create a mock GeoNet NZ Quakes config entry."""
|
||||
return MockConfigEntry(
|
||||
domain=DOMAIN,
|
||||
data={
|
||||
CONF_LATITUDE: -41.2,
|
||||
CONF_LONGITUDE: 174.7,
|
||||
CONF_RADIUS: 25,
|
||||
CONF_UNIT_SYSTEM: "metric",
|
||||
CONF_SCAN_INTERVAL: 300.0,
|
||||
CONF_MMI: 4,
|
||||
CONF_MINIMUM_MAGNITUDE: 0.0,
|
||||
},
|
||||
title="-41.2, 174.7",
|
||||
unique_id="-41.2, 174.7",
|
||||
)
|
||||
@@ -1,18 +1,11 @@
|
||||
"""Define tests for the GeoNet NZ Quakes config flow."""
|
||||
from datetime import timedelta
|
||||
|
||||
from asynctest import CoroutineMock, patch
|
||||
import pytest
|
||||
|
||||
from homeassistant import data_entry_flow
|
||||
from homeassistant.components.geonetnz_quakes import (
|
||||
CONF_MINIMUM_MAGNITUDE,
|
||||
CONF_MMI,
|
||||
DOMAIN,
|
||||
FEED,
|
||||
async_setup_entry,
|
||||
async_unload_entry,
|
||||
config_flow,
|
||||
)
|
||||
from homeassistant.const import (
|
||||
CONF_LATITUDE,
|
||||
@@ -22,46 +15,24 @@ from homeassistant.const import (
|
||||
CONF_UNIT_SYSTEM,
|
||||
)
|
||||
|
||||
from tests.common import MockConfigEntry
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def config_entry():
|
||||
"""Create a mock GeoNet NZ Quakes config entry."""
|
||||
return MockConfigEntry(
|
||||
domain=DOMAIN,
|
||||
data={
|
||||
CONF_LATITUDE: -41.2,
|
||||
CONF_LONGITUDE: 174.7,
|
||||
CONF_RADIUS: 25,
|
||||
CONF_UNIT_SYSTEM: "metric",
|
||||
CONF_SCAN_INTERVAL: 300.0,
|
||||
CONF_MMI: 4,
|
||||
CONF_MINIMUM_MAGNITUDE: 0.0,
|
||||
},
|
||||
title="-41.2, 174.7",
|
||||
)
|
||||
|
||||
|
||||
async def test_duplicate_error(hass, config_entry):
|
||||
"""Test that errors are shown when duplicates are added."""
|
||||
conf = {CONF_LATITUDE: -41.2, CONF_LONGITUDE: 174.7, CONF_RADIUS: 25}
|
||||
|
||||
config_entry.add_to_hass(hass)
|
||||
flow = config_flow.GeonetnzQuakesFlowHandler()
|
||||
flow.hass = hass
|
||||
|
||||
result = await flow.async_step_user(user_input=conf)
|
||||
assert result["errors"] == {"base": "identifier_exists"}
|
||||
result = await hass.config_entries.flow.async_init(
|
||||
DOMAIN, context={"source": "user"}, data=conf
|
||||
)
|
||||
assert result["type"] == data_entry_flow.RESULT_TYPE_ABORT
|
||||
assert result["reason"] == "already_configured"
|
||||
|
||||
|
||||
async def test_show_form(hass):
|
||||
"""Test that the form is served with no input."""
|
||||
flow = config_flow.GeonetnzQuakesFlowHandler()
|
||||
flow.hass = hass
|
||||
|
||||
result = await flow.async_step_user(user_input=None)
|
||||
|
||||
result = await hass.config_entries.flow.async_init(
|
||||
DOMAIN, context={"source": "user"}
|
||||
)
|
||||
assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
|
||||
assert result["step_id"] == "user"
|
||||
|
||||
@@ -78,10 +49,9 @@ async def test_step_import(hass):
|
||||
CONF_MINIMUM_MAGNITUDE: 2.5,
|
||||
}
|
||||
|
||||
flow = config_flow.GeonetnzQuakesFlowHandler()
|
||||
flow.hass = hass
|
||||
|
||||
result = await flow.async_step_import(import_config=conf)
|
||||
result = await hass.config_entries.flow.async_init(
|
||||
DOMAIN, context={"source": "import"}, data=conf
|
||||
)
|
||||
assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert result["title"] == "-41.2, 174.7"
|
||||
assert result["data"] == {
|
||||
@@ -101,10 +71,9 @@ async def test_step_user(hass):
|
||||
hass.config.longitude = 174.7
|
||||
conf = {CONF_RADIUS: 25, CONF_MMI: 4}
|
||||
|
||||
flow = config_flow.GeonetnzQuakesFlowHandler()
|
||||
flow.hass = hass
|
||||
|
||||
result = await flow.async_step_user(user_input=conf)
|
||||
result = await hass.config_entries.flow.async_init(
|
||||
DOMAIN, context={"source": "user"}, data=conf
|
||||
)
|
||||
assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
|
||||
assert result["title"] == "-41.2, 174.7"
|
||||
assert result["data"] == {
|
||||
@@ -112,25 +81,6 @@ async def test_step_user(hass):
|
||||
CONF_LONGITUDE: 174.7,
|
||||
CONF_RADIUS: 25,
|
||||
CONF_MMI: 4,
|
||||
CONF_UNIT_SYSTEM: "metric",
|
||||
CONF_SCAN_INTERVAL: 300.0,
|
||||
CONF_MINIMUM_MAGNITUDE: 0.0,
|
||||
}
|
||||
|
||||
|
||||
async def test_component_unload_config_entry(hass, config_entry):
|
||||
"""Test that loading and unloading of a config entry works."""
|
||||
config_entry.add_to_hass(hass)
|
||||
with patch(
|
||||
"aio_geojson_geonetnz_quakes.GeonetnzQuakesFeedManager.update",
|
||||
new_callable=CoroutineMock,
|
||||
) as mock_feed_manager_update:
|
||||
# Load config entry.
|
||||
assert await async_setup_entry(hass, config_entry)
|
||||
await hass.async_block_till_done()
|
||||
assert mock_feed_manager_update.call_count == 1
|
||||
assert hass.data[DOMAIN][FEED][config_entry.entry_id] is not None
|
||||
# Unload config entry.
|
||||
assert await async_unload_entry(hass, config_entry)
|
||||
await hass.async_block_till_done()
|
||||
assert hass.data[DOMAIN][FEED].get(config_entry.entry_id) is None
|
||||
@@ -1,11 +1,11 @@
|
||||
"""The tests for the GeoNet NZ Quakes Feed integration."""
|
||||
import datetime
|
||||
|
||||
from asynctest import CoroutineMock, patch
|
||||
from asynctest import patch
|
||||
|
||||
from homeassistant.components import geonetnz_quakes
|
||||
from homeassistant.components.geo_location import ATTR_SOURCE
|
||||
from homeassistant.components.geonetnz_quakes import DEFAULT_SCAN_INTERVAL
|
||||
from homeassistant.components.geonetnz_quakes import DEFAULT_SCAN_INTERVAL, DOMAIN, FEED
|
||||
from homeassistant.components.geonetnz_quakes.geo_location import (
|
||||
ATTR_DEPTH,
|
||||
ATTR_EXTERNAL_ID,
|
||||
@@ -25,6 +25,7 @@ from homeassistant.const import (
|
||||
CONF_RADIUS,
|
||||
EVENT_HOMEASSISTANT_START,
|
||||
)
|
||||
from homeassistant.helpers.entity_registry import async_get_registry
|
||||
from homeassistant.setup import async_setup_component
|
||||
import homeassistant.util.dt as dt_util
|
||||
from homeassistant.util.unit_system import IMPERIAL_SYSTEM
|
||||
@@ -62,7 +63,7 @@ async def test_setup(hass):
|
||||
# Patching 'utcnow' to gain more control over the timed update.
|
||||
utcnow = dt_util.utcnow()
|
||||
with patch("homeassistant.util.dt.utcnow", return_value=utcnow), patch(
|
||||
"aio_geojson_client.feed.GeoJsonFeed.update", new_callable=CoroutineMock
|
||||
"aio_geojson_client.feed.GeoJsonFeed.update"
|
||||
) as mock_feed_update:
|
||||
mock_feed_update.return_value = "OK", [mock_entry_1, mock_entry_2, mock_entry_3]
|
||||
assert await async_setup_component(hass, geonetnz_quakes.DOMAIN, CONFIG)
|
||||
@@ -73,6 +74,8 @@ async def test_setup(hass):
|
||||
all_states = hass.states.async_all()
|
||||
# 3 geolocation and 1 sensor entities
|
||||
assert len(all_states) == 4
|
||||
entity_registry = await async_get_registry(hass)
|
||||
assert len(entity_registry.entities) == 4
|
||||
|
||||
state = hass.states.get("geo_location.title_1")
|
||||
assert state is not None
|
||||
@@ -151,6 +154,7 @@ async def test_setup(hass):
|
||||
|
||||
all_states = hass.states.async_all()
|
||||
assert len(all_states) == 1
|
||||
assert len(entity_registry.entities) == 1
|
||||
|
||||
|
||||
async def test_setup_imperial(hass):
|
||||
@@ -162,15 +166,9 @@ async def test_setup_imperial(hass):
|
||||
# Patching 'utcnow' to gain more control over the timed update.
|
||||
utcnow = dt_util.utcnow()
|
||||
with patch("homeassistant.util.dt.utcnow", return_value=utcnow), patch(
|
||||
"aio_geojson_client.feed.GeoJsonFeed.update", new_callable=CoroutineMock
|
||||
"aio_geojson_client.feed.GeoJsonFeed.update"
|
||||
) as mock_feed_update, patch(
|
||||
"aio_geojson_client.feed.GeoJsonFeed.__init__",
|
||||
new_callable=CoroutineMock,
|
||||
create=True,
|
||||
) as mock_feed_init, patch(
|
||||
"aio_geojson_client.feed.GeoJsonFeed.last_timestamp",
|
||||
new_callable=CoroutineMock,
|
||||
create=True,
|
||||
"aio_geojson_client.feed.GeoJsonFeed.last_timestamp", create=True
|
||||
):
|
||||
mock_feed_update.return_value = "OK", [mock_entry_1]
|
||||
assert await async_setup_component(hass, geonetnz_quakes.DOMAIN, CONFIG)
|
||||
@@ -182,7 +180,12 @@ async def test_setup_imperial(hass):
|
||||
assert len(all_states) == 2
|
||||
|
||||
# Test conversion of 200 miles to kilometers.
|
||||
assert mock_feed_init.call_args[1].get("filter_radius") == 321.8688
|
||||
feeds = hass.data[DOMAIN][FEED]
|
||||
assert feeds is not None
|
||||
assert len(feeds) == 1
|
||||
manager = list(feeds.values())[0]
|
||||
# Ensure that the filter value in km is correctly set.
|
||||
assert manager._feed_manager._feed._filter_radius == 321.8688
|
||||
|
||||
state = hass.states.get("geo_location.title_1")
|
||||
assert state is not None
|
||||
@@ -196,4 +199,5 @@ async def test_setup_imperial(hass):
|
||||
ATTR_SOURCE: "geonetnz_quakes",
|
||||
ATTR_ICON: "mdi:pulse",
|
||||
}
|
||||
# 15.5km (as defined in mock entry) has been converted to 9.6mi.
|
||||
assert float(state.state) == 9.6
|
||||
@@ -0,0 +1,21 @@
|
||||
"""Define tests for the GeoNet NZ Quakes general setup."""
|
||||
from asynctest import patch
|
||||
|
||||
from homeassistant.components.geonetnz_quakes import DOMAIN, FEED
|
||||
|
||||
|
||||
async def test_component_unload_config_entry(hass, config_entry):
|
||||
"""Test that loading and unloading of a config entry works."""
|
||||
config_entry.add_to_hass(hass)
|
||||
with patch(
|
||||
"aio_geojson_geonetnz_quakes.GeonetnzQuakesFeedManager.update"
|
||||
) as mock_feed_manager_update:
|
||||
# Load config entry.
|
||||
assert await hass.config_entries.async_setup(config_entry.entry_id)
|
||||
await hass.async_block_till_done()
|
||||
assert mock_feed_manager_update.call_count == 1
|
||||
assert hass.data[DOMAIN][FEED][config_entry.entry_id] is not None
|
||||
# Unload config entry.
|
||||
assert await hass.config_entries.async_unload(config_entry.entry_id)
|
||||
await hass.async_block_till_done()
|
||||
assert hass.data[DOMAIN][FEED].get(config_entry.entry_id) is None
|
||||
@@ -1,7 +1,7 @@
|
||||
"""The tests for the GeoNet NZ Quakes Feed integration."""
|
||||
import datetime
|
||||
|
||||
from asynctest import CoroutineMock, patch
|
||||
from asynctest import patch
|
||||
|
||||
from homeassistant.components import geonetnz_quakes
|
||||
from homeassistant.components.geonetnz_quakes import DEFAULT_SCAN_INTERVAL
|
||||
@@ -55,7 +55,7 @@ async def test_setup(hass):
|
||||
# Patching 'utcnow' to gain more control over the timed update.
|
||||
utcnow = dt_util.utcnow()
|
||||
with patch("homeassistant.util.dt.utcnow", return_value=utcnow), patch(
|
||||
"aio_geojson_client.feed.GeoJsonFeed.update", new_callable=CoroutineMock
|
||||
"aio_geojson_client.feed.GeoJsonFeed.update"
|
||||
) as mock_feed_update:
|
||||
mock_feed_update.return_value = "OK", [mock_entry_1, mock_entry_2, mock_entry_3]
|
||||
assert await async_setup_component(hass, geonetnz_quakes.DOMAIN, CONFIG)
|
||||
|
||||
Reference in new issue
Block a user