Update tests

Author: CoolCat467

src/sanescansrv/htmlgen.py

@@ -473,6 +473,8 @@ def jinja_arg_tag(
     if args:
         args = f" {args}"
     if kwargs:
+        if not args:
+            args += " "
         args += " ".join(_generate_html_attributes(kwargs))
     return f"<{type_}{args}>"
 
@@ -494,12 +496,9 @@ def jinja_radio_select(
     }
     jinja_properties: tuple[str, ...] = ()
     if default is not None:
-        default_tag = " ".join(
-            _generate_html_attributes({"checked": "checked"}),
-        )
         jinja_properties = (
             jinja_if_block(
-                {f"value == {default}": default_tag},
+                {f"value == {default}": 'checked="checked" '},
                 block=False,
             ),
         )

src/sanescansrv/server.py

@@ -335,11 +335,11 @@ class DeviceOptionDataClass:
     py_name: str = field(repr=False)
     active: bool
     settable: bool
-    default: None | str | int | float | bool = field(
+    default: str | int | float | bool | None = field(
         init=False,
         default=None,
     )
-    value: None | str | int | float = field(
+    value: str | int | float | bool | None = field(
         init=False,
         default=None,
     )

tests/test_htmlgen.py

@@ -502,7 +502,7 @@ def test_jinja_for_loop_else_content() -> None:
     [
         ("p", ("jinja",), {}, "<p jinja>"),
         ("p", (), {"fish": "false"}, '<p fish="false">'),
-        ("p", ("jinja",), {"fish": "false"}, '<p jinja fish="false">'),
+        ("p", ("jinja ",), {"fish": "false"}, '<p jinja fish="false">'),
         ("i", (), {}, "<i>"),
         (
             "input",
@@ -512,7 +512,7 @@ def test_jinja_for_loop_else_content() -> None:
         ),
         (
             "input",
-            ("jinja",),
+            ("jinja ",),
             {"type": "radio", "id": "0", "name": "test", "value_": "Example"},
             '<input jinja type="radio" id="0" name="test" value="Example">',
         ),
@@ -542,7 +542,7 @@ def test_jinja_radio_select_default() -> None:
     assert (
         htmlgen.jinja_radio_select("submits", "option_data", "default text")
         == """{% for display, value in option_data.items() %}
-<input {% if value == default text %}checked="checked"{% endif %} type="radio" id="submits_{{ loop.index0 }}" name="submits" value="{{ value }}">
+<input {% if value == default text %}checked="checked" {% endif %}type="radio" id="submits_{{ loop.index0 }}" name="submits" value="{{ value }}">
 <label for="submits_{{ loop.index0 }}">{{ display }}</label>
 <br>
 {% endfor %}"""