Apply suggestions and update test

Author: gjmooney

src/ypywidgets/comm.py

@@ -103,16 +103,6 @@ def __init__(
     def awareness(self) -> Awareness:
         return self._comm_provider.awareness
 
-    def on_awareness_change(
-        self,
-        callback: Callable[[str, tuple[dict[str, Any], Any]], None],
-    ) -> str:
-        """Subscribe to pycrdt Awareness updates; returns subscription id for unobserve."""
-        return self.awareness.observe(callback)
-
-    def unobserve_awareness(self, subscription_id: str) -> None:
-        self.awareness.unobserve(subscription_id)
-
     def _repr_mimebundle_(self, *args, **kwargs):  # pragma: nocover
         plaintext = repr(self)
         if len(plaintext) > 110:

tests/conftest.py

@@ -112,7 +112,6 @@ def __init__(
         self.local_widget_factory, self.remote_widget_factory = widget_factories
         self.local_widget: CommWidget | None = None
         self.remote_widget: Widget | None = None
-        self.remote_awareness: Awareness | None = None
         self.local_widget_created = Event()
         self.remote_widget_created = Event()
         self._remote_awareness: Awareness | None = None

tests/test_comm_awareness.py

@@ -1,73 +1,49 @@
 from __future__ import annotations
 
-from unittest.mock import patch
-
 import pytest
 from anyio import sleep
-from pycrdt import Doc, YMessageType, create_awareness_message
-
-from ypywidgets.comm import CommProvider, CommWidget
+from pycrdt import Awareness, Doc, YMessageType, create_awareness_message
 
 pytestmark = pytest.mark.anyio
 
 
-class DummyComm:
-    def __init__(self):
-        self.sent: list[bytes] = []
-        self._handler = None
-
-    def send(self, *, buffers=None, **kwargs):
-        if buffers:
-            self.sent.append(bytes(memoryview(buffers[0])))
-
-    def on_msg(self, handler):
-        self._handler = handler
-
-
-def test_comm_provider_applies_awareness_frame():
-    doc = Doc()
-    comm = DummyComm()
-    provider = CommProvider(doc, comm)
-
-    awareness = provider.awareness
-    awareness.set_local_state({"role": "tester"})
-    payload = awareness.encode_awareness_update([awareness.client_id])
-    frame = create_awareness_message(payload)
-
-    assert frame[0] == YMessageType.AWARENESS
+async def test_comm_provider_applies_awareness_frame(synced_widgets, context):
+    async with context:
+        local_widget = await synced_widgets.get_local_widget()
+        remote_awareness = Awareness(Doc())
+        remote_awareness.set_local_state({"role": "remote"})
+        payload = remote_awareness.encode_awareness_update([remote_awareness.client_id])
+        frame = create_awareness_message(payload)
 
-    provider._receive({"buffers": [frame]})
+        assert frame[0] == YMessageType.AWARENESS
 
-    state = awareness.get_local_state()
-    assert state is not None
-    assert state.get("role") == "tester"
+        local_widget._comm_provider._receive({"buffers": [frame]})
 
+        remote_state = local_widget.awareness.states.get(remote_awareness.client_id)
+        assert remote_state is not None
+        assert remote_state.get("role") == "remote"
 
-@patch("ypywidgets.comm.create_widget_comm")
-def test_comm_widget_exposes_provider_awareness(mock_create_comm):
-    comm = DummyComm()
-    mock_create_comm.return_value = comm
 
-    widget = CommWidget()
-    assert widget.awareness is widget._comm_provider.awareness
+async def test_comm_widget_exposes_provider_awareness(synced_widgets, context):
+    async with context:
+        widget = await synced_widgets.get_local_widget()
+        assert widget.awareness is widget._comm_provider.awareness
 
 
-@patch("ypywidgets.comm.create_widget_comm")
-def test_comm_widget_awareness_observe_and_unobserve(mock_create_comm):
-    comm = DummyComm()
-    mock_create_comm.return_value = comm
-    widget = CommWidget()
+async def test_comm_widget_awareness_observe_and_unobserve(synced_widgets, context):
+    async with context:
+        widget = await synced_widgets.get_local_widget()
 
-    events: list[str] = []
-    sub_id = widget.on_awareness_change(lambda topic, _: events.append(topic))
+        events: list[str] = []
+        sub_id = widget.awareness.observe(lambda topic, _: events.append(topic))
 
-    widget.awareness.set_local_state({"ping": 1})
-    assert events
+        widget.awareness.set_local_state({"ping": 1})
+        assert events
 
-    widget.unobserve_awareness(sub_id)
-    events.clear()
-    widget.awareness.set_local_state({"ping": 2})
-    assert events == []
+        widget.awareness.unobserve(sub_id)
+        events.clear()
+        widget.awareness.set_local_state({"ping": 2})
+        assert events == []
 
 
 async def test_remote_manager_applies_awareness_messages(synced_widgets, context):