fix(mock-base): close review findings on the shared MockBase refactor

- Add a contract test that binds a real ComponentBase subclass to MockBase
  and exercises every property/delegate method, so an AttributeError fires
  if a future self.base dereference in component_base.py outgrows the mock
  (the old attribute_superset test only compared two hardcoded lists).
- Fix MockBase.set_arg to pop the key on a None value, matching
  userinterface.py's Fetch.set_arg semantics instead of storing None.
- Add coverage asserting deye/enphase/fox/solis/teslemetry re-export the
  identical shared MockBase, and axle/gecloud/octopus/sigenergy/solax
  subclass it.
- Widen MockBase.log to accept hass.py's quiet keyword.
- Correct two factual errors in the design spec: the octopus.py
  record_status calls are on the Octopus mixin (Output provides the
  method), not OctopusAPI/ComponentBase; and deye's old dashboard_item
  printed no attributes at all, so it gains attribute printing rather than
  merely losing the options elision.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: springfall2008

apps/predbat/mock_base.py

@@ -52,8 +52,12 @@ def __init__(self, config_root="./temp_predbat", local_tz=None, **kwargs):
         self.arg_errors = {}
         self.args = {key: value for key, value in kwargs.items() if value is not None}
 
-    def log(self, message):
-        """Print a timestamped log line."""
+    def log(self, message, quiet=True):
+        """Print a timestamped log line.
+
+        Accepts the real Hass.log's quiet keyword for signature compatibility with callers
+        that pass it; the mock always prints regardless of its value.
+        """
         print(f"[{datetime.now().strftime('%H:%M:%S')}] {message}")
 
     def get_state_wrapper(self, entity_id=None, default=None, attribute=None, refresh=False, required_unit=None, raw=False):
@@ -92,8 +96,16 @@ def get_arg(self, arg, default=None, indirect=True, combine=False, attribute=Non
         return self.args.get(arg, default)
 
     def set_arg(self, key, value):
-        """Record an argument set by automatic_config, printing it with any referenced entity's state."""
-        self.args[key] = value
+        """Record an argument set by automatic_config, printing it with any referenced entity's state.
+
+        Matches userinterface.py's Fetch.set_arg: a None value deletes the key rather than
+        storing it, so a later get_arg(key, default) falls back to the caller's default
+        instead of returning None.
+        """
+        if value is None:
+            self.args.pop(key, None)
+        else:
+            self.args[key] = value
         if isinstance(value, str) and "." in value:
             state = self.get_state_wrapper(value, default=None)
         elif isinstance(value, list):

apps/predbat/tests/test_mock_base.py

@@ -14,9 +14,18 @@
 
 from datetime import datetime, timezone
 
+from component_base import ComponentBase
 from mock_base import MockBase
 
 
+class _ContractProbeComponent(ComponentBase):
+    """Minimal concrete ComponentBase subclass used only to exercise the base contract."""
+
+    def initialize(self, **kwargs):
+        """Do nothing; this probe only needs the base ComponentBase wiring, not extra state."""
+        pass
+
+
 def test_mock_base_attribute_superset(my_predbat):
     """Every attribute ComponentBase dereferences off self.base is present after construction."""
     base = MockBase()
@@ -48,6 +57,48 @@ def test_mock_base_attribute_superset(my_predbat):
     return False
 
 
+def test_mock_base_covers_component_base_contract(my_predbat):
+    """MockBase must satisfy every property and delegated method ComponentBase exposes.
+
+    test_mock_base_attribute_superset only checks that MockBase's attribute list mirrors this
+    file's own hardcoded copy of the ComponentBase surface - it is a change-detector, not a
+    regression test, because both lists drift together. This test instead binds a real
+    ComponentBase subclass to a MockBase and exercises the actual properties and delegate
+    methods ComponentBase defines, so it fails with an AttributeError if someone adds a new
+    self.base.<something> dereference to component_base.py that the mock does not cover.
+    """
+    component = _ContractProbeComponent(MockBase())
+
+    # Properties defined on ComponentBase that read through to self.base.
+    assert component.currency_symbols == "£p", "currency_symbols property failed"
+    assert component.arg_errors == {}, "arg_errors property failed"
+    assert component.now_utc is not None, "now_utc property failed"
+    assert component.midnight_utc is not None, "midnight_utc property failed"
+    assert component.now_utc_exact is not None, "now_utc_exact property failed"
+    assert isinstance(component.minutes_now, int), "minutes_now property failed"
+    assert component.plan_interval_minutes == 30, "plan_interval_minutes property failed"
+    assert component.num_cars == 0, "num_cars property failed"
+    assert component.config_root == "./temp_predbat", "config_root property failed"
+    assert component.storage is None, "storage property failed (components is None on MockBase)"
+    assert component.fatal_error is False, "fatal_error property failed"
+
+    # Methods ComponentBase delegates straight through to self.base.
+    assert component.get_arg("missing_key", "fallback") == "fallback", "get_arg delegate failed"
+    component.set_arg("probe_key", "probe_value")
+    assert component.get_arg("probe_key") == "probe_value", "set_arg delegate failed"
+    component.dashboard_item("sensor.predbat_probe", "on", {"friendly_name": "Probe"})
+    assert component.get_ha_config("anything", "fallback") == "fallback", "get_ha_config delegate failed"
+    assert component.get_state_wrapper("sensor.predbat_probe") == "on", "get_state_wrapper delegate failed"
+    component.set_state_wrapper("sensor.predbat_probe2", "off")
+    assert component.get_state_wrapper("sensor.predbat_probe2") == "off", "set_state_wrapper delegate failed"
+    assert component.get_history_wrapper("sensor.predbat_probe") is None, "get_history_wrapper delegate failed"
+    component.call_notify("probe notification")
+    component.log("probe log message")
+
+    print("PASS: MockBase covers the full ComponentBase property/delegate contract")
+    return False
+
+
 def test_mock_base_config_root_and_local_tz_overrides(my_predbat):
     """config_root and local_tz are constructor-overridable, as the axle/gecloud/octopus/solax subclasses need."""
     base = MockBase(config_root="./temp_example")
@@ -101,6 +152,65 @@ def test_mock_base_arg_round_trip(my_predbat):
     return False
 
 
+def test_mock_base_set_arg_none_deletes_key(my_predbat):
+    """set_arg(key, None) must delete the key, matching userinterface.py's Fetch.set_arg.
+
+    gecloud.py makes several set_arg(key, None) calls expecting the key to disappear so a
+    later get_arg(key, default) falls back to the caller's default rather than returning None.
+    """
+    base = MockBase()
+    base.set_arg("probe_key", "probe_value")
+    assert base.get_arg("probe_key", "fallback") == "probe_value", "set_arg should have stored the value"
+    base.set_arg("probe_key", None)
+    assert base.get_arg("probe_key", "fallback") == "fallback", "set_arg(key, None) should delete the key, not store None"
+    assert "probe_key" not in base.args, "the deleted key must not remain in args"
+    print("PASS: MockBase set_arg(key, None) deletes the key")
+    return False
+
+
+def test_mock_base_reexport_identity(my_predbat):
+    """The five plain re-export modules must expose the identical shared MockBase object.
+
+    deye, enphase, fox and solis are not otherwise exercised anywhere (teslemetry is covered
+    incidentally by test_teslemetry.py), so nothing else would catch a botched edit to one of
+    those `from mock_base import MockBase` lines - e.g. accidentally defining a local class
+    that shadows the shared one.
+    """
+    from deye import MockBase as DeyeMockBase
+    from enphase import MockBase as EnphaseMockBase
+    from fox import MockBase as FoxMockBase
+    from solis import MockBase as SolisMockBase
+    from teslemetry import MockBase as TeslemetryMockBase
+
+    for name, reexported in (
+        ("deye", DeyeMockBase),
+        ("enphase", EnphaseMockBase),
+        ("fox", FoxMockBase),
+        ("solis", SolisMockBase),
+        ("teslemetry", TeslemetryMockBase),
+    ):
+        assert reexported is MockBase, f"{name}.MockBase should be the identical shared mock_base.MockBase object"
+
+    from axle import MockBase as AxleMockBase
+    from gecloud import MockBase as GECloudMockBase
+    from octopus import MockBase as OctopusMockBase
+    from sigenergy import MockBase as SigenergyMockBase
+    from solax import MockBase as SolaxMockBase
+
+    for name, subclass in (
+        ("axle", AxleMockBase),
+        ("gecloud", GECloudMockBase),
+        ("octopus", OctopusMockBase),
+        ("sigenergy", SigenergyMockBase),
+        ("solax", SolaxMockBase),
+    ):
+        assert issubclass(subclass, MockBase), f"{name}.MockBase should be a subclass of the shared mock_base.MockBase"
+        assert subclass is not MockBase, f"{name}.MockBase should be its own subclass, not a bare re-export"
+
+    print("PASS: the eleven module MockBase names resolve to the shared class or a true subclass of it")
+    return False
+
+
 def test_mock_base_dashboard_item_does_not_mutate_attributes(my_predbat):
     """dashboard_item must not corrupt the caller's attributes dict when eliding the options list."""
     base = MockBase()
@@ -208,11 +318,14 @@ def test_mock_base_all(my_predbat):
     """Run all mock_base tests."""
     tests = [
         ("attribute_superset", test_mock_base_attribute_superset, "Full base attribute superset is present"),
+        ("component_base_contract", test_mock_base_covers_component_base_contract, "MockBase satisfies the real ComponentBase property/delegate contract"),
         ("constructor_overrides", test_mock_base_config_root_and_local_tz_overrides, "config_root and local_tz are overridable"),
         ("midnight_aware", test_mock_base_midnight_utc_is_aware, "midnight_utc is timezone-aware"),
         ("kwargs_args", test_mock_base_kwargs_populate_args, "Surplus kwargs populate args"),
         ("none_kwargs", test_mock_base_none_kwargs_are_skipped, "None kwargs are skipped, False is kept"),
         ("arg_round_trip", test_mock_base_arg_round_trip, "get_arg/set_arg round-trip"),
+        ("set_arg_none_deletes", test_mock_base_set_arg_none_deletes_key, "set_arg(key, None) deletes the key"),
+        ("reexport_identity", test_mock_base_reexport_identity, "Re-export and subclass modules resolve to the shared MockBase"),
         ("dashboard_no_mutate", test_mock_base_dashboard_item_does_not_mutate_attributes, "dashboard_item does not mutate caller attributes"),
         ("dashboard_datetime", test_mock_base_dashboard_item_serialises_datetime, "dashboard_item serialises datetime attributes"),
         ("state_wrapper", test_mock_base_state_wrapper_paths, "get_state_wrapper raw/attribute/default paths"),

docs/superpowers/specs/2026-07-29-shared-mock-base-design.md

@@ -47,10 +47,11 @@ The eleven CLI test-double classes listed above.
 - **`web_mcp.py:1293`** — an inline mock with an unrelated surface (`raw_plan`, `soc_kw`,
   `is_running`); it has no `get_state_wrapper`, `get_arg`, `log` or `dashboard_item`. There
   is nothing to share.
-- **`self.record_status(...)` calls in `octopus.py`.** `OctopusAPI` inherits `ComponentBase`,
-  which defines no `record_status` (it lives on `Output`), so those error paths would raise
-  `AttributeError` regardless of the mock. That is a pre-existing defect on `self`, not
-  `self.base`, and this work does not address it.
+- **`self.record_status(...)` calls in `octopus.py`.** These calls (around
+  `octopus.py:2067-2334`) are inside `class Octopus`, a PredBat mixin composed alongside
+  `Output` in the main `PredBat` class, where `Output.record_status` genuinely exists at
+  runtime. They are unrelated to `OctopusAPI`/`ComponentBase` or to `self.base`, and out of
+  scope for this work.
 
 ## Design
 
@@ -121,8 +122,9 @@ Three deliberate changes, all confined to CLI-harness behaviour and output:
    version adopts that approach. `default=str` (currently only in `axle`) prevents a
    `TypeError` when a component publishes a datetime.
 
-   Cosmetic consequence: `axle` and `deye` CLI output will now elide `options` as the other
-   nine already do.
+   Cosmetic consequence: `axle` CLI output will now elide `options` as the other modules
+   already do. `deye`'s old `dashboard_item` printed no attributes at all, so it gains
+   attribute printing outright rather than merely eliding `options`.
 
 3. **`set_arg` logging.** `axle` and `sigenergy` print a terser line; they adopt the common
    form that resolves the referenced entity's state. More informative, CLI-only.