add test coverage

Author: rmorshea

examples/introduction.ipynb

@@ -782,7 +782,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "display = display_shared(DragDropBoxes)"
+    "view = display_shared(DragDropBoxes)"
    ]
   },
   {
@@ -792,7 +792,7 @@
    "outputs": [],
    "source": [
     "# display 1\n",
-    "display"
+    "view"
    ]
   },
   {
@@ -802,7 +802,7 @@
    "outputs": [],
    "source": [
     "# display 2\n",
-    "display"
+    "view"
    ]
   },
   {

idom/core/element.py

@@ -16,8 +16,6 @@
     Union,
 )
 
-from .utils import bound_id
-
 
 if TYPE_CHECKING:
     from .layout import AbstractLayout
@@ -65,6 +63,10 @@ def element(
     """
 
     def setup(func: ElementRenderFunction) -> ElementConstructor:
+
+        if not inspect.iscoroutinefunction(func):
+            raise TypeError(f"Expected a coroutine function, not {func}")
+
         @wraps(func)
         def constructor(*args: Any, **kwargs: Any) -> Element:
             element = Element(func, state, run_in_executor)
@@ -81,19 +83,18 @@ def constructor(*args: Any, **kwargs: Any) -> Element:
 
 class AbstractElement(abc.ABC):
 
-    __slots__ = ["_element_id", "_layout"]
+    __slots__ = ["_layout"]
 
     if not hasattr(abc.ABC, "__weakref__"):
         __slots__.append("__weakref__")
 
     def __init__(self) -> None:
         self._layout: Optional["AbstractLayout"] = None
-        self._element_id = bound_id(self)
 
     @property
     def id(self) -> str:
         """The unique ID of the element."""
-        return self._element_id
+        return str(id(self))
 
     @abc.abstractmethod
     async def render(self) -> Any:

idom/core/events.py

@@ -11,8 +11,6 @@
     Awaitable,
     Union,
 )
-
-from .utils import bound_id
 from .element import AbstractElement
 
 
@@ -174,7 +172,7 @@ def __init__(
         target_id: Optional[str] = None,
     ) -> None:
         self._handlers: List[EventHandlerFunction] = []
-        self._target_id = target_id or bound_id(self)
+        self._target_id = target_id or str(id(self))
         self._stop_propogation = stop_propagation
         self._prevent_default = prevent_default
 

idom/core/layout.py

@@ -21,11 +21,6 @@
 from .element import AbstractElement
 from .events import EventHandler
 
-try:
-    import vdom
-except ImportError:
-    vdom = None
-
 
 class LayoutUpdate(NamedTuple):
     """An object describing an update to a :class:`Layout`"""
@@ -61,7 +56,7 @@ class AbstractLayout(abc.ABC):
 
     __slots__ = ["_loop", "_root"]
 
-    if not hasattr(abc.ABC, "__weakref__"):
+    if not hasattr(abc.ABC, "__weakref__"):  # pragma: no cover
         __slots__.append("__weakref__")
 
     def __init__(
@@ -192,8 +187,6 @@ async def _render_model(
                         to_visit.extend(value)
                     elif isinstance(value, (Mapping, AbstractElement)):
                         to_visit.append(value)
-            elif vdom is not None and isinstance(node, vdom.VDOM):
-                to_visit.append(_from_vdom(node))
             index += 1
         yield element_id, self._load_model(model, element_id)
 
@@ -327,18 +320,3 @@ async def get(self) -> _FQT:
         """Get the result of a queued awaitable that has completed."""
         future = await self._queue.get()
         return await future
-
-
-def _from_vdom(node: Any) -> Dict[str, Any]:
-    data = {
-        "tagName": node.tag_name,
-        "children": node.children,
-        "attributes": node.attributes,
-    }
-    if node.style:
-        data["attributes"]["style"] = node.style
-    if node.event_handlers:
-        data["eventHandlers"] = node.event_handlers
-    if node.key:
-        data["key"] = node.key
-    return data

idom/core/utils.py

@@ -5,9 +5,6 @@ sanic-cors >=0.9.9, <1.0
 # extra=matplotlib
 matplotlib
 
-# extra=vdom
-vdom
-
 # extra=dialect
 htm
 pyalect

requirements/extras.txt

@@ -29,7 +29,10 @@ xfail_strict = True
 addopts = --cov=idom
 
 [coverage:report]
-fail_under = 83
+fail_under = 86
 show_missing = True
 skip_covered = True
 sort = Miss
+exclude_lines =
+    pragma: no cover
+    \.\.\.

setup.cfg

@@ -1,6 +1,15 @@
+import pytest
 import idom
 
 
+def test_element_function_is_coroutine():
+    with pytest.raises(TypeError, match="Expected a coroutine function"):
+
+        @idom.element
+        def non_coroutine_func(self):
+            pass
+
+
 async def test_simple_element():
     @idom.element
     async def simple_div(self):

tests/test_idom/test_core/test_element.py

@@ -1,8 +1,27 @@
+import pytest
+
 import idom
+from idom.core.layout import RenderError, LayoutUpdate
 
 from .utils import RenderHistory
 
 
+def test_layout_expects_abstract_element():
+    with pytest.raises(TypeError, match="Expected an AbstractElement"):
+        idom.Layout(None)
+    with pytest.raises(TypeError, match="Expected an AbstractElement"):
+        idom.Layout(idom.html.div())
+
+
+async def test_layout_has_event_loop(event_loop):
+    @idom.element
+    async def my_element(self):
+        ...
+
+    layout = idom.Layout(my_element())
+    assert layout.loop is event_loop
+
+
 async def test_simple_layout():
     @idom.element
     async def simple_element(self, tag):
@@ -65,3 +84,96 @@ async def child_element(self):
         history.child_2.id: {"tagName": "div"},
     }
     assert old == [history.child_1.id]
+
+
+async def test_layout_render_error_has_partial_update():
+    history = RenderHistory()
+
+    @history.track("main")
+    @idom.element
+    async def main(self):
+        return idom.html.div([ok_child(), bad_child()])
+
+    @history.track("ok_child")
+    @idom.element
+    async def ok_child(self):
+        return idom.html.div(["hello"])
+
+    @idom.element
+    async def bad_child(self):
+        raise ValueError("Something went wrong :(")
+
+    layout = idom.Layout(main())
+
+    try:
+        await layout.render()
+    except RenderError as e:
+        error = e
+
+    assert error.partial_render == LayoutUpdate(
+        src=history.main_1.id,
+        new={
+            history.ok_child_1.id: {
+                "tagName": "div",
+                "children": [{"type": "str", "data": "hello"}],
+            }
+        },
+        old=[],
+    )
+
+
+async def test_render_raw_vdom_dict_with_single_element_object_as_children():
+    history = RenderHistory()
+
+    @history.track("main")
+    @idom.element
+    async def main(self):
+        return {"tagName": "div", "children": child()}
+
+    @history.track("child")
+    @idom.element
+    async def child(self):
+        return {"tagName": "div", "children": {"tagName": "h1"}}
+
+    render = await idom.Layout(main()).render()
+
+    assert render == LayoutUpdate(
+        src=history.main_1.id,
+        new={
+            history.child_1.id: {
+                "tagName": "div",
+                "children": [{"type": "obj", "data": {"tagName": "h1"}}],
+            },
+            history.main_1.id: {
+                "tagName": "div",
+                "children": [{"type": "ref", "data": history.child_1.id}],
+            },
+        },
+        old=[],
+    )
+
+
+async def test_element_parents_must_exist_unless_is_root():
+    history = RenderHistory()
+
+    @history.track("main")
+    @idom.element
+    async def main(self):
+        return child()
+
+    @history.track("child")
+    @idom.element
+    async def child(self):
+        return idom.html.div()
+
+    layout = idom.Layout(main())
+    await layout.render()
+
+    assert layout._element_parent(history.main_1) is None
+
+    @idom.element
+    async def element_not_in_layout(self):
+        ...
+
+    with pytest.raises(KeyError):
+        layout._element_parent(element_not_in_layout())

tests/test_idom/test_core/test_layout.py

@@ -76,7 +76,7 @@ def test_make_vdom_constructor():
 
     no_children = make_vdom_constructor("no-children", allow_children=False)
 
-    with pytest.raises(TypeError):
-        no_children(1, 2, 3)
+    with pytest.raises(TypeError, match="cannot have children"):
+        no_children([1, 2, 3])
 
     assert no_children() == {"tagName": "no-children"}