Merge pull request #149 from mbillow/claude/ticket-127-device-coverage-xsb0m4
Distinguish not-yet-fetched stub reps from confirmed-empty ones (issue #127)
This commit is contained in:
11 files changed
+224
-53
No files matched your search
-6
@@ -7,18 +7,12 @@
|
||||
"diagnosis_status",
|
||||
"display_light",
|
||||
"dust",
|
||||
"energy_kwh",
|
||||
"energy_last_month_kwh",
|
||||
"energy_saved_kwh",
|
||||
"energy_this_month_kwh",
|
||||
"fan_direction",
|
||||
"filter_progress",
|
||||
"fine_dust",
|
||||
"odor",
|
||||
"operating_mode",
|
||||
"power_energy_kwh",
|
||||
"power_switch",
|
||||
"power_watts",
|
||||
"super_fine_dust"
|
||||
]
|
||||
}
|
||||
@@ -5,16 +5,10 @@
|
||||
"defrost_delay",
|
||||
"diagnosis_status",
|
||||
"door_onedoorfreezer_open",
|
||||
"energy_kwh",
|
||||
"energy_last_month_kwh",
|
||||
"energy_saved_kwh",
|
||||
"energy_this_month_kwh",
|
||||
"firmware_update",
|
||||
"freezer_setpoint",
|
||||
"freezer_temperature",
|
||||
"ice_maker_enabled",
|
||||
"power_energy_kwh",
|
||||
"power_watts",
|
||||
"rapid_freezing",
|
||||
"rapid_fridge",
|
||||
"sabbath_mode"
|
||||
|
||||
@@ -8,14 +8,8 @@
|
||||
"diagnosis_status",
|
||||
"door_cooler_open",
|
||||
"door_onedoorfreezer_open",
|
||||
"energy_kwh",
|
||||
"energy_last_month_kwh",
|
||||
"energy_saved_kwh",
|
||||
"energy_this_month_kwh",
|
||||
"firmware_update",
|
||||
"ice_maker_enabled",
|
||||
"power_energy_kwh",
|
||||
"power_watts",
|
||||
"rapid_freezing",
|
||||
"rapid_fridge",
|
||||
"sabbath_mode"
|
||||
|
||||
@@ -0,0 +1,56 @@
|
||||
"""Tests for registry.batch — the /device/0 sweep parser and its stub marker.
|
||||
|
||||
issue #127: a device whose /energy/consumption/vs/0 is permanently
|
||||
unsupported reports a genuinely empty {} rep for it. The previous parser
|
||||
collapsed /device/0's own {"href": "..."} "not fetched yet" marker to that
|
||||
same {} shape, so downstream exists_fn checks couldn't tell "confirmed
|
||||
empty" apart from "haven't polled it yet" and created phantom always-
|
||||
"unknown" entities either way. is_stub_rep/parse_device0_batch now keep the
|
||||
two shapes distinct.
|
||||
"""
|
||||
from custom_components.localthings.registry.batch import is_stub_rep, parse_device0_batch
|
||||
|
||||
|
||||
class TestIsStubRep:
|
||||
def test_true_for_bare_href_marker(self):
|
||||
assert is_stub_rep({'href': '/energy/consumption/vs/0'}) is True
|
||||
|
||||
def test_false_for_genuinely_empty_rep(self):
|
||||
assert is_stub_rep({}) is False
|
||||
|
||||
def test_false_for_populated_rep(self):
|
||||
assert is_stub_rep({'x.com.samsung.da.cumulativePower': '58900'}) is False
|
||||
|
||||
def test_false_for_href_plus_data(self):
|
||||
"""A real, populated rep may legitimately echo 'href' alongside
|
||||
actual fields -- only a rep with *no other keys* is the stub."""
|
||||
assert is_stub_rep({'href': '/x/0', 'value': True}) is False
|
||||
|
||||
|
||||
class TestParseDevice0Batch:
|
||||
def test_stub_rep_kept_distinct_from_genuine_empty(self):
|
||||
device0 = [
|
||||
{},
|
||||
{'href': '/energy/consumption/vs/0', 'rep': {'href': '/energy/consumption/vs/0'}},
|
||||
{'href': '/sabbath/vs/0', 'rep': {}},
|
||||
]
|
||||
resources = parse_device0_batch(device0)
|
||||
assert is_stub_rep(resources['/energy/consumption/vs/0']) is True
|
||||
assert is_stub_rep(resources['/sabbath/vs/0']) is False
|
||||
assert resources['/sabbath/vs/0'] == {}
|
||||
|
||||
def test_populated_rep_passes_through_unchanged(self):
|
||||
device0 = [
|
||||
{},
|
||||
{'href': '/door/cooler/0', 'rep': {'openState': 'Close'}},
|
||||
]
|
||||
resources = parse_device0_batch(device0)
|
||||
assert resources['/door/cooler/0'] == {'openState': 'Close'}
|
||||
|
||||
def test_skips_entries_without_href(self):
|
||||
device0 = [{}, {'rep': {'a': 1}}]
|
||||
assert parse_device0_batch(device0) == {}
|
||||
|
||||
def test_skips_non_dict_rep(self):
|
||||
device0 = [{}, {'href': '/x/0', 'rep': 'not-a-dict'}]
|
||||
assert parse_device0_batch(device0) == {}
|
||||
@@ -253,13 +253,24 @@ class TestEnergyMeter:
|
||||
kwh = next(e for e in common.ENERGY_METER.entities if e.key == 'energy_kwh')
|
||||
assert kwh.exists_fn({'x.com.samsung.da.cumulativePower': '58900'}, {}) is True
|
||||
|
||||
def test_both_entities_included_on_empty_stub(self):
|
||||
"""An empty {} rep means the resource exists but data isn't fetched yet
|
||||
(see entity._is_included) -- include both so sub-polls populate them."""
|
||||
def test_both_entities_included_on_true_stub(self):
|
||||
"""A true stub -- /device/0's {"href": "..."} "not fetched yet"
|
||||
marker (see registry.batch.is_stub_rep) -- means the resource exists
|
||||
but data isn't fetched yet; include both so sub-polls populate them."""
|
||||
pw = next(e for e in common.ENERGY_METER.entities if e.key == 'power_watts')
|
||||
kwh = next(e for e in common.ENERGY_METER.entities if e.key == 'energy_kwh')
|
||||
assert pw.exists_fn({}, {}) is True
|
||||
assert kwh.exists_fn({}, {}) is True
|
||||
stub = {'href': '/energy/consumption/vs/0'}
|
||||
assert pw.exists_fn(stub, {}) is True
|
||||
assert kwh.exists_fn(stub, {}) is True
|
||||
|
||||
def test_both_entities_hidden_on_genuinely_empty_rep(self):
|
||||
"""A real {} rep (no 'href' key) is the device's confirmed -- if
|
||||
empty -- answer, not a stub, so a model that never populates this
|
||||
resource doesn't get a phantom always-"unknown" entity (issue #127)."""
|
||||
pw = next(e for e in common.ENERGY_METER.entities if e.key == 'power_watts')
|
||||
kwh = next(e for e in common.ENERGY_METER.entities if e.key == 'energy_kwh')
|
||||
assert pw.exists_fn({}, {}) is False
|
||||
assert kwh.exists_fn({}, {}) is False
|
||||
|
||||
def test_power_watts_hidden_when_field_absent_in_populated_rep(self):
|
||||
"""A populated rep that lacks instantaneousPower must not spawn a
|
||||
@@ -388,13 +399,20 @@ class TestAiEnergyLevelStubDoesNotDecideThePlatform:
|
||||
if a stub carve-out let one of them win at setup time while the other
|
||||
wins once real data lands, flatten() would feed the already-instantiated
|
||||
entity a value shaped for the other platform (e.g. a bool into a Select
|
||||
expecting a string option). Neither side gets a `not rep` carve-out, so
|
||||
an unfetched stub can never win entity creation for either platform --
|
||||
expecting a string option). Neither side gets an is_stub_rep carve-out,
|
||||
so an unfetched stub can never win entity creation for either platform --
|
||||
the entity simply doesn't appear until a reload happens with real data,
|
||||
same as any other exists_fn-gated entity in this codebase that's unlucky
|
||||
on first-poll timing, instead of appearing as the wrong widget type."""
|
||||
|
||||
def test_neither_widget_exists_on_empty_stub_rep(self):
|
||||
def test_neither_widget_exists_on_true_stub_rep(self):
|
||||
switch = _ai_energy_level_desc('SwitchDesc')
|
||||
select = _ai_energy_level_desc('SelectDesc')
|
||||
stub = {'href': '/energy/ailevel/vs/0'}
|
||||
assert switch.exists_fn(stub, {}) is False
|
||||
assert select.exists_fn(stub, {}) is False
|
||||
|
||||
def test_neither_widget_exists_on_genuinely_empty_rep(self):
|
||||
switch = _ai_energy_level_desc('SwitchDesc')
|
||||
select = _ai_energy_level_desc('SelectDesc')
|
||||
assert switch.exists_fn({}, {}) is False
|
||||
@@ -416,11 +434,17 @@ class TestSelfCheckError:
|
||||
desc = self._desc()
|
||||
assert desc.exists_fn({'x.com.samsung.da.status': 'Ready'}, {}) is False
|
||||
|
||||
def test_exists_for_empty_stub_rep(self):
|
||||
"""An empty {} rep is /device/0's not-yet-fetched-stub carve-out --
|
||||
must be included-for-now, same as ENERGY_METER's fields."""
|
||||
def test_exists_for_true_stub_rep(self):
|
||||
"""A true stub ({"href": "..."}) is /device/0's not-yet-fetched
|
||||
marker -- must be included-for-now, same as ENERGY_METER's fields."""
|
||||
desc = self._desc()
|
||||
assert desc.exists_fn({}, {}) is True
|
||||
assert desc.exists_fn({'href': '/selfcheck/vs/0'}, {}) is True
|
||||
|
||||
def test_hidden_for_genuinely_empty_rep(self):
|
||||
"""A real {} rep is the device's confirmed empty answer, not a stub --
|
||||
must NOT be force-included (issue #127's phantom-entity pattern)."""
|
||||
desc = self._desc()
|
||||
assert desc.exists_fn({}, {}) is False
|
||||
|
||||
def test_value_joins_list(self):
|
||||
desc = self._desc()
|
||||
|
||||
@@ -0,0 +1,79 @@
|
||||
"""Tests for entity._is_included -- the one-time entity-creation gate run
|
||||
per platform at async_setup_entry (see sensor.py etc.), separate from
|
||||
adapter.flatten()'s per-poll state values. issue #127 review: this default
|
||||
gate has to stay permissive on a genuinely empty {} rep, not just a true
|
||||
is_stub_rep stub -- a resource like /alarms/vs/0 is validly empty in its
|
||||
normal, no-alarm state (fridge._active_alarm_codes), so excluding the
|
||||
entity there would silently drop working sensors on first-poll timing,
|
||||
not just fix phantom ones.
|
||||
"""
|
||||
from custom_components.localthings.entity import _is_included
|
||||
from custom_components.localthings.registry.capability import Capability
|
||||
from custom_components.localthings.registry.discovery import BoundEntity
|
||||
from custom_components.localthings.registry.entities import SensorDesc
|
||||
|
||||
|
||||
class _FakeCoordinator:
|
||||
def __init__(self, last_resources):
|
||||
self.last_resources = last_resources
|
||||
|
||||
|
||||
def _bound(desc, href):
|
||||
capability = Capability(href=href, entities=(desc,))
|
||||
return BoundEntity(href=href, capability=capability, desc=desc)
|
||||
|
||||
|
||||
class TestDefaultFieldGate:
|
||||
"""No explicit exists_fn -- the field-presence default in entity.py."""
|
||||
|
||||
def _bound(self):
|
||||
return _bound(SensorDesc(key='x', field='x.com.samsung.da.value'), '/x/vs/0')
|
||||
|
||||
def test_included_when_field_present(self):
|
||||
bound = self._bound()
|
||||
coord = _FakeCoordinator({'/x/vs/0': {'x.com.samsung.da.value': '1'}})
|
||||
assert _is_included(bound, coord) is True
|
||||
|
||||
def test_excluded_when_field_absent_from_populated_rep(self):
|
||||
bound = self._bound()
|
||||
coord = _FakeCoordinator({'/x/vs/0': {'x.com.samsung.da.other': '1'}})
|
||||
assert _is_included(bound, coord) is False
|
||||
|
||||
def test_included_on_true_stub(self):
|
||||
bound = self._bound()
|
||||
coord = _FakeCoordinator({'/x/vs/0': {'href': '/x/vs/0'}})
|
||||
assert _is_included(bound, coord) is True
|
||||
|
||||
def test_included_on_genuinely_empty_rep(self):
|
||||
"""The default gate stays permissive on a real {} -- see
|
||||
/alarms/vs/0, whose empty rep is the normal no-alarm state, not a
|
||||
signal the hardware is unsupported. Only a capability-specific
|
||||
exists_fn (e.g. common.ENERGY_METER) opts into excluding on
|
||||
confirmed-empty, after verifying that's actually safe for its field."""
|
||||
bound = self._bound()
|
||||
coord = _FakeCoordinator({'/x/vs/0': {}})
|
||||
assert _is_included(bound, coord) is True
|
||||
|
||||
def test_excluded_when_href_missing_from_resources(self):
|
||||
bound = self._bound()
|
||||
coord = _FakeCoordinator({})
|
||||
assert _is_included(bound, coord) is False
|
||||
|
||||
|
||||
class TestExplicitExistsFnGate:
|
||||
def test_explicit_exists_fn_overrides_default_field_gate(self):
|
||||
desc = SensorDesc(key='x', field='x.com.samsung.da.value',
|
||||
exists_fn=lambda rep, resources: rep.get('flag') is True)
|
||||
bound = _bound(desc, '/x/vs/0')
|
||||
coord = _FakeCoordinator({'/x/vs/0': {'flag': True}})
|
||||
assert _is_included(bound, coord) is True
|
||||
coord = _FakeCoordinator({'/x/vs/0': {'flag': False, 'x.com.samsung.da.value': '1'}})
|
||||
assert _is_included(bound, coord) is False
|
||||
|
||||
|
||||
class TestNoFieldEntities:
|
||||
def test_rep_fn_entity_always_included(self):
|
||||
desc = SensorDesc(key='x', rep_fn=lambda rep: rep.get('x.com.samsung.da.value'))
|
||||
bound = _bound(desc, '/x/vs/0')
|
||||
coord = _FakeCoordinator({'/x/vs/0': {}})
|
||||
assert _is_included(bound, coord) is True
|
||||
Reference in new issue
Block a user