fix tests

Author: rmorshea

tests/test_core/test_layout.py

@@ -2,6 +2,8 @@
 import gc
 import random
 import re
+from collections.abc import Sequence
+from typing import Any
 from weakref import finalize
 from weakref import ref as weakref
 
@@ -12,7 +14,8 @@
 from idom.config import IDOM_DEBUG_MODE
 from idom.core.component import component
 from idom.core.hooks import use_effect, use_state
-from idom.core.layout import Layout, LayoutEventMessage, LayoutUpdateMessage
+from idom.core.layout import Layout
+from idom.core.types import LayoutEventMessage, LayoutUpdateMessage
 from idom.testing import (
     HookCatcher,
     StaticEventHandler,
@@ -32,6 +35,14 @@ def no_logged_errors():
                 raise record.exc_info[1]
 
 
+def event_message(target: str, *data: Any) -> LayoutEventMessage:
+    return {"type": "layout-event", "target": target, "data": data}
+
+
+def update_message(path: str, model: Any) -> LayoutUpdateMessage:
+    return {"type": "layout-update", "path": path, "model": model}
+
+
 def test_layout_repr():
     @idom.component
     def MyComponent():
@@ -58,7 +69,7 @@ def Component():
     layout = idom.Layout(component)
 
     with pytest.raises(Exception):
-        await layout.deliver(LayoutEventMessage("something", []))
+        await layout.deliver(event_message("something"))
 
     with pytest.raises(Exception):
         layout.update(component)
@@ -77,19 +88,17 @@ def SimpleComponent():
 
     async with idom.Layout(SimpleComponent()) as layout:
         update_1 = await layout.render()
-        assert update_1 == LayoutUpdateMessage(
+        assert update_1 == update_message(
             path="",
-            old=None,
-            new={"tagName": "", "children": [{"tagName": "div"}]},
+            model={"tagName": "", "children": [{"tagName": "div"}]},
         )
 
         set_state_hook.current("table")
 
         update_2 = await layout.render()
-        assert update_2 == LayoutUpdateMessage(
+        assert update_2 == update_message(
             path="",
-            old=update_1.new,
-            new={"tagName": "", "children": [{"tagName": "table"}]},
+            model={"tagName": "", "children": [{"tagName": "table"}]},
         )
 
 
@@ -99,7 +108,7 @@ def SomeComponent():
         return None
 
     async with idom.Layout(SomeComponent()) as layout:
-        assert (await layout.render()).new == {"tagName": ""}
+        assert (await layout.render())["model"] == {"tagName": ""}
 
 
 async def test_nested_component_layout():
@@ -135,28 +144,25 @@ def make_child_model(state):
 
     async with idom.Layout(Parent()) as layout:
         update_1 = await layout.render()
-        assert update_1 == LayoutUpdateMessage(
+        assert update_1 == update_message(
             path="",
-            old=None,
-            new=make_parent_model(0, make_child_model(0)),
+            model=make_parent_model(0, make_child_model(0)),
         )
 
         parent_set_state.current(1)
 
         update_2 = await layout.render()
-        assert update_2 == LayoutUpdateMessage(
+        assert update_2 == update_message(
             path="",
-            old=update_1.new,
-            new=make_parent_model(1, make_child_model(0)),
+            model=make_parent_model(1, make_child_model(0)),
         )
 
         child_set_state.current(1)
 
         update_3 = await layout.render()
-        assert update_3 == LayoutUpdateMessage(
+        assert update_3 == update_message(
             path="/children/0/children/1",
-            old=update_2.new["children"][0]["children"][1],
-            new=make_child_model(1),
+            model=make_child_model(1),
         )
 
 
@@ -180,10 +186,9 @@ def BadChild():
     with assert_idom_did_log(match_error="error from bad child"):
 
         async with idom.Layout(Main()) as layout:
-            assert (await layout.render()) == LayoutUpdateMessage(
+            assert (await layout.render()) == update_message(
                 path="",
-                old=None,
-                new={
+                model={
                     "tagName": "",
                     "children": [
                         {
@@ -232,10 +237,9 @@ def BadChild():
     with assert_idom_did_log(match_error="error from bad child"):
 
         async with idom.Layout(Main()) as layout:
-            assert (await layout.render()) == LayoutUpdateMessage(
+            assert (await layout.render()) == update_message(
                 path="",
-                old=None,
-                new={
+                model={
                     "tagName": "",
                     "children": [
                         {
@@ -271,10 +275,9 @@ def Child():
         return {"tagName": "div", "children": {"tagName": "h1"}}
 
     async with idom.Layout(Main()) as layout:
-        assert (await layout.render()) == LayoutUpdateMessage(
+        assert (await layout.render()) == update_message(
             path="",
-            old=None,
-            new={
+            model={
                 "tagName": "",
                 "children": [
                     {
@@ -478,7 +481,7 @@ def Child():
         hook.latest.schedule_render()
 
         update = await layout.render()
-        assert update.path == "/children/0/children/0/children/0"
+        assert update["path"] == "/children/0/children/0/children/0"
 
 
 async def test_log_on_dispatch_to_missing_event_handler(caplog):
@@ -487,7 +490,7 @@ def SomeComponent():
         return idom.html.div()
 
     async with idom.Layout(SomeComponent()) as layout:
-        await layout.deliver(LayoutEventMessage(target="missing", data=[]))
+        await layout.deliver(event_message("missing"))
 
     assert re.match(
         "Ignored event - handler 'missing' does not exist or its component unmounted",
@@ -528,7 +531,7 @@ def bad_trigger():
     async with idom.Layout(MyComponent()) as layout:
         await layout.render()
         for i in range(3):
-            event = LayoutEventMessage(good_handler.target, [])
+            event = event_message(good_handler.target)
             await layout.deliver(event)
 
             assert called_good_trigger.current
@@ -579,7 +582,7 @@ def callback():
     async with idom.Layout(RootComponent()) as layout:
         await layout.render()
         for _ in range(3):
-            event = LayoutEventMessage(good_handler.target, [])
+            event = event_message(good_handler.target)
             await layout.deliver(event)
 
             assert called_good_trigger.current
@@ -599,10 +602,9 @@ def Inner():
         return idom.html.div("hello")
 
     async with idom.Layout(Outer()) as layout:
-        assert (await layout.render()) == LayoutUpdateMessage(
+        assert (await layout.render()) == update_message(
             path="",
-            old=None,
-            new={
+            model={
                 "tagName": "",
                 "children": [
                     {
@@ -767,7 +769,7 @@ def raise_error():
 
         async with idom.Layout(ComponentWithBadEventHandler()) as layout:
             await layout.render()
-            event = LayoutEventMessage(bad_handler.target, [])
+            event = event_message(bad_handler.target)
             await layout.deliver(event)
 
 
@@ -1038,7 +1040,7 @@ async def record_if_state_is_reset():
         did_call_effect.clear()
 
         for i in range(1, 5):
-            await layout.deliver(LayoutEventMessage(set_child_key_num.target, []))
+            await layout.deliver(event_message(set_child_key_num.target))
             await layout.render()
             assert effect_calls_without_state == {"some-key", "key-0"}
             did_call_effect.clear()
@@ -1086,13 +1088,13 @@ def Root():
 
     async with Layout(Root()) as layout:
         await layout.render()
-        await layout.deliver(LayoutEventMessage(event_handler.target, []))
+        await layout.deliver(event_message(event_handler.target))
         assert did_trigger.current
         did_trigger.current = False
 
         set_event_name.current("second")
         await layout.render()
-        await layout.deliver(LayoutEventMessage(event_handler.target, []))
+        await layout.deliver(event_message(event_handler.target))
         assert did_trigger.current
         did_trigger.current = False
 
@@ -1144,7 +1146,7 @@ def Child():
 
     async with idom.Layout(Parent()) as layout:
         update = await layout.render()
-        assert update.new == {
+        assert update["model"] == {
             "tagName": "",
             "children": [
                 {